bfd/ELF: fold BFD_RELOC_<arch>_J{,U}MP_SLOT

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 969c9934e090a348eac9d1ef64d97a2409984bc5..244562641c30e8464e005472d7f1dde46f20081b 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -3325,6 +3325,7 @@ enum bfd_reloc_code_real
   BFD_RELOC_8_PLTOFF,
   BFD_RELOC_COPY,
   BFD_RELOC_GLOB_DAT,
+  BFD_RELOC_JMP_SLOT,
   BFD_RELOC_IRELATIVE,
 
   /* Size relocations.  */
@@ -3332,7 +3333,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_SIZE64,
 
   /* Relocations used by 68K ELF.  */
-  BFD_RELOC_68K_JMP_SLOT,
   BFD_RELOC_68K_RELATIVE,
   BFD_RELOC_68K_TLS_GD32,
   BFD_RELOC_68K_TLS_GD16,
@@ -3396,7 +3396,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_SPARC_PC10,
   BFD_RELOC_SPARC_PC22,
   BFD_RELOC_SPARC_WPLT30,
-  BFD_RELOC_SPARC_JMP_SLOT,
   BFD_RELOC_SPARC_RELATIVE,
   BFD_RELOC_SPARC_UA16,
   BFD_RELOC_SPARC_UA32,
@@ -3725,9 +3724,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_MICROMIPS_TLS_TPREL_LO16,
   BFD_RELOC_MIPS_EH,
 
-  /* MIPS ELF relocations (VxWorks and PLT extensions).  */
-  BFD_RELOC_MIPS_JUMP_SLOT,
-
   /* Moxie ELF relocations.  */
   BFD_RELOC_MOXIE_10_PCREL,
 
@@ -3798,9 +3794,6 @@ enum bfd_reloc_code_real
      bytes in the instruction.  */
   BFD_RELOC_MN10300_GOT16,
 
-  /* Create PLT entry.  */
-  BFD_RELOC_MN10300_JMP_SLOT,
-
   /* Adjust by program base.  */
   BFD_RELOC_MN10300_RELATIVE,
 
@@ -3835,7 +3828,6 @@ enum bfd_reloc_code_real
   /* i386/elf relocations.  */
   BFD_RELOC_386_GOT32,
   BFD_RELOC_386_PLT32,
-  BFD_RELOC_386_JUMP_SLOT,
   BFD_RELOC_386_RELATIVE,
   BFD_RELOC_386_GOTOFF,
   BFD_RELOC_386_GOTPC,
@@ -3858,7 +3850,6 @@ enum bfd_reloc_code_real
 
   /* x86-64/elf relocations.  */
   BFD_RELOC_X86_64_GOT32,
-  BFD_RELOC_X86_64_JUMP_SLOT,
   BFD_RELOC_X86_64_RELATIVE,
   BFD_RELOC_X86_64_GOTPCREL,
   BFD_RELOC_X86_64_32S,
@@ -3931,7 +3922,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_PPC_BA16,
   BFD_RELOC_PPC_BA16_BRTAKEN,
   BFD_RELOC_PPC_BA16_BRNTAKEN,
-  BFD_RELOC_PPC_JMP_SLOT,
   BFD_RELOC_PPC_RELATIVE,
   BFD_RELOC_PPC_LOCAL24PC,
   BFD_RELOC_PPC_EMB_NADDR32,
@@ -4188,7 +4178,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_ARM_TLS_IE32_FDPIC,
 
   /* Relocations for setting up GOTs and PLTs for shared libraries.  */
-  BFD_RELOC_ARM_JUMP_SLOT,
   BFD_RELOC_ARM_GOT32,
   BFD_RELOC_ARM_RELATIVE,
   BFD_RELOC_ARM_GOTOFF,
@@ -4309,7 +4298,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_SH_LABEL,
   BFD_RELOC_SH_LOOP_START,
   BFD_RELOC_SH_LOOP_END,
-  BFD_RELOC_SH_JMP_SLOT,
   BFD_RELOC_SH_RELATIVE,
   BFD_RELOC_SH_GOTPC,
   BFD_RELOC_SH_GOT_LOW16,
@@ -4418,7 +4406,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_ARC_32_PCREL,
   BFD_RELOC_ARC_GOT32,
   BFD_RELOC_ARC_GOTPC32,
-  BFD_RELOC_ARC_JMP_SLOT,
   BFD_RELOC_ARC_RELATIVE,
   BFD_RELOC_ARC_GOTOFF,
   BFD_RELOC_ARC_GOTPC,
@@ -4658,7 +4645,6 @@ enum bfd_reloc_code_real
   /* For PIC.  */
   BFD_RELOC_M32R_GOT24,
   BFD_RELOC_M32R_26_PLTREL,
-  BFD_RELOC_M32R_JMP_SLOT,
   BFD_RELOC_M32R_RELATIVE,
   BFD_RELOC_M32R_GOTOFF,
   BFD_RELOC_M32R_GOTOFF_HI_ULO,
@@ -4753,7 +4739,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_NDS32_GOT20,
   BFD_RELOC_NDS32_9_PLTREL,
   BFD_RELOC_NDS32_25_PLTREL,
-  BFD_RELOC_NDS32_JMP_SLOT,
   BFD_RELOC_NDS32_RELATIVE,
   BFD_RELOC_NDS32_GOTOFF,
   BFD_RELOC_NDS32_GOTOFF_HI20,
