Enable R_AARCH64_NONE for 64-bit code.

	* elfnn-aarch64.c: Unconditionally enable R_AARCH64_NULL and
	R_AARCH64_NONE.  Use HOWTO64 for R_AARCH64_NULL.
	* relocs.c: Add BFD_RELOC_AARCH64_NULL.
	* bfd-in2.h: Regenerate.
	* libbfd.h: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8af8bda1718973f14491ef32e9f6c0b2fcc55e8f..83d0bed5e4179fef17711e4fff852253c7c601cc 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2016-05-23  Jim Wilson  <jim.wilson@linaro.org>
+
+       * elfnn-aarch64.c: Unconditionally enable R_AARCH64_NULL and
+       R_AARCH64_NONE.  Use HOWTO64 for R_AARCH64_NULL.
+       * relocs.c: Add BFD_RELOC_AARCH64_NULL.
+       * bfd-in2.h: Regenerate.
+       * libbfd.h: Likewise.
+
 2016-05-23  Kuba Sejdak  <jakub.sejdak@phoesys.com>
 
        * config.bfd: Add entry for arm-phoenix.

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index f900da650cfb9e282045ab75108402a59acb5773..7292492b456e87b5a801bf91cac89f4ca801ca90 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5720,6 +5720,9 @@ important as several tables in the AArch64 bfd backend are indexed
 by these enumerators; make sure they are all synced.  */
   BFD_RELOC_AARCH64_RELOC_START,
 
+/* Deprecated AArch64 null relocation code.  */
+  BFD_RELOC_AARCH64_NULL,
+
 /* AArch64 null relocation code.  */
   BFD_RELOC_AARCH64_NONE,
 

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index fcce22f768592d45ad57d7459ff9617f74c6ac0b..d30983aa88ef37995b90a67d8870b75150f52afb 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -339,8 +339,8 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
 
   /* Basic data relocations.  */
 
-#if ARCH_SIZE == 64
-  HOWTO (R_AARCH64_NULL,       /* type */
+  /* Deprecated, but retained for backwards compatibility.  */
+  HOWTO64 (R_AARCH64_NULL,     /* type */
         0,                     /* rightshift */
         3,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */
@@ -353,7 +353,6 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
         0,                     /* src_mask */
         0,                     /* dst_mask */
         FALSE),                /* pcrel_offset */
-#else
   HOWTO (R_AARCH64_NONE,       /* type */
         0,                     /* rightshift */
         3,                     /* size (0 = byte, 1 = short, 2 = long) */
@@ -367,7 +366,6 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
         0,                     /* src_mask */
         0,                     /* dst_mask */
         FALSE),                /* pcrel_offset */
-#endif
 
   /* .xword: (S+A) */
   HOWTO64 (AARCH64_R (ABS64),  /* type */

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 5fe45ecae94955624fba74aa47d9b75ca0e1fbf0..33490c07f9b623caf6a6b6b4c1d2ae1f76816281 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2792,6 +2792,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MICROBLAZE_64_TLSGOTTPREL",
   "BFD_RELOC_MICROBLAZE_64_TLSTPREL",
   "BFD_RELOC_AARCH64_RELOC_START",
+  "BFD_RELOC_AARCH64_NULL",
   "BFD_RELOC_AARCH64_NONE",
   "BFD_RELOC_AARCH64_64",
   "BFD_RELOC_AARCH64_32",

diff --git a/bfd/reloc.c b/bfd/reloc.c
index c3b713b351d73f3b8d8d77347e5356a871f16957..1f210371b7486054b83f002680f1493366de52e9 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6775,6 +6775,10 @@ ENUMDOC
   relocation enumerators.  N.B. the order of the enumerators is
   important as several tables in the AArch64 bfd backend are indexed
   by these enumerators; make sure they are all synced.
+ENUM
+  BFD_RELOC_AARCH64_NULL
+ENUMDOC
+  Deprecated AArch64 null relocation code.
 ENUM
   BFD_RELOC_AARCH64_NONE
 ENUMDOC