bfd/ELF: fold BFD_RELOC_<arch>_RELATIVE

There's no need to have a separate reloc per arch; just like for other
more or less generic ones a single one will (mostly) do. Arm64, C-Sky,
and KVX - sadly - are exceptions.

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 244562641c30e8464e005472d7f1dde46f20081b..c9360bd917a2bfce548482b1674f91665a12c3c8 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -3326,6 +3326,7 @@ enum bfd_reloc_code_real
   BFD_RELOC_COPY,
   BFD_RELOC_GLOB_DAT,
   BFD_RELOC_JMP_SLOT,
+  BFD_RELOC_RELATIVE,
   BFD_RELOC_IRELATIVE,
 
   /* Size relocations.  */
@@ -3333,7 +3334,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_SIZE64,
 
   /* Relocations used by 68K ELF.  */
-  BFD_RELOC_68K_RELATIVE,
   BFD_RELOC_68K_TLS_GD32,
   BFD_RELOC_68K_TLS_GD16,
   BFD_RELOC_68K_TLS_GD8,
@@ -3396,7 +3396,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_SPARC_PC10,
   BFD_RELOC_SPARC_PC22,
   BFD_RELOC_SPARC_WPLT30,
-  BFD_RELOC_SPARC_RELATIVE,
   BFD_RELOC_SPARC_UA16,
   BFD_RELOC_SPARC_UA32,
   BFD_RELOC_SPARC_UA64,
@@ -3794,9 +3793,6 @@ enum bfd_reloc_code_real
      bytes in the instruction.  */
   BFD_RELOC_MN10300_GOT16,
 
-  /* Adjust by program base.  */
-  BFD_RELOC_MN10300_RELATIVE,
-
   /* Together with another reloc targeted at the same location, allows
      for a value that is the difference of two symbols in the same
      section.  */
@@ -3828,7 +3824,6 @@ enum bfd_reloc_code_real
   /* i386/elf relocations.  */
   BFD_RELOC_386_GOT32,
   BFD_RELOC_386_PLT32,
-  BFD_RELOC_386_RELATIVE,
   BFD_RELOC_386_GOTOFF,
   BFD_RELOC_386_GOTPC,
   BFD_RELOC_386_TLS_TPOFF,
@@ -3850,7 +3845,6 @@ enum bfd_reloc_code_real
 
   /* x86-64/elf relocations.  */
   BFD_RELOC_X86_64_GOT32,
-  BFD_RELOC_X86_64_RELATIVE,
   BFD_RELOC_X86_64_GOTPCREL,
   BFD_RELOC_X86_64_32S,
   BFD_RELOC_X86_64_DTPMOD64,
@@ -3922,7 +3916,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_PPC_BA16,
   BFD_RELOC_PPC_BA16_BRTAKEN,
   BFD_RELOC_PPC_BA16_BRNTAKEN,
-  BFD_RELOC_PPC_RELATIVE,
   BFD_RELOC_PPC_LOCAL24PC,
   BFD_RELOC_PPC_EMB_NADDR32,
   BFD_RELOC_PPC_EMB_NADDR16,
@@ -4179,7 +4172,6 @@ enum bfd_reloc_code_real
 
   /* Relocations for setting up GOTs and PLTs for shared libraries.  */
   BFD_RELOC_ARM_GOT32,
-  BFD_RELOC_ARM_RELATIVE,
   BFD_RELOC_ARM_GOTOFF,
   BFD_RELOC_ARM_GOTPC,
   BFD_RELOC_ARM_GOT_PREL,
@@ -4298,7 +4290,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_SH_LABEL,
   BFD_RELOC_SH_LOOP_START,
   BFD_RELOC_SH_LOOP_END,
-  BFD_RELOC_SH_RELATIVE,
   BFD_RELOC_SH_GOTPC,
   BFD_RELOC_SH_GOT_LOW16,
   BFD_RELOC_SH_GOT_MEDLOW16,
@@ -4406,7 +4397,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_ARC_32_PCREL,
   BFD_RELOC_ARC_GOT32,
   BFD_RELOC_ARC_GOTPC32,
-  BFD_RELOC_ARC_RELATIVE,
   BFD_RELOC_ARC_GOTOFF,
   BFD_RELOC_ARC_GOTPC,
   BFD_RELOC_ARC_S21W_PCREL_PLT,
@@ -4645,7 +4635,6 @@ enum bfd_reloc_code_real
   /* For PIC.  */
   BFD_RELOC_M32R_GOT24,
   BFD_RELOC_M32R_26_PLTREL,
-  BFD_RELOC_M32R_RELATIVE,
   BFD_RELOC_M32R_GOTOFF,
   BFD_RELOC_M32R_GOTOFF_HI_ULO,
   BFD_RELOC_M32R_GOTOFF_HI_SLO,
@@ -4739,7 +4728,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_NDS32_GOT20,
   BFD_RELOC_NDS32_9_PLTREL,
   BFD_RELOC_NDS32_25_PLTREL,
-  BFD_RELOC_NDS32_RELATIVE,
   BFD_RELOC_NDS32_GOTOFF,
   BFD_RELOC_NDS32_GOTOFF_HI20,
   BFD_RELOC_NDS32_GOTOFF_LO12,
@@ -4976,7 +4964,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_V850_32_GOT,
   BFD_RELOC_V850_22_PLT_PCREL,
   BFD_RELOC_V850_32_PLT_PCREL,
-  BFD_RELOC_V850_RELATIVE,
   BFD_RELOC_V850_16_GOTOFF,
   BFD_RELOC_V850_32_GOTOFF,
 
@@ -5125,7 +5112,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_METAG_RELBRANCH_PLT,
   BFD_RELOC_METAG_GOTOFF,
   BFD_RELOC_METAG_PLT,