@@ -4991,7 +4976,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_JMP_SLOT,
   BFD_RELOC_V850_RELATIVE,
   BFD_RELOC_V850_16_GOTOFF,
   BFD_RELOC_V850_32_GOTOFF,
@@ -5053,7 +5037,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_C6000_SBR_GOT_H16_W,
   BFD_RELOC_C6000_DSBT_INDEX,
   BFD_RELOC_C6000_PREL31,
-  BFD_RELOC_C6000_JUMP_SLOT,
   BFD_RELOC_C6000_EHTYPE,
   BFD_RELOC_C6000_PCR_H16,
   BFD_RELOC_C6000_PCR_L16,
@@ -5142,7 +5125,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_METAG_RELBRANCH_PLT,
   BFD_RELOC_METAG_GOTOFF,
   BFD_RELOC_METAG_PLT,
-  BFD_RELOC_METAG_JMP_SLOT,
   BFD_RELOC_METAG_RELATIVE,
   BFD_RELOC_METAG_TLS_GD,
   BFD_RELOC_METAG_TLS_LDM,
@@ -5467,9 +5449,6 @@ enum bfd_reloc_code_real
   /* 12 bit GOT offset.  */
   BFD_RELOC_390_GOT12,
 
-  /* Create PLT entry.  */
-  BFD_RELOC_390_JMP_SLOT,
-
   /* Adjust by program base.  */
   BFD_RELOC_390_RELATIVE,
 
@@ -5929,7 +5908,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_CRIS_UNSIGNED_4,
 
   /* Relocs used in ELF shared libraries for CRIS.  */
-  BFD_RELOC_CRIS_JUMP_SLOT,
   BFD_RELOC_CRIS_RELATIVE,
 
   /* 32-bit offset to symbol-entry within GOT.  */
@@ -5983,7 +5961,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_OR1K_PLT26,
   BFD_RELOC_OR1K_PLTA26,
   BFD_RELOC_OR1K_GOTOFF_SLO16,
-  BFD_RELOC_OR1K_JMP_SLOT,
   BFD_RELOC_OR1K_RELATIVE,
   BFD_RELOC_OR1K_TLS_GD_HI16,
   BFD_RELOC_OR1K_TLS_GD_LO16,
@@ -6026,7 +6003,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_RELC,
 
   /* Relocations used by VAX ELF.  */
-  BFD_RELOC_VAX_JMP_SLOT,
   BFD_RELOC_VAX_RELATIVE,
 
   /* Morpho MT - 16 bit immediate relocation.  */
@@ -6119,7 +6095,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_XTENSA_RTLD,
 
   /* Xtensa relocations for ELF shared objects.  */
-  BFD_RELOC_XTENSA_JMP_SLOT,
   BFD_RELOC_XTENSA_RELATIVE,
 
   /* Xtensa relocation used in ELF object files for symbols that may
@@ -6258,7 +6233,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_LM32_16_GOT,
   BFD_RELOC_LM32_GOTOFF_HI16,
   BFD_RELOC_LM32_GOTOFF_LO16,
-  BFD_RELOC_LM32_JMP_SLOT,
   BFD_RELOC_LM32_RELATIVE,
 
   /* Difference between two section addreses.  Must be followed by a
@@ -6953,7 +6927,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_AARCH64_BRANCH9,
 
   /* Tilera TILEPro Relocations.  */
-  BFD_RELOC_TILEPRO_JMP_SLOT,
   BFD_RELOC_TILEPRO_RELATIVE,
   BFD_RELOC_TILEPRO_BROFF_X1,
   BFD_RELOC_TILEPRO_JOFFLONG_X1,
@@ -7039,7 +7012,6 @@ enum bfd_reloc_code_real
   BFD_RELOC_TILEGX_HW0_LAST,
   BFD_RELOC_TILEGX_HW1_LAST,
   BFD_RELOC_TILEGX_HW2_LAST,
-  BFD_RELOC_TILEGX_JMP_SLOT,
   BFD_RELOC_TILEGX_RELATIVE,
   BFD_RELOC_TILEGX_BROFF_X1,
   BFD_RELOC_TILEGX_JUMPOFF_X1,

diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 60d2351ca56df107ec912c4c00e3a187f42befb5..f0c14beecc6f3ef13638d07fb63cfdf9143290c9 100644 (file)
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -664,7 +664,7 @@ static const struct mn10300_reloc_map mn10300_reloc_map[] =
   { BFD_RELOC_MN10300_GOT16, R_MN10300_GOT16 },
   { BFD_RELOC_COPY, R_MN10300_COPY },
   { BFD_RELOC_GLOB_DAT, R_MN10300_GLOB_DAT },
-  { BFD_RELOC_MN10300_JMP_SLOT, R_MN10300_JMP_SLOT },
+  { BFD_RELOC_JMP_SLOT, R_MN10300_JMP_SLOT },
   { BFD_RELOC_MN10300_RELATIVE, R_MN10300_RELATIVE },
   { BFD_RELOC_MN10300_TLS_GD, R_MN10300_TLS_GD },
   { BFD_RELOC_MN10300_TLS_LD, R_MN10300_TLS_LD },

diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index ce020052ac0ad4280a0bdf50e03ff3e23bea54d7..6a56244b241c16575e88018c8508bda6c3fb8aea 100644 (file)
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -387,6 +387,7 @@ arc_elf_link_hash_table_create (bfd *abfd)
 #define BFD_RELOC_ARC_PLT32    BFD_RELOC_32_PLT_PCREL
 #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
 
 static const struct arc_reloc_map arc_reloc_map[] =
 {

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 980ac76cccc3cce8c87eb76646ae89a0dc27f98d..643d2285d71c58c1d85845c3f36188b281c9986f 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -2017,7 +2017,7 @@ static const struct elf32_arm_reloc_map elf32_arm_reloc_map[] =
     {BFD_RELOC_THUMB_PCREL_BRANCH9,  R_ARM_THM_JUMP8},
     {BFD_RELOC_THUMB_PCREL_BRANCH7,  R_ARM_THM_JUMP6},
     {BFD_RELOC_GLOB_DAT,            R_ARM_GLOB_DAT},
-    {BFD_RELOC_ARM_JUMP_SLOT,       R_ARM_JUMP_SLOT},
+    {BFD_RELOC_JMP_SLOT,            R_ARM_JUMP_SLOT},
     {BFD_RELOC_ARM_RELATIVE,        R_ARM_RELATIVE},
     {BFD_RELOC_ARM_GOTOFF,          R_ARM_GOTOFF32},
     {BFD_RELOC_ARM_GOTPC,           R_ARM_GOTPC},

diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index 909b4bd3744ae1dd668b9be9b01c61fa2ac165b4..14aa9cb1a7f361ce0c38f72c559986b58c46f6d6 100644 (file)
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -400,7 +400,7 @@ static const struct cris_reloc_map cris_reloc_map [] =
   { BFD_RELOC_VTABLE_ENTRY,    R_CRIS_GNU_VTENTRY },
   { BFD_RELOC_COPY,            R_CRIS_COPY },
   { BFD_RELOC_GLOB_DAT,                R_CRIS_GLOB_DAT },
-  { BFD_RELOC_CRIS_JUMP_SLOT,  R_CRIS_JUMP_SLOT },
+  { BFD_RELOC_JMP_SLOT,                R_CRIS_JUMP_SLOT },
   { BFD_RELOC_CRIS_RELATIVE,   R_CRIS_RELATIVE },
   { BFD_RELOC_CRIS_16_GOT,     R_CRIS_16_GOT },
   { BFD_RELOC_CRIS_32_GOT,     R_CRIS_32_GOT },

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index bc60a3a24a7f2aff23b3479028ef6fa3548cf1e1..a0da37cf1ff23aa3e5c7bfd630431b2737b4b425 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -224,8 +224,8 @@ elf_i386_reloc_type_lookup (bfd *abfd,
       TRACE ("BFD_RELOC_GLOB_DAT");
       return &elf_howto_table[R_386_GLOB_DAT];
 
-    case BFD_RELOC_386_JUMP_SLOT:
-      TRACE ("BFD_RELOC_386_JUMP_SLOT");
+    case BFD_RELOC_JMP_SLOT:
+      TRACE ("BFD_RELOC_JMP_SLOT");
       return &elf_howto_table[R_386_JUMP_SLOT];
 
     case BFD_RELOC_386_RELATIVE:

diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
index 9808f1a5cf65fb56bed7a54ad4126c2e31081689..819eedc529f50532ddad466266faa88be17d8c39 100644 (file)
--- a/bfd/elf32-lm32.c
+++ b/bfd/elf32-lm32.c
@@ -446,7 +446,7 @@ static const struct lm32_reloc_map lm32_reloc_map[] =
   { BFD_RELOC_LM32_GOTOFF_LO16, R_LM32_GOTOFF_LO16 },
   { BFD_RELOC_COPY,            R_LM32_COPY },
   { BFD_RELOC_GLOB_DAT,                R_LM32_GLOB_DAT },
-  { BFD_RELOC_LM32_JMP_SLOT,   R_LM32_JMP_SLOT },
+  { BFD_RELOC_JMP_SLOT,                R_LM32_JMP_SLOT },
   { BFD_RELOC_LM32_RELATIVE,   R_LM32_RELATIVE },
 };
 

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

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 485fa2764c2954afece47e241252f2e9ed1a43d7..1ece9c2041cfafbb01f354e95066729bef6d5a3e 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -390,7 +390,7 @@ static const struct
   { BFD_RELOC_8_PLTOFF, R_68K_PLT8O },
   { BFD_RELOC_NONE, R_68K_COPY },
   { BFD_RELOC_GLOB_DAT, R_68K_GLOB_DAT },
-  { BFD_RELOC_68K_JMP_SLOT, R_68K_JMP_SLOT },
+  { BFD_RELOC_JMP_SLOT, R_68K_JMP_SLOT },
   { BFD_RELOC_68K_RELATIVE, R_68K_RELATIVE },
   { BFD_RELOC_CTOR, R_68K_32 },
   { BFD_RELOC_VTABLE_INHERIT, R_68K_GNU_VTINHERIT },

diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
index ae5bd5228ad69f507b71be5cb64295587a91de74..17189ef3dba275a48e66a042be981b0fda69942a 100644 (file)
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
@@ -721,7 +721,7 @@ static const struct metag_reloc_map metag_reloc_map [] =
     { BFD_RELOC_METAG_GOTOFF,       R_METAG_GOTOFF },
     { BFD_RELOC_METAG_PLT,          R_METAG_PLT },
     { BFD_RELOC_COPY,               R_METAG_COPY },
-    { BFD_RELOC_METAG_JMP_SLOT,             R_METAG_JMP_SLOT },
+    { BFD_RELOC_JMP_SLOT,           R_METAG_JMP_SLOT },
     { BFD_RELOC_METAG_RELATIVE,             R_METAG_RELATIVE },
     { BFD_RELOC_GLOB_DAT,           R_METAG_GLOB_DAT },
     { BFD_RELOC_METAG_TLS_GD,       R_METAG_TLS_GD },

diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index e025cd8672d5083fc70f836e5cd5fef4fa2e3918..83dd138205a0951a0e0e1769a9fca29984e7b39e 100644 (file)
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -3591,7 +3591,7 @@ mips_elf32_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code,
       return &elf_mips_gnu_pcrel32;
     case BFD_RELOC_COPY:
       return &elf_mips_copy_howto;
-    case BFD_RELOC_MIPS_JUMP_SLOT:
+    case BFD_RELOC_JMP_SLOT:
       return &elf_mips_jump_slot_howto;
     case BFD_RELOC_MIPS_EH:
       return &elf_mips_eh_howto;

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

diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 2482a0eb40b25a9990059cb24da50e60795edd51..71d8055097320521140f48b780842ea6f975538c 100644 (file)
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -877,7 +877,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] =
   { BFD_RELOC_OR1K_PLT26,      R_OR1K_PLT26 },
   { BFD_RELOC_GLOB_DAT,                R_OR1K_GLOB_DAT },
   { BFD_RELOC_COPY,            R_OR1K_COPY },
