target_id for cr16 and vax

Both of these targets extend elf_link_hash_entry, so arguably should
set hash_table_id to something other than GENERIC_ELF_DATA.  The patch
also sorts enum elf_target_id.

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 4ca9ad6577c4923d761360894a9008b4d476e0e3..f6797a30979eaa3d180e5ae0596672087d25b8c6 100644 (file)
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -540,6 +540,7 @@ enum elf_target_id
   ARM_ELF_DATA,
   AVR_ELF_DATA,
   BFIN_ELF_DATA,
+  CR16_ELF_DATA,
   CRIS_ELF_DATA,
   CSKY_ELF_DATA,
   FRV_ELF_DATA,
@@ -548,8 +549,8 @@ enum elf_target_id
   I386_ELF_DATA,
   IA64_ELF_DATA,
   KVX_ELF_DATA,
-  LM32_ELF_DATA,
   LARCH_ELF_DATA,
+  LM32_ELF_DATA,
   M32R_ELF_DATA,
   M68HC11_ELF_DATA,
   M68K_ELF_DATA,
@@ -563,17 +564,18 @@ enum elf_target_id
   PPC32_ELF_DATA,
   PPC64_ELF_DATA,
   PRU_ELF_DATA,
+  RISCV_ELF_DATA,
   S390_ELF_DATA,
   SCORE_ELF_DATA,
   SH_ELF_DATA,
   SPARC_ELF_DATA,
   SPU_ELF_DATA,
   TIC6X_ELF_DATA,
-  X86_64_ELF_DATA,
-  XTENSA_ELF_DATA,
   TILEGX_ELF_DATA,
   TILEPRO_ELF_DATA,
-  RISCV_ELF_DATA,
+  X86_64_ELF_DATA,
+  XTENSA_ELF_DATA,
+  VAX_ELF_DATA,
   GENERIC_ELF_DATA
 };
 

diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
index 26200e6bcfb001836674fbb244762d1e42c6c3a2..49ac2d7e6f9658da704ac61ad2574a588e953228 100644 (file)
--- a/bfd/elf32-cr16.c
+++ b/bfd/elf32-cr16.c
@@ -2803,6 +2803,7 @@ _bfd_cr16_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSE
 #define TARGET_LITTLE_SYM                cr16_elf32_vec
 #define TARGET_LITTLE_NAME               "elf32-cr16"
 #define ELF_ARCH                         bfd_arch_cr16
+#define ELF_TARGET_ID                    CR16_ELF_DATA
 #define ELF_MACHINE_CODE                 EM_CR16
 #define ELF_MACHINE_ALT1                 EM_CR16_OLD
 #define ELF_MAXPAGESIZE                          0x1

diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index 5d534f8464f90eeb8ec5fb774850ade6cd9b28e7..b2c5f27e29e99dfb3aa19274a8b2c19b1f15875a 100644 (file)
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -1848,6 +1848,7 @@ elf_vax_plt_sym_val (bfd_vma i, const asection *plt,
 
 #define TARGET_LITTLE_SYM              vax_elf32_vec
 #define TARGET_LITTLE_NAME             "elf32-vax"
+#define ELF_TARGET_ID                  VAX_ELF_DATA
 #define ELF_MACHINE_CODE               EM_VAX
 #define ELF_MAXPAGESIZE                        0x1000