-  BFD_RELOC_METAG_RELATIVE,
   BFD_RELOC_METAG_TLS_GD,
   BFD_RELOC_METAG_TLS_LDM,
   BFD_RELOC_METAG_TLS_LDO_HI16,
@@ -5449,9 +5435,6 @@ enum bfd_reloc_code_real
   /* 12 bit GOT offset.  */
   BFD_RELOC_390_GOT12,
 
-  /* Adjust by program base.  */
-  BFD_RELOC_390_RELATIVE,
-
   /* 32 bit PC relative offset to GOT.  */
   BFD_RELOC_390_GOTPC,
 
@@ -5907,9 +5890,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_CRIS_LAPCQ_OFFSET,
   BFD_RELOC_CRIS_UNSIGNED_4,
 
-  /* Relocs used in ELF shared libraries for CRIS.  */
-  BFD_RELOC_CRIS_RELATIVE,
-
   /* 32-bit offset to symbol-entry within GOT.  */
   BFD_RELOC_CRIS_32_GOT,
 
@@ -5961,7 +5941,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_OR1K_PLT26,
   BFD_RELOC_OR1K_PLTA26,
   BFD_RELOC_OR1K_GOTOFF_SLO16,
-  BFD_RELOC_OR1K_RELATIVE,
   BFD_RELOC_OR1K_TLS_GD_HI16,
   BFD_RELOC_OR1K_TLS_GD_LO16,
   BFD_RELOC_OR1K_TLS_GD_PG21,
@@ -6002,9 +5981,6 @@ enum bfd_reloc_code_real
   /* Self-describing complex relocations.  */
   BFD_RELOC_RELC,
 
-  /* Relocations used by VAX ELF.  */
-  BFD_RELOC_VAX_RELATIVE,
-
   /* Morpho MT - 16 bit immediate relocation.  */
   BFD_RELOC_MT_PC16,
 
@@ -6094,9 +6070,6 @@ enum bfd_reloc_code_real
      to one of its own internal functions or data structures.  */
   BFD_RELOC_XTENSA_RTLD,
 
-  /* Xtensa relocations for ELF shared objects.  */
-  BFD_RELOC_XTENSA_RELATIVE,
-
   /* Xtensa relocation used in ELF object files for symbols that may
      require PLT entries.  Otherwise, this is just a generic 32-bit
      relocation.  */
@@ -6233,7 +6206,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_LM32_16_GOT,
   BFD_RELOC_LM32_GOTOFF_HI16,
   BFD_RELOC_LM32_GOTOFF_LO16,
-  BFD_RELOC_LM32_RELATIVE,
 
   /* Difference between two section addreses.  Must be followed by a
      BFD_RELOC_MACH_O_PAIR.  */
@@ -6927,7 +6899,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_AARCH64_BRANCH9,
 
   /* Tilera TILEPro Relocations.  */
-  BFD_RELOC_TILEPRO_RELATIVE,
   BFD_RELOC_TILEPRO_BROFF_X1,
   BFD_RELOC_TILEPRO_JOFFLONG_X1,
   BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT,
@@ -7012,7 +6983,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_TILEGX_HW0_LAST,
   BFD_RELOC_TILEGX_HW1_LAST,
   BFD_RELOC_TILEGX_HW2_LAST,
-  BFD_RELOC_TILEGX_RELATIVE,
   BFD_RELOC_TILEGX_BROFF_X1,
   BFD_RELOC_TILEGX_JUMPOFF_X1,
   BFD_RELOC_TILEGX_JUMPOFF_X1_PLT,

diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index f0c14beecc6f3ef13638d07fb63cfdf9143290c9..0dfe6cbdf6d1414c5c59389c9d28ec22a78adbc9 100644 (file)
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -665,7 +665,7 @@ static const struct mn10300_reloc_map mn10300_reloc_map[] =
   { BFD_RELOC_COPY, R_MN10300_COPY },
   { BFD_RELOC_GLOB_DAT, R_MN10300_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT, R_MN10300_JMP_SLOT },
-  { BFD_RELOC_MN10300_RELATIVE, R_MN10300_RELATIVE },
+  { BFD_RELOC_RELATIVE, R_MN10300_RELATIVE },
   { BFD_RELOC_MN10300_TLS_GD, R_MN10300_TLS_GD },
   { BFD_RELOC_MN10300_TLS_LD, R_MN10300_TLS_LD },
   { BFD_RELOC_MN10300_TLS_LDO, R_MN10300_TLS_LDO },

diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index 6a56244b241c16575e88018c8508bda6c3fb8aea..824e833e0832b9e49feb98424ac70934313e9e10 100644 (file)
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -388,6 +388,7 @@ arc_elf_link_hash_table_create (bfd *abfd)
 #define BFD_RELOC_ARC_COPY     BFD_RELOC_COPY
 #define BFD_RELOC_ARC_GLOB_DAT BFD_RELOC_GLOB_DAT
 #define BFD_RELOC_ARC_JMP_SLOT BFD_RELOC_JMP_SLOT