-  { BFD_RELOC_OR1K_JMP_SLOT,   R_OR1K_JMP_SLOT },
+  { BFD_RELOC_JMP_SLOT,                R_OR1K_JMP_SLOT },
   { BFD_RELOC_OR1K_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 },

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index c8ab5abf5a1dd26c979d3c33800f56623558a569..c0a28a6d84351e2854dc008ba4a955ae23e989a7 100644 (file)
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -207,7 +207,7 @@ elf_s390_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       return &elf_howto_table[(int) R_390_COPY];
     case BFD_RELOC_GLOB_DAT:
       return &elf_howto_table[(int) R_390_GLOB_DAT];
-    case BFD_RELOC_390_JMP_SLOT:
+    case BFD_RELOC_JMP_SLOT:
       return &elf_howto_table[(int) R_390_JMP_SLOT];
     case BFD_RELOC_390_RELATIVE:
       return &elf_howto_table[(int) R_390_RELATIVE];

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

diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 8fc05db066de2310bf16aae1a95a79085d9cae76..55c4869b284b48dcfd8e0ec61acddc847a44d520 100644 (file)
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -1423,7 +1423,7 @@ static const tic6x_reloc_map elf32_tic6x_reloc_map[] =
     { BFD_RELOC_C6000_DSBT_INDEX, R_C6000_DSBT_INDEX },
     { BFD_RELOC_C6000_PREL31, R_C6000_PREL31 },
     { BFD_RELOC_COPY, R_C6000_COPY },
-    { BFD_RELOC_C6000_JUMP_SLOT, R_C6000_JUMP_SLOT },
+    { BFD_RELOC_JMP_SLOT, R_C6000_JUMP_SLOT },
     { BFD_RELOC_C6000_EHTYPE, R_C6000_EHTYPE },
     { BFD_RELOC_C6000_PCR_H16, R_C6000_PCR_H16 },
     { BFD_RELOC_C6000_PCR_L16, R_C6000_PCR_L16 },

diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index c39323a5f9774c78bde506b14b4346c0ebdb2c9f..d766cfcd7703019fc9552b8e07fd4b2fbad4d815 100644 (file)
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -585,7 +585,7 @@ static const reloc_map tilepro_reloc_map [] =
   /* Custom relocations. */
   TH_REMAP (BFD_RELOC_COPY,                   R_TILEPRO_COPY)
   TH_REMAP (BFD_RELOC_GLOB_DAT,                       R_TILEPRO_GLOB_DAT)
-  TH_REMAP (BFD_RELOC_TILEPRO_JMP_SLOT,               R_TILEPRO_JMP_SLOT)
+  TH_REMAP (BFD_RELOC_JMP_SLOT,                       R_TILEPRO_JMP_SLOT)
   TH_REMAP (BFD_RELOC_TILEPRO_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)

diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 36a39f6c7c881e5d7aabb09ee7c2689b70685549..1c49aeac8ae4801731eb677d537ffc34ee12aca1 100644 (file)
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -1738,7 +1738,7 @@ static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
   { BFD_RELOC_V850_32_PLT_PCREL,          R_V850_32_PLT                 },
   { BFD_RELOC_COPY,                       R_V850_COPY                   },
   { BFD_RELOC_GLOB_DAT,                           R_V850_GLOB_DAT               },
