From: Andrew Pinski <apinski@cavium.com>
Date: Sat, 27 Jul 2013 23:58:43 +0000 (+0000)
Subject: 2013-07-27  Andrew Pinski  <apinski@cavium.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54757ed169780b965031861d5c6dd918545a88cf;p=binutils-gdb.git

2013-07-27  Andrew Pinski  <apinski@cavium.com>

	* elfnn-aarch64.c (elfNN_aarch64_howto_from_bfd_reloc): Handle
	BFD_RELOC_AARCH64_NONE explicitly.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index af1a0c6c32c..777447414f5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-27  Andrew Pinski  <apinski@cavium.com>
+
+	* elfnn-aarch64.c (elfNN_aarch64_howto_from_bfd_reloc): Handle
+	BFD_RELOC_AARCH64_NONE explicitly.
+
 2013-07-27  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* elf32-vax.c (elf_vax_finish_dynamic_sections): Don't set GOT's
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 8e191cf1056..a219310d6b4 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1465,6 +1465,9 @@ elfNN_aarch64_howto_from_bfd_reloc (bfd_reloc_code_real_type code)
     if (elfNN_aarch64_howto_table[code - BFD_RELOC_AARCH64_RELOC_START].type)
       return &elfNN_aarch64_howto_table[code - BFD_RELOC_AARCH64_RELOC_START];
 
+  if (code == BFD_RELOC_AARCH64_NONE)
+    return &elfNN_aarch64_howto_none;
+
   return NULL;
 }