+#define BFD_RELOC_ARC_RELATIVE BFD_RELOC_RELATIVE
 
 static const struct arc_reloc_map arc_reloc_map[] =
 {

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 643d2285d71c58c1d85845c3f36188b281c9986f..a5dda59bc01ab3ca92241000d39a2a6b6031f544 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -2018,7 +2018,7 @@ static const struct elf32_arm_reloc_map elf32_arm_reloc_map[] =
     {BFD_RELOC_THUMB_PCREL_BRANCH7,  R_ARM_THM_JUMP6},
     {BFD_RELOC_GLOB_DAT,            R_ARM_GLOB_DAT},
     {BFD_RELOC_JMP_SLOT,            R_ARM_JUMP_SLOT},
-    {BFD_RELOC_ARM_RELATIVE,        R_ARM_RELATIVE},
+    {BFD_RELOC_RELATIVE,            R_ARM_RELATIVE},
     {BFD_RELOC_ARM_GOTOFF,          R_ARM_GOTOFF32},
     {BFD_RELOC_ARM_GOTPC,           R_ARM_GOTPC},
     {BFD_RELOC_ARM_GOT_PREL,        R_ARM_GOT_PREL},

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 14aa9cb1a7f361ce0c38f72c559986b58c46f6d6..2f861c1d870ff5bd12c4b9c7514177bb4dbc94e0 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -401,7 +401,7 @@ static const struct cris_reloc_map cris_reloc_map [] =
   { BFD_RELOC_COPY,            R_CRIS_COPY },
   { BFD_RELOC_GLOB_DAT,                R_CRIS_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT,                R_CRIS_JUMP_SLOT },
-  { BFD_RELOC_CRIS_RELATIVE,   R_CRIS_RELATIVE },
+  { BFD_RELOC_RELATIVE,                R_CRIS_RELATIVE },
   { BFD_RELOC_CRIS_16_GOT,     R_CRIS_16_GOT },
   { BFD_RELOC_CRIS_32_GOT,     R_CRIS_32_GOT },
   { BFD_RELOC_CRIS_16_GOTPLT,  R_CRIS_16_GOTPLT },

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index a0da37cf1ff23aa3e5c7bfd630431b2737b4b425..bcdf88aef11d5a82270ef07096ba63f146bf63b9 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -228,8 +228,8 @@ elf_i386_reloc_type_lookup (bfd *abfd,
       TRACE ("BFD_RELOC_JMP_SLOT");
       return &elf_howto_table[R_386_JUMP_SLOT];
 
-    case BFD_RELOC_386_RELATIVE:
-      TRACE ("BFD_RELOC_386_RELATIVE");
+    case BFD_RELOC_RELATIVE:
+      TRACE ("BFD_RELOC_RELATIVE");
       return &elf_howto_table[R_386_RELATIVE];
 
     case BFD_RELOC_386_GOTOFF:

diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
index 819eedc529f50532ddad466266faa88be17d8c39..3204def77dec1dd929c374b51a8ac218fd6c671a 100644 (file)
--- a/bfd/elf32-lm32.c
+++ b/bfd/elf32-lm32.c
@@ -447,7 +447,7 @@ static const struct lm32_reloc_map lm32_reloc_map[] =
   { BFD_RELOC_COPY,            R_LM32_COPY },
   { BFD_RELOC_GLOB_DAT,                R_LM32_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT,                R_LM32_JMP_SLOT },
-  { BFD_RELOC_LM32_RELATIVE,   R_LM32_RELATIVE },
+  { BFD_RELOC_RELATIVE,                R_LM32_RELATIVE },
 };
 
 static reloc_howto_type *

diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index 79fa7968f18f247718b5c2732b6943f1a1feb939..a60dcf33ea145abee5f5daa7c32fb7c3899d94bc 100644 (file)
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -1214,7 +1214,7 @@ static const struct m32r_reloc_map m32r_reloc_map[] =
   { BFD_RELOC_COPY, R_M32R_COPY },
   { BFD_RELOC_GLOB_DAT, R_M32R_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT, R_M32R_JMP_SLOT },
-  { BFD_RELOC_M32R_RELATIVE, R_M32R_RELATIVE },
+  { BFD_RELOC_RELATIVE, R_M32R_RELATIVE },
   { BFD_RELOC_M32R_GOTOFF, R_M32R_GOTOFF },
   { BFD_RELOC_M32R_GOTPC24, R_M32R_GOTPC24 },
   { BFD_RELOC_M32R_GOT16_HI_ULO, R_M32R_GOT16_HI_ULO },

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 1ece9c2041cfafbb01f354e95066729bef6d5a3e..5b9c4c07bc5b446db863c655c6af9906ebf4ca15 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -391,7 +391,7 @@ static const struct
   { BFD_RELOC_NONE, R_68K_COPY },
   { BFD_RELOC_GLOB_DAT, R_68K_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT, R_68K_JMP_SLOT },
-  { BFD_RELOC_68K_RELATIVE, R_68K_RELATIVE },
+  { BFD_RELOC_RELATIVE, R_68K_RELATIVE },
   { BFD_RELOC_CTOR, R_68K_32 },
   { BFD_RELOC_VTABLE_INHERIT, R_68K_GNU_VTINHERIT },
   { BFD_RELOC_VTABLE_ENTRY, R_68K_GNU_VTENTRY },

diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
index 17189ef3dba275a48e66a042be981b0fda69942a..5eb289b6c1c53e531864c0203693484f148a8795 100644 (file)
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
@@ -722,7 +722,7 @@ static const struct metag_reloc_map metag_reloc_map [] =
     { BFD_RELOC_METAG_PLT,          R_METAG_PLT },
     { BFD_RELOC_COPY,               R_METAG_COPY },
     { BFD_RELOC_JMP_SLOT,           R_METAG_JMP_SLOT },
-    { BFD_RELOC_METAG_RELATIVE,             R_METAG_RELATIVE },
+    { BFD_RELOC_RELATIVE,           R_METAG_RELATIVE },
     { BFD_RELOC_GLOB_DAT,           R_METAG_GLOB_DAT },
     { BFD_RELOC_METAG_TLS_GD,       R_METAG_TLS_GD },
     { BFD_RELOC_METAG_TLS_LDM,      R_METAG_TLS_LDM },

diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index ef412d031cbf0b9207fde391e7087cab26681174..f9e09eecf8a64e848bc8b9cd0fc711ddc095a1c2 100644 (file)
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -3116,7 +3116,7 @@ static const struct nds32_reloc_map_entry nds32_reloc_map[] =
   {BFD_RELOC_COPY, R_NDS32_COPY},
   {BFD_RELOC_GLOB_DAT, R_NDS32_GLOB_DAT},
   {BFD_RELOC_JMP_SLOT, R_NDS32_JMP_SLOT},
-  {BFD_RELOC_NDS32_RELATIVE, R_NDS32_RELATIVE},
+  {BFD_RELOC_RELATIVE, R_NDS32_RELATIVE},
   {BFD_RELOC_NDS32_GOTOFF, R_NDS32_GOTOFF},
   {BFD_RELOC_NDS32_GOTOFF_HI20, R_NDS32_GOTOFF_HI20},
   {BFD_RELOC_NDS32_GOTOFF_LO12, R_NDS32_GOTOFF_LO12},

diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 71d8055097320521140f48b780842ea6f975538c..b247e3f14feafe0da2e2a023e08ba297048e751a 100644 (file)
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -878,7 +878,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] =
   { BFD_RELOC_GLOB_DAT,                R_OR1K_GLOB_DAT },
   { BFD_RELOC_COPY,            R_OR1K_COPY },
   { BFD_RELOC_JMP_SLOT,                R_OR1K_JMP_SLOT },