-  { BFD_RELOC_V850_JMP_SLOT,              R_V850_JMP_SLOT               },
+  { BFD_RELOC_JMP_SLOT,                           R_V850_JMP_SLOT               },
   { BFD_RELOC_V850_RELATIVE,              R_V850_RELATIVE               },
   { BFD_RELOC_V850_16_GOTOFF,             R_V850_16_GOTOFF              },
   { BFD_RELOC_V850_32_GOTOFF,             R_V850_32_GOTOFF              },

diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index cbcf330faacadaf453b5ff1665eca4db8a0dbad0..91ef605cb4f711f36a24c3e0dbd232825b741457 100644 (file)
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -313,7 +313,7 @@ static const struct
   { BFD_RELOC_32_PLT_PCREL, R_VAX_PLT32 },
   { BFD_RELOC_NONE, R_VAX_COPY },
   { BFD_RELOC_GLOB_DAT, R_VAX_GLOB_DAT },
-  { BFD_RELOC_VAX_JMP_SLOT, R_VAX_JMP_SLOT },
+  { BFD_RELOC_JMP_SLOT, R_VAX_JMP_SLOT },
   { BFD_RELOC_VAX_RELATIVE, R_VAX_RELATIVE },
   { BFD_RELOC_CTOR, R_VAX_32 },
   { BFD_RELOC_VTABLE_INHERIT, R_VAX_GNU_VTINHERIT },

diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index e7fb575acb897723f1d675ace506f7431f8fda76..6a0665ec373a61bc5168e3bd3a62148bc75146a2 100644 (file)
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -417,8 +417,8 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       TRACE ("BFD_RELOC_GLOB_DAT");
       return &elf_howto_table[(unsigned) R_XTENSA_GLOB_DAT ];
 
-    case BFD_RELOC_XTENSA_JMP_SLOT:
-      TRACE ("BFD_RELOC_XTENSA_JMP_SLOT");
+    case BFD_RELOC_JMP_SLOT:
+      TRACE ("BFD_RELOC_JMP_SLOT");
       return &elf_howto_table[(unsigned) R_XTENSA_JMP_SLOT ];
 
     case BFD_RELOC_XTENSA_RELATIVE:

diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index 4f7692fda615b082252cb7657fb8d7d1d8d499a9..7fdad19b828339618a4e4fe2513ca6bf144932a5 100644 (file)
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -3852,7 +3852,7 @@ bfd_elf64_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       return &elf_mips_eh_howto;
     case BFD_RELOC_COPY:
       return &elf_mips_copy_howto;
-    case BFD_RELOC_MIPS_JUMP_SLOT:
+    case BFD_RELOC_JMP_SLOT:
       return &elf_mips_jump_slot_howto;
     default:
       bfd_set_error (bfd_error_bad_value);

diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index f5d0ad4fd8b98a6f8d21314b735925fd15f970d9..ac562e38e4da63ad3fed4c3a889147be943119a6 100644 (file)
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -221,7 +221,7 @@ elf_s390_reloc_type_lookup (bfd *abfd,
       return &elf_howto_table[(int) R_390_COPY];
     case BFD_RELOC_GLOB_DAT:
       return &elf_howto_table[(int) R_390_GLOB_DAT];
-    case BFD_RELOC_390_JMP_SLOT:
+    case BFD_RELOC_JMP_SLOT:
       return &elf_howto_table[(int) R_390_JMP_SLOT];
     case BFD_RELOC_390_RELATIVE:
       return &elf_howto_table[(int) R_390_RELATIVE];

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

diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 3510752679d6fe130fcd693010e63d02ec14865b..029a06d42855c8ebdfeb8d4f2794c644e5f90393 100644 (file)
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -3687,7 +3687,7 @@ bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
       return &elf_mips_eh_howto;
     case BFD_RELOC_COPY:
       return &elf_mips_copy_howto;
-    case BFD_RELOC_MIPS_JUMP_SLOT:
+    case BFD_RELOC_JMP_SLOT:
       return &elf_mips_jump_slot_howto;
     default:
       bfd_set_error (bfd_error_bad_value);

diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 6b3391bc76dbf26389f1850ef460474d27804f41..adda19b9ffd18bf0ec96299d72dc279491b1e095 100644 (file)
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -378,7 +378,7 @@ _bfd_sparc_elf_reloc_type_lookup (bfd *abfd,
     case BFD_RELOC_GLOB_DAT:
       return &_bfd_sparc_elf_howto_table[R_SPARC_GLOB_DAT];
 
-    case BFD_RELOC_SPARC_JMP_SLOT:
+    case BFD_RELOC_JMP_SLOT:
       return &_bfd_sparc_elf_howto_table[R_SPARC_JMP_SLOT];
 
     case BFD_RELOC_SPARC_RELATIVE:

diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index 63f6859fc54b2d314c98e5afc0062ea6fbf51bb8..b503613aba490d9350430fec977ff821b67e2293 100644 (file)
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -652,6 +652,7 @@ static const reloc_map tilegx_reloc_map [] =
   TH_REMAP (BFD_RELOC_8_PCREL,                R_TILEGX_8_PCREL)
   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)
 
 #define SIMPLE_REMAP(t) TH_REMAP (BFD_RELOC_##t, R_##t)
 
@@ -663,7 +664,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_JMP_SLOT)
   SIMPLE_REMAP (TILEGX_RELATIVE)
   SIMPLE_REMAP (TILEGX_BROFF_X1)
   SIMPLE_REMAP (TILEGX_JUMPOFF_X1)

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index b3a491102c0105e915cafea0e780adea6b35d1d7..21426a964247c6f42f27244184e343d3d5db59f4 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -1101,10 +1101,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_8_PLTOFF",
   "BFD_RELOC_COPY",
   "BFD_RELOC_GLOB_DAT",
