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 af1a0c6c32ce876d2348ed73e68cb2bb4f7d68b4..777447414f5b868b89a8353677205d7ed9255fb7 100644 (file)
--- 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 8e191cf10568f0a7a403a5422d5d766aa974a23e..a219310d6b4b027f156079c4fd39af0c8b586dd6 100644 (file)
--- 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;
 }