-  { BFD_RELOC_OR1K_RELATIVE,   R_OR1K_RELATIVE },
+  { BFD_RELOC_RELATIVE,                R_OR1K_RELATIVE },
   { BFD_RELOC_OR1K_TLS_GD_HI16, R_OR1K_TLS_GD_HI16 },
   { BFD_RELOC_OR1K_TLS_GD_LO16, R_OR1K_TLS_GD_LO16 },
   { BFD_RELOC_OR1K_TLS_LDM_HI16,       R_OR1K_TLS_LDM_HI16 },

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index c0a28a6d84351e2854dc008ba4a955ae23e989a7..2564771705cdff1227065d65fac2aa25e192df7f 100644 (file)
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -209,7 +209,7 @@ elf_s390_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       return &elf_howto_table[(int) R_390_GLOB_DAT];
     case BFD_RELOC_JMP_SLOT:
       return &elf_howto_table[(int) R_390_JMP_SLOT];
-    case BFD_RELOC_390_RELATIVE:
+    case BFD_RELOC_RELATIVE:
       return &elf_howto_table[(int) R_390_RELATIVE];
     case BFD_RELOC_32_GOTOFF:
       return &elf_howto_table[(int) R_390_GOTOFF32];

diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 3e1c76ef83347199c52165742a62d35b56953304..c539242b9fc982efba83605aa28e15dd80d98d83 100644 (file)
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -358,7 +358,7 @@ static const struct elf_reloc_map sh_reloc_map[] =
   { BFD_RELOC_COPY, R_SH_COPY },
   { BFD_RELOC_GLOB_DAT, R_SH_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT, R_SH_JMP_SLOT },
-  { BFD_RELOC_SH_RELATIVE, R_SH_RELATIVE },
+  { BFD_RELOC_RELATIVE, R_SH_RELATIVE },
   { BFD_RELOC_32_GOTOFF, R_SH_GOTOFF },
   { BFD_RELOC_SH_GOTPC, R_SH_GOTPC },
   { BFD_RELOC_SH_GOTPLT32, R_SH_GOTPLT32 },

diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index d766cfcd7703019fc9552b8e07fd4b2fbad4d815..dc206d589d37e2266677ab5974e871cfb19474ee 100644 (file)
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -586,7 +586,7 @@ static const reloc_map tilepro_reloc_map [] =
   TH_REMAP (BFD_RELOC_COPY,                   R_TILEPRO_COPY)
   TH_REMAP (BFD_RELOC_GLOB_DAT,                       R_TILEPRO_GLOB_DAT)
   TH_REMAP (BFD_RELOC_JMP_SLOT,                       R_TILEPRO_JMP_SLOT)
-  TH_REMAP (BFD_RELOC_TILEPRO_RELATIVE,               R_TILEPRO_RELATIVE)
+  TH_REMAP (BFD_RELOC_RELATIVE,                       R_TILEPRO_RELATIVE)
   TH_REMAP (BFD_RELOC_TILEPRO_BROFF_X1,               R_TILEPRO_BROFF_X1)
   TH_REMAP (BFD_RELOC_TILEPRO_JOFFLONG_X1,     R_TILEPRO_JOFFLONG_X1)
   TH_REMAP (BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT, R_TILEPRO_JOFFLONG_X1_PLT)

diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 1c49aeac8ae4801731eb677d537ffc34ee12aca1..48df90c5a69b1c09e531f2302613644c9eac30ff 100644 (file)
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -1739,7 +1739,7 @@ static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
   { BFD_RELOC_COPY,                       R_V850_COPY                   },
   { BFD_RELOC_GLOB_DAT,                           R_V850_GLOB_DAT               },
   { BFD_RELOC_JMP_SLOT,                           R_V850_JMP_SLOT               },
-  { BFD_RELOC_V850_RELATIVE,              R_V850_RELATIVE               },
+  { BFD_RELOC_RELATIVE,                           R_V850_RELATIVE               },
   { BFD_RELOC_V850_16_GOTOFF,             R_V850_16_GOTOFF              },
   { BFD_RELOC_V850_32_GOTOFF,             R_V850_32_GOTOFF              },
   { BFD_RELOC_V850_CODE,                  R_V850_CODE                   },

diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index 91ef605cb4f711f36a24c3e0dbd232825b741457..12a4e0f40b3f9a8cca57c05922bf9f86e0abc269 100644 (file)
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -314,7 +314,7 @@ static const struct
   { BFD_RELOC_NONE, R_VAX_COPY },
   { BFD_RELOC_GLOB_DAT, R_VAX_GLOB_DAT },
   { BFD_RELOC_JMP_SLOT, R_VAX_JMP_SLOT },