+  "BFD_RELOC_JMP_SLOT",
   "BFD_RELOC_IRELATIVE",
   "BFD_RELOC_SIZE32",
   "BFD_RELOC_SIZE64",
-  "BFD_RELOC_68K_JMP_SLOT",
   "BFD_RELOC_68K_RELATIVE",
   "BFD_RELOC_68K_TLS_GD32",
   "BFD_RELOC_68K_TLS_GD16",
@@ -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_JMP_SLOT",
   "BFD_RELOC_SPARC_RELATIVE",
   "BFD_RELOC_SPARC_UA16",
   "BFD_RELOC_SPARC_UA32",
@@ -1344,7 +1343,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_MIPS_TLS_TPREL_LO16",
   "BFD_RELOC_MICROMIPS_TLS_TPREL_LO16",
   "BFD_RELOC_MIPS_EH",
-  "BFD_RELOC_MIPS_JUMP_SLOT",
   "BFD_RELOC_MOXIE_10_PCREL",
   "BFD_RELOC_FT32_10",
   "BFD_RELOC_FT32_20",
@@ -1398,7 +1396,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_JMP_SLOT",
   "BFD_RELOC_MN10300_RELATIVE",
   "BFD_RELOC_MN10300_SYM_DIFF",
   "BFD_RELOC_MN10300_ALIGN",
@@ -1415,7 +1412,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_JUMP_SLOT",
   "BFD_RELOC_386_RELATIVE",
   "BFD_RELOC_386_GOTOFF",
   "BFD_RELOC_386_GOTPC",
@@ -1436,7 +1432,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_JUMP_SLOT",
   "BFD_RELOC_X86_64_RELATIVE",
   "BFD_RELOC_X86_64_GOTPCREL",
   "BFD_RELOC_X86_64_32S",
@@ -1501,7 +1496,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_JMP_SLOT",
   "BFD_RELOC_PPC_RELATIVE",
   "BFD_RELOC_PPC_LOCAL24PC",
   "BFD_RELOC_PPC_EMB_NADDR32",
@@ -1695,7 +1689,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_ARM_TLS_GD32_FDPIC",
   "BFD_RELOC_ARM_TLS_LDM32_FDPIC",
   "BFD_RELOC_ARM_TLS_IE32_FDPIC",
-  "BFD_RELOC_ARM_JUMP_SLOT",
   "BFD_RELOC_ARM_GOT32",
   "BFD_RELOC_ARM_RELATIVE",
   "BFD_RELOC_ARM_GOTOFF",
@@ -1803,7 +1796,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_JMP_SLOT",
   "BFD_RELOC_SH_RELATIVE",
   "BFD_RELOC_SH_GOTPC",
   "BFD_RELOC_SH_GOT_LOW16",
@@ -1910,7 +1902,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_JMP_SLOT",
   "BFD_RELOC_ARC_RELATIVE",
   "BFD_RELOC_ARC_GOTOFF",
   "BFD_RELOC_ARC_GOTPC",
@@ -2009,7 +2000,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_JMP_SLOT",
   "BFD_RELOC_M32R_RELATIVE",
   "BFD_RELOC_M32R_GOTOFF",
   "BFD_RELOC_M32R_GOTOFF_HI_ULO",
@@ -2045,7 +2035,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_JMP_SLOT",
   "BFD_RELOC_NDS32_RELATIVE",
   "BFD_RELOC_NDS32_GOTOFF",
   "BFD_RELOC_NDS32_GOTOFF_HI20",
@@ -2185,7 +2174,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_JMP_SLOT",
   "BFD_RELOC_V850_RELATIVE",
   "BFD_RELOC_V850_16_GOTOFF",
   "BFD_RELOC_V850_32_GOTOFF",
@@ -2219,7 +2207,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_C6000_SBR_GOT_H16_W",
   "BFD_RELOC_C6000_DSBT_INDEX",
   "BFD_RELOC_C6000_PREL31",
-  "BFD_RELOC_C6000_JUMP_SLOT",
   "BFD_RELOC_C6000_EHTYPE",
   "BFD_RELOC_C6000_PCR_H16",
   "BFD_RELOC_C6000_PCR_L16",
@@ -2279,7 +2266,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_JMP_SLOT",
   "BFD_RELOC_METAG_RELATIVE",
   "BFD_RELOC_METAG_TLS_GD",
   "BFD_RELOC_METAG_TLS_LDM",
@@ -2464,7 +2450,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_JMP_SLOT",
   "BFD_RELOC_390_RELATIVE",
   "BFD_RELOC_390_GOTPC",
   "BFD_RELOC_390_GOT16",
@@ -2707,7 +2692,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_JUMP_SLOT",
   "BFD_RELOC_CRIS_RELATIVE",
   "BFD_RELOC_CRIS_32_GOT",
   "BFD_RELOC_CRIS_16_GOT",