-  { BFD_RELOC_VAX_RELATIVE, R_VAX_RELATIVE },
+  { BFD_RELOC_RELATIVE, R_VAX_RELATIVE },
   { BFD_RELOC_CTOR, R_VAX_32 },
   { BFD_RELOC_VTABLE_INHERIT, R_VAX_GNU_VTINHERIT },
   { BFD_RELOC_VTABLE_ENTRY, R_VAX_GNU_VTENTRY },

diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 6a0665ec373a61bc5168e3bd3a62148bc75146a2..0889062ff64e78f9e3bc5930e2233d8c7ae3b21d 100644 (file)
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -421,8 +421,8 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       TRACE ("BFD_RELOC_JMP_SLOT");
       return &elf_howto_table[(unsigned) R_XTENSA_JMP_SLOT ];
 
-    case BFD_RELOC_XTENSA_RELATIVE:
-      TRACE ("BFD_RELOC_XTENSA_RELATIVE");
+    case BFD_RELOC_RELATIVE:
+      TRACE ("BFD_RELOC_RELATIVE");
       return &elf_howto_table[(unsigned) R_XTENSA_RELATIVE ];
 
     case BFD_RELOC_XTENSA_PLT:

diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index ac562e38e4da63ad3fed4c3a889147be943119a6..182a1119cdd2390787e4087de589f32604829278 100644 (file)
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -223,7 +223,7 @@ elf_s390_reloc_type_lookup (bfd *abfd,
       return &elf_howto_table[(int) R_390_GLOB_DAT];
     case BFD_RELOC_JMP_SLOT:
       return &elf_howto_table[(int) R_390_JMP_SLOT];
-    case BFD_RELOC_390_RELATIVE:
+    case BFD_RELOC_RELATIVE:
       return &elf_howto_table[(int) R_390_RELATIVE];
     case BFD_RELOC_32_GOTOFF:
       return &elf_howto_table[(int) R_390_GOTOFF32];

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 60746974bb32adfa4049d0b3787841cb57f2001d..fdcbda4913edfec71e849f45608a91f40a06e7a9 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -237,7 +237,7 @@ static const struct elf_reloc_map x86_64_reloc_map[] =
   { BFD_RELOC_COPY,            R_X86_64_COPY, },
   { BFD_RELOC_GLOB_DAT,                R_X86_64_GLOB_DAT, },
   { BFD_RELOC_JMP_SLOT,                R_X86_64_JUMP_SLOT, },
-  { BFD_RELOC_X86_64_RELATIVE, R_X86_64_RELATIVE, },
+  { BFD_RELOC_RELATIVE,                R_X86_64_RELATIVE, },
   { BFD_RELOC_X86_64_GOTPCREL, R_X86_64_GOTPCREL, },
   { BFD_RELOC_32,              R_X86_64_32, },
   { BFD_RELOC_X86_64_32S,      R_X86_64_32S, },

diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index adda19b9ffd18bf0ec96299d72dc279491b1e095..8f4b046196269d2d11c816055c832d9fe7387b28 100644 (file)
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -381,7 +381,7 @@ _bfd_sparc_elf_reloc_type_lookup (bfd *abfd,
     case BFD_RELOC_JMP_SLOT:
       return &_bfd_sparc_elf_howto_table[R_SPARC_JMP_SLOT];
 
-    case BFD_RELOC_SPARC_RELATIVE:
+    case BFD_RELOC_RELATIVE:
       return &_bfd_sparc_elf_howto_table[R_SPARC_RELATIVE];
 
     case BFD_RELOC_SPARC_UA32:

diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index b503613aba490d9350430fec977ff821b67e2293..f23adf47ac261f87cae6c1a6de19c0c18bd76a4f 100644 (file)
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -653,6 +653,7 @@ static const reloc_map tilegx_reloc_map [] =
   TH_REMAP (BFD_RELOC_COPY,                   R_TILEGX_COPY)
   TH_REMAP (BFD_RELOC_GLOB_DAT,                       R_TILEGX_GLOB_DAT)
   TH_REMAP (BFD_RELOC_JMP_SLOT,                       R_TILEGX_JMP_SLOT)
+  TH_REMAP (BFD_RELOC_RELATIVE,                       R_TILEGX_RELATIVE)
 
 #define SIMPLE_REMAP(t) TH_REMAP (BFD_RELOC_##t, R_##t)
 
@@ -664,7 +665,6 @@ static const reloc_map tilegx_reloc_map [] =
   SIMPLE_REMAP (TILEGX_HW0_LAST)
   SIMPLE_REMAP (TILEGX_HW1_LAST)
   SIMPLE_REMAP (TILEGX_HW2_LAST)
-  SIMPLE_REMAP (TILEGX_RELATIVE)
   SIMPLE_REMAP (TILEGX_BROFF_X1)
   SIMPLE_REMAP (TILEGX_JUMPOFF_X1)
   SIMPLE_REMAP (TILEGX_JUMPOFF_X1_PLT)

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 21426a964247c6f42f27244184e343d3d5db59f4..d61e02a882cc212e9388e92c4ebf5d17a72d4665 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -1102,10 +1102,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_COPY",
   "BFD_RELOC_GLOB_DAT",
   "BFD_RELOC_JMP_SLOT",
+  "BFD_RELOC_RELATIVE",
   "BFD_RELOC_IRELATIVE",
   "BFD_RELOC_SIZE32",
   "BFD_RELOC_SIZE64",
-  "BFD_RELOC_68K_RELATIVE",
   "BFD_RELOC_68K_TLS_GD32",
   "BFD_RELOC_68K_TLS_GD16",
   "BFD_RELOC_68K_TLS_GD8",
@@ -1146,7 +1146,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_SPARC_PC10",
   "BFD_RELOC_SPARC_PC22",
   "BFD_RELOC_SPARC_WPLT30",
-  "BFD_RELOC_SPARC_RELATIVE",
   "BFD_RELOC_SPARC_UA16",
   "BFD_RELOC_SPARC_UA32",
   "BFD_RELOC_SPARC_UA64",
@@ -1396,7 +1395,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MN10300_GOT32",
   "BFD_RELOC_MN10300_GOT24",
   "BFD_RELOC_MN10300_GOT16",
-  "BFD_RELOC_MN10300_RELATIVE",
   "BFD_RELOC_MN10300_SYM_DIFF",
   "BFD_RELOC_MN10300_ALIGN",
   "BFD_RELOC_MN10300_TLS_GD",
@@ -1412,7 +1410,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MN10300_16_PCREL",
   "BFD_RELOC_386_GOT32",
   "BFD_RELOC_386_PLT32",
-  "BFD_RELOC_386_RELATIVE",
   "BFD_RELOC_386_GOTOFF",
   "BFD_RELOC_386_GOTPC",
   "BFD_RELOC_386_TLS_TPOFF",
@@ -1432,7 +1429,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_386_TLS_DESC",
   "BFD_RELOC_386_GOT32X",
   "BFD_RELOC_X86_64_GOT32",
-  "BFD_RELOC_X86_64_RELATIVE",
   "BFD_RELOC_X86_64_GOTPCREL",
   "BFD_RELOC_X86_64_32S",
   "BFD_RELOC_X86_64_DTPMOD64",
@@ -1496,7 +1492,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_PPC_BA16",
   "BFD_RELOC_PPC_BA16_BRTAKEN",
   "BFD_RELOC_PPC_BA16_BRNTAKEN",
-  "BFD_RELOC_PPC_RELATIVE",
   "BFD_RELOC_PPC_LOCAL24PC",
   "BFD_RELOC_PPC_EMB_NADDR32",
   "BFD_RELOC_PPC_EMB_NADDR16",
@@ -1690,7 +1685,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_ARM_TLS_LDM32_FDPIC",
   "BFD_RELOC_ARM_TLS_IE32_FDPIC",
   "BFD_RELOC_ARM_GOT32",
-  "BFD_RELOC_ARM_RELATIVE",
   "BFD_RELOC_ARM_GOTOFF",
   "BFD_RELOC_ARM_GOTPC",
   "BFD_RELOC_ARM_GOT_PREL",
@@ -1796,7 +1790,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_SH_LABEL",
   "BFD_RELOC_SH_LOOP_START",
   "BFD_RELOC_SH_LOOP_END",
-  "BFD_RELOC_SH_RELATIVE",
   "BFD_RELOC_SH_GOTPC",
   "BFD_RELOC_SH_GOT_LOW16",
   "BFD_RELOC_SH_GOT_MEDLOW16",
@@ -1902,7 +1895,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_ARC_32_PCREL",
   "BFD_RELOC_ARC_GOT32",
   "BFD_RELOC_ARC_GOTPC32",
-  "BFD_RELOC_ARC_RELATIVE",
   "BFD_RELOC_ARC_GOTOFF",
   "BFD_RELOC_ARC_GOTPC",
   "BFD_RELOC_ARC_S21W_PCREL_PLT",
@@ -2000,7 +1992,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_M32R_SDA16",
   "BFD_RELOC_M32R_GOT24",
   "BFD_RELOC_M32R_26_PLTREL",
-  "BFD_RELOC_M32R_RELATIVE",
   "BFD_RELOC_M32R_GOTOFF",
   "BFD_RELOC_M32R_GOTOFF_HI_ULO",
   "BFD_RELOC_M32R_GOTOFF_HI_SLO",
@@ -2035,7 +2026,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_NDS32_GOT20",
   "BFD_RELOC_NDS32_9_PLTREL",
   "BFD_RELOC_NDS32_25_PLTREL",
-  "BFD_RELOC_NDS32_RELATIVE",
   "BFD_RELOC_NDS32_GOTOFF",
   "BFD_RELOC_NDS32_GOTOFF_HI20",
   "BFD_RELOC_NDS32_GOTOFF_LO12",
@@ -2174,7 +2164,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_V850_32_GOT",
   "BFD_RELOC_V850_22_PLT_PCREL",
   "BFD_RELOC_V850_32_PLT_PCREL",
-  "BFD_RELOC_V850_RELATIVE",
   "BFD_RELOC_V850_16_GOTOFF",
   "BFD_RELOC_V850_32_GOTOFF",
   "BFD_RELOC_V850_CODE",
@@ -2266,7 +2255,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_METAG_RELBRANCH_PLT",
   "BFD_RELOC_METAG_GOTOFF",
   "BFD_RELOC_METAG_PLT",
-  "BFD_RELOC_METAG_RELATIVE",
   "BFD_RELOC_METAG_TLS_GD",
   "BFD_RELOC_METAG_TLS_LDM",
   "BFD_RELOC_METAG_TLS_LDO_HI16",
@@ -2450,7 +2438,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_RX_RELAX",
   "BFD_RELOC_390_12",
   "BFD_RELOC_390_GOT12",
-  "BFD_RELOC_390_RELATIVE",
   "BFD_RELOC_390_GOTPC",
   "BFD_RELOC_390_GOT16",
   "BFD_RELOC_390_PC12DBL",
@@ -2692,7 +2679,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_CRIS_UNSIGNED_16",
   "BFD_RELOC_CRIS_LAPCQ_OFFSET",
   "BFD_RELOC_CRIS_UNSIGNED_4",
-  "BFD_RELOC_CRIS_RELATIVE",
   "BFD_RELOC_CRIS_32_GOT",
   "BFD_RELOC_CRIS_16_GOT",
   "BFD_RELOC_CRIS_32_GOTPLT",
@@ -2726,7 +2712,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_OR1K_PLT26",
   "BFD_RELOC_OR1K_PLTA26",
   "BFD_RELOC_OR1K_GOTOFF_SLO16",
-  "BFD_RELOC_OR1K_RELATIVE",
   "BFD_RELOC_OR1K_TLS_GD_HI16",
   "BFD_RELOC_OR1K_TLS_GD_LO16",
   "BFD_RELOC_OR1K_TLS_GD_PG21",
@@ -2760,7 +2745,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_XSTORMY16_24",
   "BFD_RELOC_XSTORMY16_FPTR16",
   "BFD_RELOC_RELC",
-  "BFD_RELOC_VAX_RELATIVE",
   "BFD_RELOC_MT_PC16",
   "BFD_RELOC_MT_HI16",
   "BFD_RELOC_MT_LO16",
@@ -2807,7 +2791,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_IQ2000_OFFSET_21",
   "BFD_RELOC_IQ2000_UHI16",
   "BFD_RELOC_XTENSA_RTLD",
-  "BFD_RELOC_XTENSA_RELATIVE",
   "BFD_RELOC_XTENSA_PLT",
   "BFD_RELOC_XTENSA_DIFF8",
   "BFD_RELOC_XTENSA_DIFF16",
@@ -2876,7 +2859,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_LM32_16_GOT",
   "BFD_RELOC_LM32_GOTOFF_HI16",
   "BFD_RELOC_LM32_GOTOFF_LO16",
-  "BFD_RELOC_LM32_RELATIVE",
   "BFD_RELOC_MACH_O_SECTDIFF",
   "BFD_RELOC_MACH_O_LOCAL_SECTDIFF",
   "BFD_RELOC_MACH_O_PAIR",
@@ -3127,7 +3109,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_LO12_NC",
   "BFD_RELOC_AARCH64_TLSDESC_LD_LO12_NC",
   "BFD_RELOC_AARCH64_BRANCH9",
-  "BFD_RELOC_TILEPRO_RELATIVE",
   "BFD_RELOC_TILEPRO_BROFF_X1",
   "BFD_RELOC_TILEPRO_JOFFLONG_X1",
   "BFD_RELOC_TILEPRO_JOFFLONG_X1_PLT",
@@ -3210,7 +3191,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_TILEGX_HW0_LAST",
   "BFD_RELOC_TILEGX_HW1_LAST",
   "BFD_RELOC_TILEGX_HW2_LAST",
-  "BFD_RELOC_TILEGX_RELATIVE",
   "BFD_RELOC_TILEGX_BROFF_X1",
   "BFD_RELOC_TILEGX_JUMPOFF_X1",
   "BFD_RELOC_TILEGX_JUMPOFF_X1_PLT",

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 625ddf22d93c45796126c42fc1370e05189dc8dd..165060d96ce22828a4b856b94f1736d30212f4c4 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1476,6 +1476,8 @@ ENUMX
   BFD_RELOC_GLOB_DAT
 ENUMX
   BFD_RELOC_JMP_SLOT
+ENUMX
+  BFD_RELOC_RELATIVE
 ENUMX
   BFD_RELOC_IRELATIVE
 ENUMDOC
@@ -1489,8 +1491,6 @@ ENUMDOC
   Size relocations.
 
 ENUM
-  BFD_RELOC_68K_RELATIVE
-ENUMX
   BFD_RELOC_68K_TLS_GD32
 ENUMX
   BFD_RELOC_68K_TLS_GD16
@@ -1597,8 +1597,6 @@ ENUMX
   BFD_RELOC_SPARC_PC22
 ENUMX
   BFD_RELOC_SPARC_WPLT30
-ENUMX
-  BFD_RELOC_SPARC_RELATIVE
 ENUMX
   BFD_RELOC_SPARC_UA16
 ENUMX
@@ -2287,10 +2285,6 @@ ENUM
 ENUMDOC
   This is a 16bit GOT-relative reloc for the mn10300, offset by two
   bytes in the instruction.
-ENUM
-  BFD_RELOC_MN10300_RELATIVE
-ENUMDOC
-  Adjust by program base.
 ENUM
   BFD_RELOC_MN10300_SYM_DIFF
 ENUMDOC
@@ -2337,8 +2331,6 @@ ENUM
   BFD_RELOC_386_GOT32
 ENUMX
   BFD_RELOC_386_PLT32
-ENUMX
-  BFD_RELOC_386_RELATIVE
 ENUMX
   BFD_RELOC_386_GOTOFF
 ENUMX
@@ -2380,8 +2372,6 @@ ENUMDOC
 
 ENUM
   BFD_RELOC_X86_64_GOT32
-ENUMX
-  BFD_RELOC_X86_64_RELATIVE
 ENUMX
   BFD_RELOC_X86_64_GOTPCREL
 ENUMX
@@ -2520,8 +2510,6 @@ ENUMX
   BFD_RELOC_PPC_BA16_BRTAKEN
 ENUMX
   BFD_RELOC_PPC_BA16_BRNTAKEN
-ENUMX
-  BFD_RELOC_PPC_RELATIVE
 ENUMX
   BFD_RELOC_PPC_LOCAL24PC
 ENUMX
@@ -2986,8 +2974,6 @@ ENUMDOC
 
 ENUM
   BFD_RELOC_ARM_GOT32
-ENUMX
-  BFD_RELOC_ARM_RELATIVE
 ENUMX
   BFD_RELOC_ARM_GOTOFF
 ENUMX
@@ -3217,8 +3203,6 @@ ENUMX
   BFD_RELOC_SH_LOOP_START
 ENUMX
   BFD_RELOC_SH_LOOP_END
-ENUMX
-  BFD_RELOC_SH_RELATIVE
 ENUMX
   BFD_RELOC_SH_GOTPC
 ENUMX
@@ -3432,8 +3416,6 @@ ENUMX
   BFD_RELOC_ARC_GOT32
 ENUMX
   BFD_RELOC_ARC_GOTPC32
-ENUMX
-  BFD_RELOC_ARC_RELATIVE
 ENUMX
   BFD_RELOC_ARC_GOTOFF
 ENUMX
@@ -3775,8 +3757,6 @@ ENUM
   BFD_RELOC_M32R_GOT24
 ENUMX
   BFD_RELOC_M32R_26_PLTREL
-ENUMX
-  BFD_RELOC_M32R_RELATIVE
 ENUMX
   BFD_RELOC_M32R_GOTOFF
 ENUMX
@@ -3906,8 +3886,6 @@ ENUMX
   BFD_RELOC_NDS32_9_PLTREL
 ENUMX
   BFD_RELOC_NDS32_25_PLTREL
-ENUMX
-  BFD_RELOC_NDS32_RELATIVE
 ENUMX
   BFD_RELOC_NDS32_GOTOFF
 ENUMX
@@ -4285,8 +4263,6 @@ ENUMX
   BFD_RELOC_V850_22_PLT_PCREL
 ENUMX
   BFD_RELOC_V850_32_PLT_PCREL
-ENUMX
-  BFD_RELOC_V850_RELATIVE
 ENUMX
   BFD_RELOC_V850_16_GOTOFF
 ENUMX
@@ -4537,8 +4513,6 @@ ENUMX
   BFD_RELOC_METAG_GOTOFF
 ENUMX
   BFD_RELOC_METAG_PLT
-ENUMX
-  BFD_RELOC_METAG_RELATIVE
 ENUMX
   BFD_RELOC_METAG_TLS_GD
 ENUMX
@@ -5052,10 +5026,6 @@ ENUM
   BFD_RELOC_390_GOT12
 ENUMDOC
   12 bit GOT offset.
-ENUM
-  BFD_RELOC_390_RELATIVE
-ENUMDOC
-  Adjust by program base.
 ENUM
   BFD_RELOC_390_GOTPC
 ENUMDOC
@@ -5762,10 +5732,6 @@ ENUMX
 ENUMDOC
   These relocs are only used within the CRIS assembler.  They are not
   (at present) written to any object files.
-ENUM
-  BFD_RELOC_CRIS_RELATIVE
-ENUMDOC
-  Relocs used in ELF shared libraries for CRIS.
 ENUM
   BFD_RELOC_CRIS_32_GOT
 ENUMDOC
@@ -5851,8 +5817,6 @@ ENUMX
   BFD_RELOC_OR1K_PLTA26
 ENUMX
   BFD_RELOC_OR1K_GOTOFF_SLO16
-ENUMX
-  BFD_RELOC_OR1K_RELATIVE
 ENUMX
   BFD_RELOC_OR1K_TLS_GD_HI16
 ENUMX
@@ -5931,11 +5895,6 @@ ENUM
 ENUMDOC
   Self-describing complex relocations.
 
-ENUM
-  BFD_RELOC_VAX_RELATIVE
-ENUMDOC
-  Relocations used by VAX ELF.
-
 ENUM
   BFD_RELOC_MT_PC16
 ENUMDOC
@@ -6075,10 +6034,6 @@ ENUMDOC
   Special Xtensa relocation used only by PLT entries in ELF shared
   objects to indicate that the runtime linker should set the value
   to one of its own internal functions or data structures.
-ENUM
-  BFD_RELOC_XTENSA_RELATIVE
-ENUMDOC
-  Xtensa relocations for ELF shared objects.
 ENUM
   BFD_RELOC_XTENSA_PLT
 ENUMDOC
@@ -6285,8 +6240,6 @@ ENUMX
   BFD_RELOC_LM32_GOTOFF_HI16
 ENUMX
   BFD_RELOC_LM32_GOTOFF_LO16
-ENUMX
-  BFD_RELOC_LM32_RELATIVE
 ENUMDOC
   Lattice Mico32 relocations.
 
@@ -7236,8 +7189,6 @@ ENUMDOC
   The lowest two bits must be zero and are not stored in the
   instruction, giving an 11 bit signed byte offset.
 ENUM
-  BFD_RELOC_TILEPRO_RELATIVE
-ENUMX
   BFD_RELOC_TILEPRO_BROFF_X1
 ENUMX
   BFD_RELOC_TILEPRO_JOFFLONG_X1
@@ -7403,8 +7354,6 @@ ENUMX
   BFD_RELOC_TILEGX_HW1_LAST
 ENUMX
   BFD_RELOC_TILEGX_HW2_LAST
-ENUMX
-  BFD_RELOC_TILEGX_RELATIVE
 ENUMX
   BFD_RELOC_TILEGX_BROFF_X1
 ENUMX

diff --git a/include/elf/cris.h b/include/elf/cris.h
index 41300345e711401687d39a98bdb6d52c26642017..b5cf0e766e58c3f2172ff0fa654042559a1d2598 100644 (file)
--- a/include/elf/cris.h
+++ b/include/elf/cris.h
@@ -52,7 +52,7 @@ START_RELOC_NUMBERS (elf_cris_reloc_type)
   RELOC_NUMBER (R_CRIS_JUMP_SLOT, 11)
 
   /* Adjust by program base.  Generated by the linker.
-     The BFD equivalent is BFD_RELOC_CRIS_RELATIVE.  */
+     The BFD equivalent is BFD_RELOC_RELATIVE.  */
   RELOC_NUMBER (R_CRIS_RELATIVE, 12)
 
   /* A 16-bit offset to entry in GOT and request to create GOT entry for