@@ -2742,7 +2726,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_JMP_SLOT",
   "BFD_RELOC_OR1K_RELATIVE",
   "BFD_RELOC_OR1K_TLS_GD_HI16",
   "BFD_RELOC_OR1K_TLS_GD_LO16",
@@ -2777,7 +2760,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_JMP_SLOT",
   "BFD_RELOC_VAX_RELATIVE",
   "BFD_RELOC_MT_PC16",
   "BFD_RELOC_MT_HI16",
@@ -2825,7 +2807,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_JMP_SLOT",
   "BFD_RELOC_XTENSA_RELATIVE",
   "BFD_RELOC_XTENSA_PLT",
   "BFD_RELOC_XTENSA_DIFF8",
@@ -2895,7 +2876,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_JMP_SLOT",
   "BFD_RELOC_LM32_RELATIVE",
   "BFD_RELOC_MACH_O_SECTDIFF",
   "BFD_RELOC_MACH_O_LOCAL_SECTDIFF",
@@ -3147,7 +3127,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_JMP_SLOT",
   "BFD_RELOC_TILEPRO_RELATIVE",
   "BFD_RELOC_TILEPRO_BROFF_X1",
   "BFD_RELOC_TILEPRO_JOFFLONG_X1",
@@ -3231,7 +3210,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_JMP_SLOT",
   "BFD_RELOC_TILEGX_RELATIVE",
   "BFD_RELOC_TILEGX_BROFF_X1",
   "BFD_RELOC_TILEGX_JUMPOFF_X1",

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 451de44ee764e4df4a628a19013987903e47a446..625ddf22d93c45796126c42fc1370e05189dc8dd 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1474,6 +1474,8 @@ ENUMX
   BFD_RELOC_COPY
 ENUMX
   BFD_RELOC_GLOB_DAT
+ENUMX
+  BFD_RELOC_JMP_SLOT
 ENUMX
   BFD_RELOC_IRELATIVE
 ENUMDOC
@@ -1487,8 +1489,6 @@ ENUMDOC
   Size relocations.
 
 ENUM
-  BFD_RELOC_68K_JMP_SLOT
-ENUMX
   BFD_RELOC_68K_RELATIVE
 ENUMX
   BFD_RELOC_68K_TLS_GD32
@@ -1597,8 +1597,6 @@ ENUMX
   BFD_RELOC_SPARC_PC22
 ENUMX
   BFD_RELOC_SPARC_WPLT30
-ENUMX
-  BFD_RELOC_SPARC_JMP_SLOT
 ENUMX
   BFD_RELOC_SPARC_RELATIVE
 ENUMX
@@ -2163,11 +2161,6 @@ ENUMX
 ENUMDOC
   MIPS ELF relocations.
 
-ENUM
-  BFD_RELOC_MIPS_JUMP_SLOT
-ENUMDOC
-  MIPS ELF relocations (VxWorks and PLT extensions).
-
 ENUM
   BFD_RELOC_MOXIE_10_PCREL
 ENUMDOC
@@ -2294,10 +2287,6 @@ ENUM
 ENUMDOC
   This is a 16bit GOT-relative reloc for the mn10300, offset by two
   bytes in the instruction.
-ENUM
-  BFD_RELOC_MN10300_JMP_SLOT
-ENUMDOC
-  Create PLT entry.
 ENUM
   BFD_RELOC_MN10300_RELATIVE
 ENUMDOC
@@ -2348,8 +2337,6 @@ ENUM
   BFD_RELOC_386_GOT32
 ENUMX
   BFD_RELOC_386_PLT32
-ENUMX
-  BFD_RELOC_386_JUMP_SLOT
 ENUMX
   BFD_RELOC_386_RELATIVE
 ENUMX
@@ -2393,8 +2380,6 @@ ENUMDOC
 
 ENUM
   BFD_RELOC_X86_64_GOT32
-ENUMX
-  BFD_RELOC_X86_64_JUMP_SLOT
 ENUMX
   BFD_RELOC_X86_64_RELATIVE
 ENUMX
@@ -2535,8 +2520,6 @@ ENUMX
   BFD_RELOC_PPC_BA16_BRTAKEN
 ENUMX
   BFD_RELOC_PPC_BA16_BRNTAKEN
-ENUMX
-  BFD_RELOC_PPC_JMP_SLOT
 ENUMX
   BFD_RELOC_PPC_RELATIVE
 ENUMX
@@ -3002,8 +2985,6 @@ ENUMDOC
   ARM FDPIC specific relocations.
 
 ENUM
-  BFD_RELOC_ARM_JUMP_SLOT
-ENUMX
   BFD_RELOC_ARM_GOT32
 ENUMX
   BFD_RELOC_ARM_RELATIVE
@@ -3236,8 +3217,6 @@ ENUMX
   BFD_RELOC_SH_LOOP_START
 ENUMX
   BFD_RELOC_SH_LOOP_END
-ENUMX
-  BFD_RELOC_SH_JMP_SLOT
 ENUMX
   BFD_RELOC_SH_RELATIVE
 ENUMX
@@ -3453,8 +3432,6 @@ ENUMX
   BFD_RELOC_ARC_GOT32
 ENUMX
   BFD_RELOC_ARC_GOTPC32
-ENUMX
-  BFD_RELOC_ARC_JMP_SLOT
 ENUMX
   BFD_RELOC_ARC_RELATIVE
 ENUMX
@@ -3798,8 +3775,6 @@ ENUM
   BFD_RELOC_M32R_GOT24
 ENUMX
   BFD_RELOC_M32R_26_PLTREL
-ENUMX
-  BFD_RELOC_M32R_JMP_SLOT
 ENUMX
   BFD_RELOC_M32R_RELATIVE
 ENUMX
@@ -3931,8 +3906,6 @@ ENUMX
   BFD_RELOC_NDS32_9_PLTREL
 ENUMX
   BFD_RELOC_NDS32_25_PLTREL
-ENUMX
-  BFD_RELOC_NDS32_JMP_SLOT
 ENUMX
   BFD_RELOC_NDS32_RELATIVE
 ENUMX
@@ -4312,8 +4285,6 @@ ENUMX
   BFD_RELOC_V850_22_PLT_PCREL
 ENUMX
   BFD_RELOC_V850_32_PLT_PCREL
-ENUMX
-  BFD_RELOC_V850_JMP_SLOT
 ENUMX
   BFD_RELOC_V850_RELATIVE
 ENUMX
@@ -4415,8 +4386,6 @@ ENUMX
   BFD_RELOC_C6000_DSBT_INDEX
 ENUMX
   BFD_RELOC_C6000_PREL31
-ENUMX
-  BFD_RELOC_C6000_JUMP_SLOT
 ENUMX
   BFD_RELOC_C6000_EHTYPE
 ENUMX
@@ -4568,8 +4537,6 @@ ENUMX
   BFD_RELOC_METAG_GOTOFF
 ENUMX
   BFD_RELOC_METAG_PLT
-ENUMX
-  BFD_RELOC_METAG_JMP_SLOT
 ENUMX
   BFD_RELOC_METAG_RELATIVE
 ENUMX
@@ -5085,10 +5052,6 @@ ENUM
   BFD_RELOC_390_GOT12
 ENUMDOC
   12 bit GOT offset.
-ENUM
-  BFD_RELOC_390_JMP_SLOT
-ENUMDOC
-  Create PLT entry.
 ENUM
   BFD_RELOC_390_RELATIVE
 ENUMDOC
@@ -5800,8 +5763,6 @@ ENUMDOC
   These relocs are only used within the CRIS assembler.  They are not
   (at present) written to any object files.
 ENUM
-  BFD_RELOC_CRIS_JUMP_SLOT
-ENUMX
   BFD_RELOC_CRIS_RELATIVE
 ENUMDOC
   Relocs used in ELF shared libraries for CRIS.
@@ -5890,8 +5851,6 @@ ENUMX
   BFD_RELOC_OR1K_PLTA26
 ENUMX
   BFD_RELOC_OR1K_GOTOFF_SLO16
-ENUMX
-  BFD_RELOC_OR1K_JMP_SLOT
 ENUMX
   BFD_RELOC_OR1K_RELATIVE
 ENUMX
@@ -5973,8 +5932,6 @@ ENUMDOC
   Self-describing complex relocations.
 
 ENUM
-  BFD_RELOC_VAX_JMP_SLOT
-ENUMX
   BFD_RELOC_VAX_RELATIVE
 ENUMDOC
   Relocations used by VAX ELF.
@@ -6119,8 +6076,6 @@ ENUMDOC
   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_JMP_SLOT
-ENUMX
   BFD_RELOC_XTENSA_RELATIVE
 ENUMDOC
   Xtensa relocations for ELF shared objects.
@@ -6330,8 +6285,6 @@ ENUMX
   BFD_RELOC_LM32_GOTOFF_HI16
 ENUMX
   BFD_RELOC_LM32_GOTOFF_LO16
-ENUMX
-  BFD_RELOC_LM32_JMP_SLOT
 ENUMX
   BFD_RELOC_LM32_RELATIVE
 ENUMDOC
@@ -7283,8 +7236,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_JMP_SLOT
-ENUMX
   BFD_RELOC_TILEPRO_RELATIVE
 ENUMX
   BFD_RELOC_TILEPRO_BROFF_X1
@@ -7452,8 +7403,6 @@ ENUMX
   BFD_RELOC_TILEGX_HW1_LAST
 ENUMX
   BFD_RELOC_TILEGX_HW2_LAST
-ENUMX
-  BFD_RELOC_TILEGX_JMP_SLOT
 ENUMX
   BFD_RELOC_TILEGX_RELATIVE
 ENUMX

diff --git a/include/elf/cris.h b/include/elf/cris.h
index a2a3c83e8a4f095d7ecd7e34eaea64e8d095998d..41300345e711401687d39a98bdb6d52c26642017 100644 (file)
--- a/include/elf/cris.h
+++ b/include/elf/cris.h
@@ -48,7 +48,7 @@ START_RELOC_NUMBERS (elf_cris_reloc_type)
   RELOC_NUMBER (R_CRIS_GLOB_DAT, 10)
 
   /* Create PLT entry.  Generated by the linker.
-     The BFD equivalent is BFD_RELOC_CRIS_JUMP_SLOT.  */
+     The BFD equivalent is BFD_RELOC_JMP_SLOT.  */
   RELOC_NUMBER (R_CRIS_JUMP_SLOT, 11)
 
   /* Adjust by program base.  Generated by the linker.