bfd target vector rationalisation

This renames the bfd targets to <cpu>_<format>_<other>_<endian>_vec. So for example, bfd_elf32_ntradlittlemips_vec becomes mips_elf32_ntrad_le_vec and hp300bsd_vec becomes m68k_aout_hp300bsd_vec. bfd/ * aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-ns32k.c, * aout-sparcle.c, * aout0.c, * aoutx.h, * armnetbsd.c, * bout.c, * cf-i386lynx.c, * cf-sparclynx.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c, * coff-arm.c, * coff-aux.c, * coff-go32.c, * coff-h8300.c, * coff-h8500.c, * coff-i386.c, * coff-i860.c, * coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mips.c, * coff-rs6000.c, * coff-sh.c, * coff-sparc.c, * coff-stgo32.c, * coff-svm68k.c, * coff-tic80.c, * coff-u68k.c, * coff-w65.c, * coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c, * coff64-rs6000.c, * config.bfd, * configure.com, * configure.in, * demo64.c, * elf-m10200.c, * elf-m10300.c, * elf32-am33lin.c, * elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-gen.c, * elf32-h8300.c, * elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-i860.c, * elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c, * elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c, * elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c, * elf64-gen.c, * elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c, * elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c, * elf64-tilegx.c, * elf64-x86-64.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c, * epoc-pe-arm.c, * epoc-pei-arm.c, * hp300bsd.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c, * i386aout.c, * i386bsd.c, * i386dynix.c, * i386freebsd.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c, * i386netbsd.c, * i386os9k.c, * irix-core.c, * m68k4knetbsd.c, * m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * m88kopenbsd.c, * mach-o-i386.c, * mach-o-x86-64.c, * makefile.vms, * mipsbsd.c, * mmo.c, * netbsd-core.c, * newsos3.c, * nlm32-alpha.c, * nlm32-i386.c, * nlm32-ppc.c, * nlm32-sparc.c, * ns32knetbsd.c, * osf-core.c, * pc532-mach.c, * pe-arm-wince.c, * pe-arm.c, * pe-i386.c, * pe-mcore.c, * pe-mips.c, * pe-ppc.c, * pe-sh.c, * pe-x86_64.c, * pei-arm-wince.c, * pei-arm.c, * pei-i386.c, * pei-ia64.c, * pei-mcore.c, * pei-mips.c, * pei-ppc.c, * pei-sh.c, * pei-x86_64.c, * ppcboot.c, * ptrace-core.c, * riscix.c, * sco5-core.c, * som.c, * sparclinux.c, * sparclynx.c, * sparcnetbsd.c, * sunos.c, * targets.c, * trad-core.c, * vax1knetbsd.c, * vaxbsd.c, * vaxnetbsd.c, * versados.c, * vms-alpha.c, * vms-lib.c: Rename bfd targets to <cpu>_<format>_<other>_<endian>_vec. Adjust associated MY macros on aout targets. * configure: Regenerate. binutils/ * emul_aix.c: Update bfd target vector naming. * testsuite/binutils-all/objcopy.exp: Likewise. ld/ * emultempl/metagelf.em: Update bfd target vector naming. * emultempl/nios2elf.em: Likewise. * emultempl/spuelf.em: Likewise. * emultempl/tic6xdsbt.em: Likewise.
author: Alan Modra <amodra@gmail.com> 2014-05-02 20:09:40 +0930
committer: Alan Modra <amodra@gmail.com> 2014-05-02 20:09:40 +0930
commit: 6d00b590316c0b08de21a264893b0fd627c54686 (patch)
tree: 0979fb1e6f86fa1b5d57f252ad9d804597387ac4 /bfd
parent: 4e60800159eab4b73ff263595986d5ae4eaf7413 (diff)
download: gdb-6d00b590316c0b08de21a264893b0fd627c54686.zip
gdb-6d00b590316c0b08de21a264893b0fd627c54686.tar.gz
gdb-6d00b590316c0b08de21a264893b0fd627c54686.tar.bz2
193 files changed, 2340 insertions, 2299 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fbe5f72..ed54625 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,56 @@
+2014-05-02  Alan Modra  <amodra@gmail.com>
+
+	* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-ns32k.c,
+	* aout-sparcle.c, * aout0.c, * aoutx.h, * armnetbsd.c, * bout.c,
+	* cf-i386lynx.c, * cf-sparclynx.c, * cisco-core.c, * coff-alpha.c,
+	* coff-apollo.c, * coff-arm.c, * coff-aux.c, * coff-go32.c,
+	* coff-h8300.c, * coff-h8500.c, * coff-i386.c, * coff-i860.c,
+	* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mips.c,
+	* coff-rs6000.c, * coff-sh.c, * coff-sparc.c, * coff-stgo32.c,
+	* coff-svm68k.c, * coff-tic80.c, * coff-u68k.c, * coff-w65.c,
+	* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
+	* coff64-rs6000.c, * config.bfd, * configure.com, * configure.in,
+	* demo64.c, * elf-m10200.c, * elf-m10300.c, * elf32-am33lin.c,
+	* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-bfin.c,
+	* elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c, * elf32-crx.c,
+	* elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c,
+	* elf32-fr30.c, * elf32-frv.c, * elf32-gen.c, * elf32-h8300.c,
+	* elf32-hppa.c, * elf32-i370.c, * elf32-i386.c, * elf32-i860.c,
+	* elf32-i960.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c,
+	* elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c,
+	* elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c, * elf32-mep.c,
+	* elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c,
+	* elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-nios2.c,
+	* elf32-or1k.c, * elf32-pj.c, * elf32-ppc.c, * elf32-rl78.c,
+	* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-sh-symbian.c,
+	* elf32-sh.c, * elf32-sh64.c, * elf32-sparc.c, * elf32-spu.c,
+	* elf32-tic6x.c, * elf32-tilegx.c, * elf32-tilepro.c, * elf32-v850.c,
+	* elf32-vax.c, * elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c,
+	* elf32-xtensa.c, * elf64-alpha.c, * elf64-gen.c, * elf64-hppa.c,
+	* elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c, * elf64-ppc.c,
+	* elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c, * elf64-tilegx.c,
+	* elf64-x86-64.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
+	* epoc-pe-arm.c, * epoc-pei-arm.c, * hp300bsd.c, * hp300hpux.c,
+	* hppabsd-core.c, * hpux-core.c, * i386aout.c, * i386bsd.c,
+	* i386dynix.c, * i386freebsd.c, * i386linux.c, * i386lynx.c,
+	* i386mach3.c, * i386msdos.c, * i386netbsd.c, * i386os9k.c,
+	* irix-core.c, * m68k4knetbsd.c, * m68klinux.c, * m68knetbsd.c,
+	* m88kmach3.c, * m88kopenbsd.c, * mach-o-i386.c, * mach-o-x86-64.c,
+	* makefile.vms, * mipsbsd.c, * mmo.c, * netbsd-core.c, * newsos3.c,
+	* nlm32-alpha.c, * nlm32-i386.c, * nlm32-ppc.c, * nlm32-sparc.c,
+	* ns32knetbsd.c, * osf-core.c, * pc532-mach.c, * pe-arm-wince.c,
+	* pe-arm.c, * pe-i386.c, * pe-mcore.c, * pe-mips.c, * pe-ppc.c,
+	* pe-sh.c, * pe-x86_64.c, * pei-arm-wince.c, * pei-arm.c,
+	* pei-i386.c, * pei-ia64.c, * pei-mcore.c, * pei-mips.c, * pei-ppc.c,
+	* pei-sh.c, * pei-x86_64.c, * ppcboot.c, * ptrace-core.c, * riscix.c,
+	* sco5-core.c, * som.c, * sparclinux.c, * sparclynx.c,
+	* sparcnetbsd.c, * sunos.c, * targets.c, * trad-core.c,
+	* vax1knetbsd.c, * vaxbsd.c, * vaxnetbsd.c, * versados.c,
+	* vms-alpha.c, * vms-lib.c: Rename bfd targets to
+	<cpu>_<format>_<other>_<endian>_vec.  Adjust associated MY macros
+	on aout targets.
+	* configure: Regenerate.
+
 2014-05-01  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* mmo.c (mmo File layout documentation): Add note about low bits
diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c
index c0d530c..d3e2080 100644
--- a/bfd/aix386-core.c
+++ b/bfd/aix386-core.c
@@ -224,7 +224,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target aix386_core_vec =
+const bfd_target core_aix386_vec =
 {
   "aix386-core",
   bfd_target_unknown_flavour,
diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c
index 2516a8d..904a5bc 100644
--- a/bfd/aout-adobe.c
+++ b/bfd/aout-adobe.c
@@ -26,7 +26,7 @@
 #include "libaout.h"		/* BFD a.out internal data structures.  */
 
 /* Forward decl.  */
-extern const bfd_target a_out_adobe_vec;
+extern const bfd_target aout_adobe_vec;
 
 /* Swaps the information in an executable header taken from a raw byte
    stream memory image, into the internal exec_header structure.  */
@@ -216,7 +216,7 @@ aout_adobe_object_p (bfd *abfd)
   if (N_BADMAG (anexec))
     {
       targ = getenv ("GNUTARGET");
-      if (targ && !strcmp (targ, a_out_adobe_vec.name))
+      if (targ && !strcmp (targ, aout_adobe_vec.name))
 	/* Just continue anyway, if specifically set to this format.  */
 	;
       else
@@ -472,7 +472,7 @@ aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED,
 #define aout_32_bfd_final_link		            _bfd_generic_final_link
 #define aout_32_bfd_link_split_section	            _bfd_generic_link_split_section
 
-const bfd_target a_out_adobe_vec =
+const bfd_target aout_adobe_vec =
 {
   "a.out.adobe",		/* Name.  */
   bfd_target_aout_flavour,
diff --git a/bfd/aout-arm.c b/bfd/aout-arm.c
index 250fcf5..5f336ff 100644
--- a/bfd/aout-arm.c
+++ b/bfd/aout-arm.c
@@ -42,14 +42,14 @@
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_arm
 
-#define MY(OP) CONCAT2 (aoutarm_,OP)
+#define MY(OP) CONCAT2 (arm_aout_,OP)
 #define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) && \
                      (((x).a_info & ~006000) != OMAGIC) && \
                      ((x).a_info != NMAGIC))
 #define N_MAGIC(x) ((x).a_info & ~07200)
 
-#define MY_bfd_reloc_type_lookup aoutarm_bfd_reloc_type_lookup
-#define MY_bfd_reloc_name_lookup aoutarm_bfd_reloc_name_lookup
+#define MY_bfd_reloc_type_lookup arm_aout_bfd_reloc_type_lookup
+#define MY_bfd_reloc_name_lookup arm_aout_bfd_reloc_name_lookup
 
 #include "libaout.h"
 #include "aout/aout64.h"
@@ -461,9 +461,9 @@ MY_swap_std_reloc_out (bfd *abfd,
 
 #include "aout-target.h"
 
-extern const bfd_target aout_arm_big_vec;
+extern const bfd_target arm_aout_be_vec;
 
-const bfd_target aout_arm_little_vec =
+const bfd_target arm_aout_le_vec =
 {
   "a.out-arm-little",           /* Name.  */
   bfd_target_aout_flavour,
@@ -500,12 +500,12 @@ const bfd_target aout_arm_little_vec =
   BFD_JUMP_TABLE_LINK (MY),
   BFD_JUMP_TABLE_DYNAMIC (MY),
 
-  & aout_arm_big_vec,
+  & arm_aout_be_vec,
 
   (void *) MY_backend_data,
 };
 
-const bfd_target aout_arm_big_vec =
+const bfd_target arm_aout_be_vec =
 {
   "a.out-arm-big",              /* Name.  */
   bfd_target_aout_flavour,
@@ -542,7 +542,7 @@ const bfd_target aout_arm_big_vec =
   BFD_JUMP_TABLE_LINK (MY),
   BFD_JUMP_TABLE_DYNAMIC (MY),
 
-  & aout_arm_little_vec,
+  & arm_aout_le_vec,
 
   (void *) MY_backend_data,
 };
diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
index b21a871..b436b21 100644
--- a/bfd/aout-ns32k.c
+++ b/bfd/aout-ns32k.c
@@ -27,7 +27,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MYNS(OP) CONCAT2 (ns32kaout_,OP)
+#define MYNS(OP) CONCAT2 (ns32k_aout_,OP)
 
 reloc_howto_type * MYNS (bfd_reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
 reloc_howto_type * MYNS (bfd_reloc_name_lookup) (bfd *, const char *);
diff --git a/bfd/aout-sparcle.c b/bfd/aout-sparcle.c
index 7fca027..0d75a28 100644
--- a/bfd/aout-sparcle.c
+++ b/bfd/aout-sparcle.c
@@ -23,7 +23,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (sparcle_aout_,OP)
+#define MY(OP) CONCAT2 (sparc_aout_le_,OP)
 
 #include "sysdep.h"
 #include "bfd.h"
diff --git a/bfd/aout0.c b/bfd/aout0.c
index ea9617d..a0370e3 100644
--- a/bfd/aout0.c
+++ b/bfd/aout0.c
@@ -24,7 +24,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (aout0_big_,OP)
+#define MY(OP) CONCAT2 (aout0_be_,OP)
 
 #include "sysdep.h"
 #include "bfd.h"
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index ad81a7a..4f99c47 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -66,12 +66,12 @@ DESCRIPTION
 	from @file{sunos.c}:
 
 |	#define TARGET_NAME "a.out-sunos-big"
-|	#define VECNAME    sunos_big_vec
+|	#define VECNAME    sparc_aout_sunos_be_vec
 |	#include "aoutf1.h"
 
 	requires all the names from @file{aout32.c}, and produces the jump vector
 
-|	sunos_big_vec
+|	sparc_aout_sunos_be_vec
 
 	The file @file{host-aout.c} is a special case.  It is for a large set
 	of hosts that use ``more or less standard'' a.out files, and
diff --git a/bfd/armnetbsd.c b/bfd/armnetbsd.c
index acb7aa5..05b7635 100644
--- a/bfd/armnetbsd.c
+++ b/bfd/armnetbsd.c
@@ -31,7 +31,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) 			CONCAT2 (armnetbsd_, OP)
+#define MY(OP) 			CONCAT2 (arm_aout_nbsd_, OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME 		"a.out-arm-netbsd"
diff --git a/bfd/bout.c b/bfd/bout.c
index 2c19ecc..fddc77d 100644
--- a/bfd/bout.c
+++ b/bfd/bout.c
@@ -1393,9 +1393,9 @@ b_out_bfd_get_relocated_section_contents (bfd *output_bfd,
 #define b_out_bfd_define_common_symbol         bfd_generic_define_common_symbol
 #define aout_32_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
 
-extern const bfd_target b_out_vec_little_host;
+extern const bfd_target bout_le_vec;
 
-const bfd_target b_out_vec_big_host =
+const bfd_target bout_be_vec =
 {
   "b.out.big",			/* Name.  */
   bfd_target_aout_flavour,
@@ -1432,12 +1432,12 @@ const bfd_target b_out_vec_big_host =
      BFD_JUMP_TABLE_LINK (b_out),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & b_out_vec_little_host,
+  & bout_le_vec,
 
   NULL
 };
 
-const bfd_target b_out_vec_little_host =
+const bfd_target bout_le_vec =
 {
   "b.out.little",		/* Name.  */
   bfd_target_aout_flavour,
@@ -1475,7 +1475,7 @@ const bfd_target b_out_vec_little_host =
      BFD_JUMP_TABLE_LINK (b_out),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & b_out_vec_big_host,
+  & bout_be_vec,
 
   NULL
 };
diff --git a/bfd/cf-i386lynx.c b/bfd/cf-i386lynx.c
index a244b10..480c275 100644
--- a/bfd/cf-i386lynx.c
+++ b/bfd/cf-i386lynx.c
@@ -22,7 +22,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM	i386lynx_coff_vec
+#define TARGET_SYM	i386_coff_lynx_vec
 #define TARGET_NAME	"coff-i386-lynx"
 
 #define LYNXOS
diff --git a/bfd/cf-sparclynx.c b/bfd/cf-sparclynx.c
index 028ccb9..2be0048 100644
--- a/bfd/cf-sparclynx.c
+++ b/bfd/cf-sparclynx.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#define TARGET_SYM	sparclynx_coff_vec
+#define TARGET_SYM	sparc_coff_lynx_vec
 #define TARGET_NAME	"coff-sparc-lynx"
 
 #define LYNXOS
diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c
index 6c3de27..36845a2 100644
--- a/bfd/cisco-core.c
+++ b/bfd/cisco-core.c
@@ -313,9 +313,9 @@ cisco_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED)
   return abfd->tdata.cisco_core_data->sig;
 }
 
-extern const bfd_target cisco_core_little_vec;
+extern const bfd_target core_cisco_le_vec;
 
-const bfd_target cisco_core_big_vec =
+const bfd_target core_cisco_be_vec =
 {
     "cisco-ios-core-big",
     bfd_target_unknown_flavour,
@@ -361,12 +361,12 @@ const bfd_target cisco_core_big_vec =
        BFD_JUMP_TABLE_LINK (_bfd_nolink),
        BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-    & cisco_core_little_vec,
+    & core_cisco_le_vec,
 
     NULL	/* backend_data */
 };
 
-const bfd_target cisco_core_little_vec =
+const bfd_target core_cisco_le_vec =
 {
     "cisco-ios-core-little",
     bfd_target_unknown_flavour,
@@ -412,7 +412,7 @@ const bfd_target cisco_core_little_vec =
        BFD_JUMP_TABLE_LINK (_bfd_nolink),
        BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-    &cisco_core_big_vec,
+    &core_cisco_be_vec,
 
     NULL			/* backend_data */
 };
diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c
index 8c68b56..0e78088 100644
--- a/bfd/coff-alpha.c
+++ b/bfd/coff-alpha.c
@@ -2346,7 +2346,7 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data =
   _bfd_coff_section_already_linked
 #define _bfd_ecoff_bfd_define_common_symbol bfd_generic_define_common_symbol
 
-const bfd_target ecoffalpha_little_vec =
+const bfd_target alpha_ecoff_le_vec =
 {
   "ecoff-littlealpha",		/* name */
   bfd_target_ecoff_flavour,
diff --git a/bfd/coff-apollo.c b/bfd/coff-apollo.c
index a12b33b..2c75598 100644
--- a/bfd/coff-apollo.c
+++ b/bfd/coff-apollo.c
@@ -106,7 +106,7 @@ apollo_howto2rtype (reloc_howto_type *internal)
 #include "coffcode.h"
 
 #ifndef TARGET_SYM
-#define TARGET_SYM apollocoff_vec
+#define TARGET_SYM m68k_coff_apollo_vec
 #endif
 
 #ifndef TARGET_NAME
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 9540a04..d47b77e 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -2528,13 +2528,13 @@ coff_arm_final_link_postscript (bfd * abfd ATTRIBUTE_UNUSED,
 #include "coffcode.h"
 
 #ifndef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM armcoff_little_vec
+#define TARGET_LITTLE_SYM arm_coff_le_vec
 #endif
 #ifndef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME "coff-arm-little"
 #endif
 #ifndef TARGET_BIG_SYM
-#define TARGET_BIG_SYM armcoff_big_vec
+#define TARGET_BIG_SYM arm_coff_be_vec
 #endif
 #ifndef TARGET_BIG_NAME
 #define TARGET_BIG_NAME "coff-arm-big"
diff --git a/bfd/coff-aux.c b/bfd/coff-aux.c
index ce84231..e79c77a 100644
--- a/bfd/coff-aux.c
+++ b/bfd/coff-aux.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#define TARGET_SYM	m68kaux_coff_vec
+#define TARGET_SYM	m68k_coff_aux_vec
 #define TARGET_NAME	"coff-m68k-aux"
 
 #ifndef TARG_AUX
diff --git a/bfd/coff-go32.c b/bfd/coff-go32.c
index d605fd1..4797265 100644
--- a/bfd/coff-go32.c
+++ b/bfd/coff-go32.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#define TARGET_SYM		go32coff_vec
+#define TARGET_SYM		i386_coff_go32_vec
 #define TARGET_NAME		"coff-go32"
 #define TARGET_UNDERSCORE	'_'
 #define COFF_LONG_SECTION_NAMES
diff --git a/bfd/coff-h8300.c b/bfd/coff-h8300.c
index 221a217..5ec48c9 100644
--- a/bfd/coff-h8300.c
+++ b/bfd/coff-h8300.c
@@ -1414,4 +1414,4 @@ h8300_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
   bfd_coff_reloc16_get_relocated_section_contents
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
-CREATE_BIG_COFF_TARGET_VEC (h8300coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (h8300_coff_vec, "coff-h8300", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
index 3225405..574f956 100644
--- a/bfd/coff-h8500.c
+++ b/bfd/coff-h8500.c
@@ -301,4 +301,4 @@ extra_case (bfd *in_abfd,
   bfd_coff_reloc16_get_relocated_section_contents
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
-CREATE_BIG_COFF_TARGET_VEC (h8500coff_vec, "coff-h8500", 0, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (h8500_coff_vec, "coff-h8500", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c
index 312037e..6a9dbca 100644
--- a/bfd/coff-i386.c
+++ b/bfd/coff-i386.c
@@ -612,7 +612,7 @@ const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
 #else
-  i386coff_vec =
+  i386_coff_vec =
 #endif
 {
 #ifdef TARGET_NAME
diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c
index 3a61468..341183f 100644
--- a/bfd/coff-i860.c
+++ b/bfd/coff-i860.c
@@ -656,7 +656,7 @@ const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
 #else
-  i860coff_vec =
+  i860_coff_vec =
 #endif
 {
 #ifdef TARGET_NAME
diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c
index 1c26ed8..1448257 100644
--- a/bfd/coff-i960.c
+++ b/bfd/coff-i960.c
@@ -608,11 +608,11 @@ coff_i960_adjust_symndx (bfd *obfd ATTRIBUTE_UNUSED,
 
 #include "coffcode.h"
 
-extern const bfd_target icoff_big_vec;
+extern const bfd_target icoff_be_vec;
 
-CREATE_LITTLE_COFF_TARGET_VEC (icoff_little_vec, "coff-Intel-little", 0, 0, '_', & icoff_big_vec, COFF_SWAP_TABLE)
+CREATE_LITTLE_COFF_TARGET_VEC (icoff_le_vec, "coff-Intel-little", 0, 0, '_', & icoff_be_vec, COFF_SWAP_TABLE)
 
-const bfd_target icoff_big_vec =
+const bfd_target icoff_be_vec =
 {
   "coff-Intel-big",		/* name */
   bfd_target_coff_flavour,
@@ -653,7 +653,7 @@ bfd_getb64, bfd_getb_signed_64, bfd_putb64,
      BFD_JUMP_TABLE_LINK (coff),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & icoff_little_vec,
+  & icoff_le_vec,
 
   COFF_SWAP_TABLE
 };
diff --git a/bfd/coff-m68k.c b/bfd/coff-m68k.c
index eb6f370..f7089a6 100644
--- a/bfd/coff-m68k.c
+++ b/bfd/coff-m68k.c
@@ -30,7 +30,7 @@
    variants.  The following macros control its behaviour:
 
    TARGET_SYM
-     The C name of the BFD target vector.  The default is m68kcoff_vec.
+     The C name of the BFD target vector.  The default is m68k_coff_vec.
    TARGET_NAME
      The user visible target name.  The default is "coff-m68k".
    NAMES_HAVE_UNDERSCORE
@@ -528,7 +528,7 @@ bfd_m68k_coff_create_embedded_relocs (bfd *abfd,
 #include "coffcode.h"
 
 #ifndef TARGET_SYM
-#define TARGET_SYM m68kcoff_vec
+#define TARGET_SYM m68k_coff_vec
 #endif
 
 #ifndef TARGET_NAME
diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c
index 15ad28d..7d474f9 100644
--- a/bfd/coff-m88k.c
+++ b/bfd/coff-m88k.c
@@ -281,4 +281,4 @@ reloc_processing (arelent *relent,
 
 #undef coff_write_armap
 
-CREATE_BIG_COFF_TARGET_VEC (m88kbcs_vec, "coff-m88kbcs", 0, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (m88k_coff_bcs_vec, "coff-m88kbcs", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c
index 3a30d83..298671c 100644
--- a/bfd/coff-mips.c
+++ b/bfd/coff-mips.c
@@ -1363,9 +1363,9 @@ static const struct ecoff_backend_data mips_ecoff_backend_data =
   _bfd_coff_section_already_linked
 #define _bfd_ecoff_bfd_define_common_symbol bfd_generic_define_common_symbol
 
-extern const bfd_target ecoff_big_vec;
+extern const bfd_target mips_ecoff_be_vec;
 
-const bfd_target ecoff_little_vec =
+const bfd_target mips_ecoff_le_vec =
 {
   "ecoff-littlemips",		/* name */
   bfd_target_ecoff_flavour,
@@ -1405,12 +1405,12 @@ const bfd_target ecoff_little_vec =
      BFD_JUMP_TABLE_LINK (_bfd_ecoff),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & ecoff_big_vec,
+  & mips_ecoff_be_vec,
 
   & mips_ecoff_backend_data
 };
 
-const bfd_target ecoff_big_vec =
+const bfd_target mips_ecoff_be_vec =
 {
   "ecoff-bigmips",		/* name */
   bfd_target_ecoff_flavour,
@@ -1449,12 +1449,12 @@ const bfd_target ecoff_big_vec =
      BFD_JUMP_TABLE_LINK (_bfd_ecoff),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & ecoff_little_vec,
+  & mips_ecoff_le_vec,
 
   & mips_ecoff_backend_data
 };
 
-const bfd_target ecoff_biglittle_vec =
+const bfd_target mips_ecoff_bele_vec =
 {
   "ecoff-biglittlemips",		/* name */
   bfd_target_ecoff_flavour,
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
index d0b8eaf..4c41740 100644
--- a/bfd/coff-rs6000.c
+++ b/bfd/coff-rs6000.c
@@ -4177,7 +4177,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
   };
 
 /* The transfer vector that leads the outside world to all of the above.  */
-const bfd_target rs6000coff_vec =
+const bfd_target rs6000_xcoff_vec =
   {
     "aixcoff-rs6000",
     bfd_target_xcoff_flavour,
@@ -4358,7 +4358,7 @@ static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data =
   };
 
 /* The transfer vector that leads the outside world to all of the above.  */
-const bfd_target pmac_xcoff_vec =
+const bfd_target powerpc_xcoff_vec =
   {
     "xcoff-powermac",
     bfd_target_xcoff_flavour,
diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c
index 1bf3f21..23e32ec 100644
--- a/bfd/coff-sh.c
+++ b/bfd/coff-sh.c
@@ -2998,13 +2998,13 @@ sh_coff_get_relocated_section_contents (bfd *output_bfd,
 /* The target vectors.  */
 
 #ifndef TARGET_SHL_SYM
-CREATE_BIG_COFF_TARGET_VEC (shcoff_vec, "coff-sh", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (sh_coff_vec, "coff-sh", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
 #endif
 
 #ifdef TARGET_SHL_SYM
 #define TARGET_SYM TARGET_SHL_SYM
 #else
-#define TARGET_SYM shlcoff_vec
+#define TARGET_SYM sh_coff_le_vec
 #endif
 
 #ifndef TARGET_SHL_NAME
@@ -3112,9 +3112,9 @@ static bfd_coff_backend_data bfd_coff_small_swap_table =
 #define coff_small_get_section_contents_in_window \
   coff_get_section_contents_in_window
 
-extern const bfd_target shlcoff_small_vec;
+extern const bfd_target sh_coff_small_le_vec;
 
-const bfd_target shcoff_small_vec =
+const bfd_target sh_coff_small_vec =
 {
   "coff-sh-small",		/* name */
   bfd_target_coff_flavour,
@@ -3154,12 +3154,12 @@ const bfd_target shcoff_small_vec =
   BFD_JUMP_TABLE_LINK (coff),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & shlcoff_small_vec,
+  & sh_coff_small_le_vec,
 
   & bfd_coff_small_swap_table
 };
 
-const bfd_target shlcoff_small_vec =
+const bfd_target sh_coff_small_le_vec =
 {
   "coff-shl-small",		/* name */
   bfd_target_coff_flavour,
@@ -3199,7 +3199,7 @@ const bfd_target shlcoff_small_vec =
   BFD_JUMP_TABLE_LINK (coff),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-  & shcoff_small_vec,
+  & sh_coff_small_vec,
 
   & bfd_coff_small_swap_table
 };
diff --git a/bfd/coff-sparc.c b/bfd/coff-sparc.c
index fc65f34..031dcd0 100644
--- a/bfd/coff-sparc.c
+++ b/bfd/coff-sparc.c
@@ -198,7 +198,7 @@ rtype2howto (arelent *cache_ptr, struct internal_reloc *dst)
 #include "coffcode.h"
 
 #ifndef TARGET_SYM
-#define TARGET_SYM sparccoff_vec
+#define TARGET_SYM sparc_coff_vec
 #endif
 
 #ifndef TARGET_NAME
diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
index 9bbbba1..4dc9014 100644
--- a/bfd/coff-stgo32.c
+++ b/bfd/coff-stgo32.c
@@ -35,7 +35,7 @@
    To be compatible with any existing executables I have fixed this
    here and NOT in the DJGPP startup code.  */
 
-#define TARGET_SYM		go32stubbedcoff_vec
+#define TARGET_SYM		i386_coff_go32stubbed_vec
 #define TARGET_NAME		"coff-go32-exe"
 #define TARGET_UNDERSCORE	'_'
 #define COFF_GO32_EXE
diff --git a/bfd/coff-svm68k.c b/bfd/coff-svm68k.c
index c2b539d..f759abb 100644
--- a/bfd/coff-svm68k.c
+++ b/bfd/coff-svm68k.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#define TARGET_SYM	m68ksysvcoff_vec
+#define TARGET_SYM	m68k_coff_sysv_vec
 #define TARGET_NAME	"coff-m68k-sysv"
 #define STATIC_RELOCS
 #define COFF_COMMON_ADDEND
diff --git a/bfd/coff-tic80.c b/bfd/coff-tic80.c
index 79783a9..80bb05e 100644
--- a/bfd/coff-tic80.c
+++ b/bfd/coff-tic80.c
@@ -709,4 +709,4 @@ coff_tic80_relocate_section (bfd *output_bfd,
 
 #include "coffcode.h"
 
-CREATE_LITTLE_COFF_TARGET_VEC (tic80coff_vec, "coff-tic80", D_PAGED, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_LITTLE_COFF_TARGET_VEC (tic80_coff_vec, "coff-tic80", D_PAGED, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff-u68k.c b/bfd/coff-u68k.c
index 917a337..260853c 100644
--- a/bfd/coff-u68k.c
+++ b/bfd/coff-u68k.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#define TARGET_SYM	m68kcoffun_vec
+#define TARGET_SYM	m68k_coff_un_vec
 #define TARGET_NAME	"coff-m68k-un"
 
 #define NAMES_HAVE_UNDERSCORE
diff --git a/bfd/coff-w65.c b/bfd/coff-w65.c
index 957ada6..f208730 100644
--- a/bfd/coff-w65.c
+++ b/bfd/coff-w65.c
@@ -374,4 +374,4 @@ w65_reloc16_extra_cases (bfd *abfd,
   bfd_coff_reloc16_get_relocated_section_contents
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
-CREATE_LITTLE_COFF_TARGET_VEC (w65_vec, "coff-w65", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_LITTLE_COFF_TARGET_VEC (w65_coff_vec, "coff-w65", BFD_IS_RELAXABLE, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff-we32k.c b/bfd/coff-we32k.c
index 747d7ff..d5481b8 100644
--- a/bfd/coff-we32k.c
+++ b/bfd/coff-we32k.c
@@ -70,4 +70,4 @@ static reloc_howto_type howto_table[] =
 
 #define coff_write_armap bsd_write_armap
 
-CREATE_BIG_COFF_TARGET_VEC (we32kcoff_vec, "coff-we32k", 0, 0, 0, NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (we32k_coff_vec, "coff-we32k", 0, 0, 0, NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
index 979996c..682658f 100644
--- a/bfd/coff-x86_64.c
+++ b/bfd/coff-x86_64.c
@@ -737,7 +737,7 @@ const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
 #else
-  x86_64coff_vec =
+  x86_64_coff_vec =
 #endif
 {
 #ifdef TARGET_NAME
diff --git a/bfd/coff-z80.c b/bfd/coff-z80.c
index 5297058..7b62cdf 100644
--- a/bfd/coff-z80.c
+++ b/bfd/coff-z80.c
@@ -283,7 +283,7 @@ extra_case (bfd *in_abfd,
 #undef  coff_bfd_relax_section
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
-CREATE_LITTLE_COFF_TARGET_VEC (z80coff_vec, "coff-z80", 0,
+CREATE_LITTLE_COFF_TARGET_VEC (z80_coff_vec, "coff-z80", 0,
 			       SEC_CODE | SEC_DATA, '\0', NULL,
 			       COFF_SWAP_TABLE)
 
diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
index 89bbce1..c85713f 100644
--- a/bfd/coff-z8k.c
+++ b/bfd/coff-z8k.c
@@ -384,4 +384,4 @@ extra_case (bfd *in_abfd,
 #undef  coff_bfd_relax_section
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
-CREATE_BIG_COFF_TARGET_VEC (z8kcoff_vec, "coff-z8k", 0, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (z8k_coff_vec, "coff-z8k", 0, 0, '_', NULL, COFF_SWAP_TABLE)
diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c
index d660e3a5..eb3b05b 100644
--- a/bfd/coff64-rs6000.c
+++ b/bfd/coff64-rs6000.c
@@ -2614,7 +2614,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
   };
 
 /* The transfer vector that leads the outside world to all of the above.  */
-const bfd_target rs6000coff64_vec =
+const bfd_target rs6000_xcoff64_vec =
   {
     "aixcoff64-rs6000",
     bfd_target_xcoff_flavour,
@@ -2873,7 +2873,7 @@ static const struct xcoff_backend_data_rec bfd_xcoff_aix5_backend_data =
   };
 
 /* The transfer vector that leads the outside world to all of the above.  */
-const bfd_target aix5coff64_vec =
+const bfd_target rs6000_xcoff64_aix_vec =
   {
     "aix5coff64-rs6000",
     bfd_target_xcoff_flavour,
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 9269c02..b58d54f 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -169,28 +169,28 @@ case "${targ}" in
 # START OF targmatch.h
 #ifdef BFD64
   aarch64-*-elf)
-    targ_defvec=bfd_elf64_littleaarch64_vec
-    targ_selvecs="bfd_elf64_bigaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+    targ_defvec=aarch64_elf64_le_vec
+    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
     want64=true
     ;;
   aarch64_be-*-elf)
-    targ_defvec=bfd_elf64_bigaarch64_vec
-    targ_selvecs="bfd_elf64_littleaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_bigarm_vec bfd_elf32_littlearm_vec"
+    targ_defvec=aarch64_elf64_be_vec
+    targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
     want64=true
     ;;
   aarch64-*-linux*)
-    targ_defvec=bfd_elf64_littleaarch64_vec
-    targ_selvecs="bfd_elf64_bigaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+    targ_defvec=aarch64_elf64_le_vec
+    targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
     want64=true
     ;;
   aarch64_be-*-linux*)
-    targ_defvec=bfd_elf64_bigaarch64_vec
-    targ_selvecs="bfd_elf64_littleaarch64_vec bfd_elf32_littleaarch64_vec bfd_elf32_bigaarch64_vec bfd_elf32_bigarm_vec bfd_elf32_littlearm_vec"
+    targ_defvec=aarch64_elf64_be_vec
+    targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
     want64=true
     ;;
   alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
-    targ_defvec=bfd_elf64_alpha_freebsd_vec
-    targ_selvecs="bfd_elf64_alpha_vec ecoffalpha_little_vec"
+    targ_defvec=alpha_elf64_fbsd_vec
+    targ_selvecs="alpha_elf64_vec alpha_ecoff_le_vec"
     want64=true
     # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
     case "${targ}" in
@@ -199,170 +199,170 @@ case "${targ}" in
     esac
     ;;
   alpha*-*-netbsd* | alpha*-*-openbsd*)
-    targ_defvec=bfd_elf64_alpha_vec
-    targ_selvecs=ecoffalpha_little_vec
+    targ_defvec=alpha_elf64_vec
+    targ_selvecs=alpha_ecoff_le_vec
     want64=true
     ;;
   alpha*-*-netware*)
-    targ_defvec=ecoffalpha_little_vec
-    targ_selvecs=nlm32_alpha_vec
+    targ_defvec=alpha_ecoff_le_vec
+    targ_selvecs=alpha_nlm32_vec
     want64=true
     ;;
   alpha*-*-linux*ecoff*)
-    targ_defvec=ecoffalpha_little_vec
-    targ_selvecs=bfd_elf64_alpha_vec
+    targ_defvec=alpha_ecoff_le_vec
+    targ_selvecs=alpha_elf64_vec
     want64=true
     ;;
   alpha*-*-linux-* | alpha*-*-elf*)
-    targ_defvec=bfd_elf64_alpha_vec
-    targ_selvecs=ecoffalpha_little_vec
+    targ_defvec=alpha_elf64_vec
+    targ_selvecs=alpha_ecoff_le_vec
     want64=true
     ;;
   alpha*-*-*vms*)
-    targ_defvec=vms_alpha_vec
-    targ_selvecs=vms_lib_txt_vec
+    targ_defvec=alpha_vms_vec
+    targ_selvecs=alpha_vms_lib_txt_vec
     want64=true
     ;;
   alpha*-*-*)
-    targ_defvec=ecoffalpha_little_vec
+    targ_defvec=alpha_ecoff_le_vec
     want64=true
     ;;
   ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
-    targ_defvec=bfd_elf64_ia64_little_vec
-    targ_selvecs="bfd_elf64_ia64_big_vec bfd_pei_ia64_vec"
+    targ_defvec=ia64_elf64_le_vec
+    targ_selvecs="ia64_elf64_be_vec ia64_pei_vec"
     want64=true
     ;;
   ia64*-*-hpux*)
-    targ_defvec=bfd_elf32_ia64_hpux_big_vec
-    targ_selvecs="bfd_elf64_ia64_hpux_big_vec"
+    targ_defvec=ia64_elf32_hpux_be_vec
+    targ_selvecs="ia64_elf64_hpux_be_vec"
     want64=true
     ;;
   ia64*-*-*vms*)
-    targ_defvec=bfd_elf64_ia64_vms_vec
-    targ_selvecs=vms_lib_txt_vec
+    targ_defvec=ia64_elf64_vms_vec
+    targ_selvecs=alpha_vms_lib_txt_vec
     want64=true
     ;;
   sparc64-*-freebsd* | sparc64-*-kfreebsd*-gnu)
-    targ_defvec=bfd_elf64_sparc_freebsd_vec
-    targ_selvecs="bfd_elf64_sparc_vec bfd_elf32_sparc_vec sunos_big_vec"
+    targ_defvec=sparc_elf64_fbsd_vec
+    targ_selvecs="sparc_elf64_vec sparc_elf32_vec sparc_aout_sunos_be_vec"
     ;;
   sparc64-*-netbsd* | sparc64-*-openbsd*)
-    targ_defvec=bfd_elf64_sparc_vec
-    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+    targ_defvec=sparc_elf64_vec
+    targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
     want64=true
     ;;
 #endif /* BFD64 */
 
   am34-*-linux* | am33_2.0-*-linux*)
-    targ_defvec=bfd_elf32_am33lin_vec
+    targ_defvec=am33_elf32_linux_vec
     ;;
 
   arc-*-elf*)
-    targ_defvec=bfd_elf32_littlearc_vec
-    targ_selvecs=bfd_elf32_bigarc_vec
+    targ_defvec=arc_elf32_le_vec
+    targ_selvecs=arc_elf32_be_vec
     ;;
 
   arm-*-nacl*)
-    targ_defvec=bfd_elf32_littlearm_nacl_vec
-    targ_selvecs="bfd_elf32_bigarm_nacl_vec bfd_elf32_i386_nacl_vec"
-    targ64_selvecs="bfd_elf32_x86_64_nacl_vec bfd_elf64_x86_64_nacl_vec"
+    targ_defvec=arm_elf32_nacl_le_vec
+    targ_selvecs="arm_elf32_nacl_be_vec i386_elf32_nacl_vec"
+    targ64_selvecs="x86_64_elf32_nacl_vec x86_64_elf64_nacl_vec"
     targ_archs="$targ_archs bfd_i386_arch"
     ;;
   armeb-*-nacl*)
-    targ_defvec=bfd_elf32_bigarm_nacl_vec
-    targ_selvecs="bfd_elf32_littlearm_nacl_vec bfd_elf32_i386_nacl_vec"
-    targ64_selvecs="bfd_elf32_x86_64_nacl_vec bfd_elf64_x86_64_nacl_vec"
+    targ_defvec=arm_elf32_nacl_be_vec
+    targ_selvecs="arm_elf32_nacl_le_vec i386_elf32_nacl_vec"
+    targ64_selvecs="x86_64_elf32_nacl_vec x86_64_elf64_nacl_vec"
     targ_archs="$targ_archs bfd_i386_arch"
     ;;
   armeb-*-netbsdelf*)
-    targ_defvec=bfd_elf32_bigarm_vec
-    targ_selvecs="bfd_elf32_littlearm_vec armnetbsd_vec"
+    targ_defvec=arm_elf32_be_vec
+    targ_selvecs="arm_elf32_le_vec arm_aout_nbsd_vec"
     ;;
   arm-*-netbsdelf*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs="bfd_elf32_bigarm_vec armnetbsd_vec"
+    targ_defvec=arm_elf32_le_vec
+    targ_selvecs="arm_elf32_be_vec arm_aout_nbsd_vec"
     ;;
   arm-*-netbsd* | arm-*-openbsd*)
-    targ_defvec=armnetbsd_vec
-    targ_selvecs="bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
+    targ_defvec=arm_aout_nbsd_vec
+    targ_selvecs="arm_elf32_le_vec arm_elf32_be_vec"
     targ_underscore=yes
     targ_cflags=-D__QNXTARGET__
     ;;
   arm-*-nto* | nto*arm*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+    targ_defvec=arm_elf32_le_vec
+    targ_selvecs=arm_elf32_be_vec
     ;;
   arm-*-riscix*)
-    targ_defvec=riscix_vec
+    targ_defvec=arm_aout_riscix_vec
     ;;
   arm-epoc-pe*)
-    targ_defvec=arm_epoc_pe_little_vec
-    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
+    targ_defvec=arm_pe_epoc_le_vec
+    targ_selvecs="arm_pe_epoc_le_vec arm_pe_epoc_be_vec arm_pei_epoc_le_vec arm_pei_epoc_be_vec"
     targ_underscore=no
     targ_cflags=-DARM_COFF_BUGFIX
     ;;
   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
-    targ_defvec=arm_wince_pe_little_vec
-    targ_selvecs="arm_wince_pe_little_vec arm_wince_pe_big_vec arm_wince_pei_little_vec arm_wince_pei_big_vec"
+    targ_defvec=arm_pe_wince_le_vec
+    targ_selvecs="arm_pe_wince_le_vec arm_pe_wince_be_vec arm_pei_wince_le_vec arm_pei_wince_be_vec"
     targ_underscore=no
     targ_cflags="-DARM_WINCE -DARM_COFF_BUGFIX"
     ;;
   arm-*-pe*)
-    targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
+    targ_defvec=arm_pe_le_vec
+    targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
     targ_underscore=yes
     ;;
   arm-*-aout | armel-*-aout)
-    targ_defvec=aout_arm_little_vec
-    targ_selvecs=aout_arm_big_vec
+    targ_defvec=arm_aout_le_vec
+    targ_selvecs=arm_aout_be_vec
     ;;
   armeb-*-aout)
-    targ_defvec=aout_arm_big_vec
-    targ_selvecs=aout_arm_little_vec
+    targ_defvec=arm_aout_be_vec
+    targ_selvecs=arm_aout_le_vec
     ;;
   arm-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
+    targ_defvec=arm_coff_le_vec
+    targ_selvecs=arm_coff_be_vec
     targ_underscore=yes
     ;;
   arm-*-rtems*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+    targ_defvec=arm_elf32_le_vec
+    targ_selvecs=arm_elf32_be_vec
     ;;
   armeb-*-elf | arm*b-*-linux-*)
-    targ_defvec=bfd_elf32_bigarm_vec
-    targ_selvecs=bfd_elf32_littlearm_vec
+    targ_defvec=arm_elf32_be_vec
+    targ_selvecs=arm_elf32_le_vec
     ;;
   arm-*-kaos*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+    targ_defvec=arm_elf32_le_vec
+    targ_selvecs=arm_elf32_be_vec
     ;;
   arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
   arm*-*-eabi* )
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+    targ_defvec=arm_elf32_le_vec
+    targ_selvecs=arm_elf32_be_vec
     ;;
   arm*-*-vxworks | arm*-*-windiss)
-    targ_defvec=bfd_elf32_littlearm_vxworks_vec
-    targ_selvecs=bfd_elf32_bigarm_vxworks_vec
+    targ_defvec=arm_elf32_vxworks_le_vec
+    targ_selvecs=arm_elf32_vxworks_be_vec
     ;;
   arm*-*-symbianelf*)
-    targ_defvec=bfd_elf32_littlearm_symbian_vec
-    targ_selvecs=bfd_elf32_bigarm_symbian_vec
+    targ_defvec=arm_elf32_symbian_le_vec
+    targ_selvecs=arm_elf32_symbian_be_vec
     ;;
   arm9e-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+    targ_defvec=arm_elf32_le_vec
+    targ_selvecs=arm_elf32_be_vec
     ;;
 
   avr-*-*)
-    targ_defvec=bfd_elf32_avr_vec
+    targ_defvec=avr_elf32_vec
     ;;
 
   bfin-*-*)
-    targ_defvec=bfd_elf32_bfin_vec
-    targ_selvecs=bfd_elf32_bfinfdpic_vec
+    targ_defvec=bfin_elf32_vec
+    targ_selvecs=bfin_elf32_fdpic_vec
     targ_underscore=yes
     ;;
 
@@ -386,211 +386,211 @@ case "${targ}" in
     ;;
 
   cr16-*-elf* | cr16*-*-uclinux*)
-    targ_defvec=bfd_elf32_cr16_vec
+    targ_defvec=cr16_elf32_vec
     targ_underscore=yes
     ;;
 
   cr16c-*-elf*)
-    targ_defvec=bfd_elf32_cr16c_vec
+    targ_defvec=cr16c_elf32_vec
     targ_underscore=yes
     ;;
 
   cris-*-* | crisv32-*-*)
     targ_defvec=cris_aout_vec
-    targ_selvecs="bfd_elf32_us_cris_vec bfd_elf32_cris_vec ieee_vec"
-    targ_underscore=yes # Note: not true for bfd_elf32_cris_vec.
+    targ_selvecs="cris_elf32_us_vec cris_elf32_vec ieee_vec"
+    targ_underscore=yes # Note: not true for cris_elf32_vec.
     ;;
 
   crx-*-elf*)
-    targ_defvec=bfd_elf32_crx_vec
+    targ_defvec=crx_elf32_vec
     targ_underscore=yes
     ;;
 
   d10v-*-*)
-    targ_defvec=bfd_elf32_d10v_vec
+    targ_defvec=d10v_elf32_vec
     ;;
 
   dlx-*-elf*)
-    targ_defvec=bfd_elf32_dlx_big_vec
-    targ_selvecs="bfd_elf32_dlx_big_vec"
+    targ_defvec=dlx_elf32_be_vec
+    targ_selvecs="dlx_elf32_be_vec"
     ;;
 
   d30v-*-*)
-    targ_defvec=bfd_elf32_d30v_vec
+    targ_defvec=d30v_elf32_vec
     ;;
 
   epiphany-*-elf)
-    targ_defvec=bfd_elf32_epiphany_vec
+    targ_defvec=epiphany_elf32_vec
     ;;
 
   fido-*-elf* )
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs="m68kcoff_vec ieee_vec"
+    targ_defvec=m68k_elf32_vec
+    targ_selvecs="m68k_coff_vec ieee_vec"
     ;;
 
   fr30-*-elf)
-    targ_defvec=bfd_elf32_fr30_vec
+    targ_defvec=fr30_elf32_vec
     ;;
 
   frv-*-elf)
-    targ_defvec=bfd_elf32_frv_vec
-    targ_selvecs=bfd_elf32_frvfdpic_vec
+    targ_defvec=frv_elf32_vec
+    targ_selvecs=frv_elf32_fdpic_vec
     ;;
 
   frv-*-*linux*)
-    targ_defvec=bfd_elf32_frvfdpic_vec
-    targ_selvecs=bfd_elf32_frv_vec
+    targ_defvec=frv_elf32_fdpic_vec
+    targ_selvecs=frv_elf32_vec
     ;;
 
   moxie-*-elf | moxie-*-rtems* | moxie-*-uclinux)
-    targ_defvec=bfd_elf32_bigmoxie_vec
-    targ_selvecs=bfd_elf32_littlemoxie_vec
+    targ_defvec=moxie_elf32_be_vec
+    targ_selvecs=moxie_elf32_le_vec
     ;;
 
   h8300*-*-rtemscoff*)
-    targ_defvec=h8300coff_vec
+    targ_defvec=h8300_coff_vec
     targ_underscore=yes
     ;;
 
   h8300*-*-elf | h8300*-*-rtems*)
-    targ_defvec=bfd_elf32_h8300_vec
+    targ_defvec=h8300_elf32_vec
     targ_underscore=yes
     ;;
 
   h8300*-*-*)
-    targ_defvec=h8300coff_vec
+    targ_defvec=h8300_coff_vec
     targ_underscore=yes
     ;;
 
   h8500-*-*)
-    targ_defvec=h8500coff_vec
+    targ_defvec=h8500_coff_vec
     targ_underscore=yes
     ;;
 
 #ifdef BFD64
   hppa*64*-*-linux-*)
-    targ_defvec=bfd_elf64_hppa_linux_vec
-    targ_selvecs=bfd_elf64_hppa_vec
+    targ_defvec=hppa_elf64_linux_vec
+    targ_selvecs=hppa_elf64_vec
     want64=true
     ;;
   hppa*64*-*-hpux11*)
-    targ_defvec=bfd_elf64_hppa_vec
-    targ_selvecs=bfd_elf64_hppa_linux_vec
+    targ_defvec=hppa_elf64_vec
+    targ_selvecs=hppa_elf64_linux_vec
     targ_cflags=-DHPUX_LARGE_AR_IDS
     want64=true
     ;;
 #endif
 
   hppa*-*-linux-*)
-    targ_defvec=bfd_elf32_hppa_linux_vec
-    targ_selvecs=bfd_elf32_hppa_vec
+    targ_defvec=hppa_elf32_linux_vec
+    targ_selvecs=hppa_elf32_vec
     ;;
   hppa*-*-netbsd*)
-    targ_defvec=bfd_elf32_hppa_nbsd_vec
-    targ_selvecs="bfd_elf32_hppa_vec bfd_elf32_hppa_linux_vec"
+    targ_defvec=hppa_elf32_nbsd_vec
+    targ_selvecs="hppa_elf32_vec hppa_elf32_linux_vec"
     ;;
   hppa*-*-*elf* | hppa*-*-lites* | hppa*-*-sysv4* | hppa*-*-openbsd*)
-    targ_defvec=bfd_elf32_hppa_vec
-    targ_selvecs=bfd_elf32_hppa_linux_vec
+    targ_defvec=hppa_elf32_vec
+    targ_selvecs=hppa_elf32_linux_vec
     ;;
 
   hppa*-*-bsd*)
-    targ_defvec=som_vec
-    targ_selvecs=bfd_elf32_hppa_vec
+    targ_defvec=hppa_som_vec
+    targ_selvecs=hppa_elf32_vec
     ;;
   hppa*-*-hpux* | hppa*-*-hiux* | hppa*-*-mpeix*)
-    targ_defvec=som_vec
+    targ_defvec=hppa_som_vec
     ;;
   hppa*-*-osf*)
-    targ_defvec=som_vec
-    targ_selvecs=bfd_elf32_hppa_vec
+    targ_defvec=hppa_som_vec
+    targ_selvecs=hppa_elf32_vec
     ;;
 
   i370-*-*)
-    targ_defvec=bfd_elf32_i370_vec
-    targ_selvecs="bfd_elf32_i370_vec"
+    targ_defvec=i370_elf32_vec
+    targ_selvecs="i370_elf32_vec"
     ;;
   i[3-7]86-*-sco3.2v5*coff)
-    targ_defvec=i386coff_vec
-    targ_selvecs=bfd_elf32_i386_vec
+    targ_defvec=i386_coff_vec
+    targ_selvecs=i386_elf32_vec
     ;;
   i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
   i[3-7]86-*-elf | i[3-7]86-*-sco3.2v5* | \
   i[3-7]86-*-dgux* | i[3-7]86-*-sysv5*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386coff_vec
+    targ_defvec=i386_elf32_vec
+    targ_selvecs=i386_coff_vec
     ;;
   i[3-7]86-*-solaris2*)
-    targ_defvec=bfd_elf32_i386_sol2_vec
-    targ_selvecs="i386coff_vec"
-    targ64_selvecs="bfd_elf64_x86_64_sol2_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=i386_elf32_sol2_vec
+    targ_selvecs="i386_coff_vec"
+    targ64_selvecs="x86_64_elf64_sol2_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
 #ifdef BFD64
   x86_64-*-solaris2*)
-    targ_defvec=bfd_elf32_i386_sol2_vec
-    targ_selvecs="bfd_elf64_x86_64_sol2_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386coff_vec"
+    targ_defvec=i386_elf32_sol2_vec
+    targ_selvecs="x86_64_elf64_sol2_vec l1om_elf64_vec k1om_elf64_vec i386_coff_vec"
     want64=true
     ;;
 #endif
   i[3-7]86-*-kaos*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=bfd_elf32_i386_vec
+    targ_defvec=i386_elf32_vec
+    targ_selvecs=i386_elf32_vec
     ;;
   i[3-7]86-*-nto*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386coff_vec
+    targ_defvec=i386_elf32_vec
+    targ_selvecs=i386_coff_vec
     ;;
   i[3-7]86-*-aros*)
-    targ_defvec=bfd_elf32_i386_vec
+    targ_defvec=i386_elf32_vec
     ;;
   i[3-7]86-*-chorus*)
-    targ_defvec=bfd_elf32_i386_vec
+    targ_defvec=i386_elf32_vec
     ;;
   i[3-7]86-*-dicos*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=i386_elf32_vec
+    targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
   *-*-msdosdjgpp* | *-*-go32* )
-    targ_defvec=go32coff_vec
-    targ_selvecs="go32stubbedcoff_vec i386aout_vec"
+    targ_defvec=i386_coff_go32_vec
+    targ_selvecs="i386_coff_go32stubbed_vec i386_aout_vec"
     ;;
   i[3-7]86-*-sysv* | i[3-7]86-*-isc* | i[3-7]86-*-sco* | i[3-7]86-*-coff | \
   i[3-7]86-*-aix*)
-    targ_defvec=i386coff_vec
+    targ_defvec=i386_coff_vec
     ;;
   i[3-7]86-*-rtems*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386coff_vec i386aout_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs="i386_coff_vec i386_aout_vec"
     ;;
   i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
-    targ_defvec=mach_o_i386_vec
+    targ_defvec=i386_mach_o_vec
     targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
-    targ64_selvecs=mach_o_x86_64_vec
+    targ64_selvecs=x86_64_mach_o_vec
     targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
     ;;
   i[3-7]86-sequent-bsd*)
-    targ_defvec=i386dynix_vec
+    targ_defvec=i386_aout_dynix_vec
     targ_underscore=yes
     ;;
   i[3-7]86-*-bsd*)
-    targ_defvec=i386bsd_vec
+    targ_defvec=i386_aout_bsd_vec
     targ_underscore=yes
     ;;
   i[3-7]86-*-dragonfly*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=i386_elf32_vec
+    targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
   i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \
   i[3-7]86-*-freebsd[12])
-    targ_defvec=i386freebsd_vec
-    targ_selvecs=i386bsd_vec
+    targ_defvec=i386_aout_fbsd_vec
+    targ_selvecs=i386_aout_bsd_vec
     targ_underscore=yes
     ;;
   i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
-    targ_defvec=bfd_elf32_i386_freebsd_vec
-    targ_selvecs="bfd_elf32_i386_vec i386pei_vec i386coff_vec"
-    targ64_selvecs="bfd_elf64_x86_64_freebsd_vec bfd_elf64_x86_64_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_l1om_freebsd_vec bfd_elf64_k1om_vec bfd_elf64_k1om_freebsd_vec"
+    targ_defvec=i386_elf32_fbsd_vec
+    targ_selvecs="i386_elf32_vec i386_pei_vec i386_coff_vec"
+    targ64_selvecs="x86_64_elf64_fbsd_vec x86_64_elf64_vec x86_64_pei_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
     # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
     case "${targ}" in
       i[3-7]86-*-freebsd3* | i[3-7]86-*-freebsd4 | i[3-7]86-*-freebsd4.0*)
@@ -598,584 +598,584 @@ case "${targ}" in
     esac
     ;;
   i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386netbsd_vec
-    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs=i386_aout_nbsd_vec
+    targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
   i[3-7]86-*-netbsdpe*)
-    targ_defvec=i386pe_vec
-    targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec"
+    targ_defvec=i386_pe_vec
+    targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec"
     ;;
   i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
   i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3])
-    targ_defvec=i386netbsd_vec
-    targ_selvecs="bfd_elf32_i386_vec i386bsd_vec"
+    targ_defvec=i386_aout_nbsd_vec
+    targ_selvecs="i386_elf32_vec i386_aout_bsd_vec"
     targ_underscore=yes
     ;;
   i[3-7]86-*-openbsd*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386netbsd_vec
+    targ_defvec=i386_elf32_vec
+    targ_selvecs=i386_aout_nbsd_vec
     ;;
   i[3-7]86-*-netware*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="nlm32_i386_vec i386coff_vec i386aout_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs="i386_nlm32_vec i386_coff_vec i386_aout_vec"
     ;;
   i[3-7]86-*-linux*aout*)
-    targ_defvec=i386linux_vec
-    targ_selvecs=bfd_elf32_i386_vec
+    targ_defvec=i386_aout_linux_vec
+    targ_selvecs=i386_elf32_vec
     targ_underscore=yes
     ;;
   i[3-7]86-*-linux-*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386linux_vec i386pei_vec"
-    targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf32_x86_64_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs="i386_aout_linux_vec i386_pei_vec"
+    targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     ;;
   i[3-7]86-*-nacl*)
-    targ_defvec=bfd_elf32_i386_nacl_vec
-    targ_selvecs="bfd_elf32_bigarm_nacl_vec bfd_elf32_littlearm_nacl_vec"
-    targ64_selvecs="bfd_elf64_x86_64_nacl_vec bfd_elf32_x86_64_nacl_vec"
+    targ_defvec=i386_elf32_nacl_vec
+    targ_selvecs="arm_elf32_nacl_be_vec arm_elf32_nacl_le_vec"
+    targ64_selvecs="x86_64_elf64_nacl_vec x86_64_elf32_nacl_vec"
     targ_archs="$targ_archs bfd_arm_arch"
     ;;
 #ifdef BFD64
   x86_64-*-darwin*)
-    targ_defvec=mach_o_x86_64_vec
-    targ_selvecs="mach_o_i386_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+    targ_defvec=x86_64_mach_o_vec
+    targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
     targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
     want64=true
     ;;
   x86_64-*-dicos*)
-    targ_defvec=bfd_elf64_x86_64_vec
-    targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=x86_64_elf64_vec
+    targ_selvecs="i386_elf32_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-elf*)
-    targ_defvec=bfd_elf64_x86_64_vec
-    targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=x86_64_elf64_vec
+    targ_selvecs="i386_elf32_vec x86_64_elf32_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-dragonfly*)
-    targ_defvec=bfd_elf64_x86_64_vec
-    targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=x86_64_elf64_vec
+    targ_selvecs="i386_elf32_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
-    targ_defvec=bfd_elf64_x86_64_freebsd_vec
-    targ_selvecs="bfd_elf32_i386_freebsd_vec i386coff_vec i386pei_vec x86_64pei_vec bfd_elf32_i386_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_l1om_freebsd_vec bfd_elf64_k1om_vec bfd_elf64_k1om_freebsd_vec"
+    targ_defvec=x86_64_elf64_fbsd_vec
+    targ_selvecs="i386_elf32_fbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
     want64=true
     ;;
   x86_64-*-netbsd* | x86_64-*-openbsd*)
-    targ_defvec=bfd_elf64_x86_64_vec
-    targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=x86_64_elf64_vec
+    targ_selvecs="i386_elf32_vec i386_aout_nbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-linux-*)
-    targ_defvec=bfd_elf64_x86_64_vec
-    targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+    targ_defvec=x86_64_elf64_vec
+    targ_selvecs="i386_elf32_vec x86_64_elf32_vec i386_aout_linux_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
     want64=true
     ;;
   x86_64-*-nacl*)
-    targ_defvec=bfd_elf32_x86_64_nacl_vec
-    targ_selvecs="bfd_elf32_i386_nacl_vec bfd_elf64_x86_64_nacl_vec bfd_elf32_bigarm_nacl_vec bfd_elf32_littlearm_nacl_vec"
+    targ_defvec=x86_64_elf32_nacl_vec
+    targ_selvecs="i386_elf32_nacl_vec x86_64_elf64_nacl_vec arm_elf32_nacl_be_vec arm_elf32_nacl_le_vec"
     targ_archs="$targ_archs bfd_arm_arch"
     want64=true
     ;;
   x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin)
-    targ_defvec=x86_64pe_vec
-    targ_selvecs="x86_64pe_vec x86_64pei_vec x86_64pe_bigobj_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec i386pe_vec i386pei_vec bfd_elf32_i386_vec"
+    targ_defvec=x86_64_pe_vec
+    targ_selvecs="x86_64_pe_vec x86_64_pei_vec x86_64_pe_be_vec x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec i386_pe_vec i386_pei_vec i386_elf32_vec"
     want64=true
     targ_underscore=no
     ;;
   x86_64-*-rdos*)
-    targ_defvec=bfd_elf64_x86_64_vec
+    targ_defvec=x86_64_elf64_vec
     want64=true
     ;;
 #endif
   i[3-7]86-*-lynxos*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386lynx_coff_vec i386lynx_aout_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs="i386_coff_lynx_vec i386_aout_lynx_vec"
     ;;
   i[3-7]86-*-gnu*)
-    targ_defvec=bfd_elf32_i386_vec
+    targ_defvec=i386_elf32_vec
     ;;
   i[3-7]86-*-mach* | i[3-7]86-*-osf1mk*)
-    targ_defvec=i386mach3_vec
+    targ_defvec=i386_aout_mach3_vec
     targ_cflags=-DSTAT_FOR_EXEC
     targ_underscore=yes
     ;;
   i[3-7]86-*-os9k)
-    targ_defvec=i386os9k_vec
+    targ_defvec=i386_aout_os9k_vec
     ;;
   i[3-7]86-*-msdos*)
-    targ_defvec=i386aout_vec
-    targ_selvecs=i386msdos_vec
+    targ_defvec=i386_aout_vec
+    targ_selvecs=i386_msdos_vec
     ;;
   i[3-7]86-*-moss*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386msdos_vec i386aout_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs="i386_msdos_vec i386_aout_vec"
     ;;
   i[3-7]86-*-beospe*)
-    targ_defvec=i386pe_vec
-    targ_selvecs="i386pe_vec i386pei_vec"
+    targ_defvec=i386_pe_vec
+    targ_selvecs="i386_pe_vec i386_pei_vec"
     ;;
   i[3-7]86-*-beoself* | i[3-7]86-*-beos*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386pe_vec i386pei_vec"
+    targ_defvec=i386_elf32_vec
+    targ_selvecs="i386_pe_vec i386_pei_vec"
     ;;
   i[3-7]86-*-interix*)
-    targ_defvec=i386pei_vec
-    targ_selvecs="i386pe_vec"
+    targ_defvec=i386_pei_vec
+    targ_selvecs="i386_pe_vec"
     # FIXME: This should eventually be checked at runtime.
     targ_cflags=-DSTRICT_PE_FORMAT
     ;;
   i[3-7]86-*-rdos*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386coff_vec
+    targ_defvec=i386_elf32_vec
+    targ_selvecs=i386_coff_vec
     ;;
   i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
-    targ_defvec=i386pe_vec
-    targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec"
+    targ_defvec=i386_pe_vec
+    targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec"
     targ_underscore=yes
     ;;
   i[3-7]86-none-*)
-    targ_defvec=i386coff_vec
+    targ_defvec=i386_coff_vec
     ;;
   i[3-7]86-*-aout* | i[3-7]86*-*-vsta*)
-    targ_defvec=i386aout_vec
+    targ_defvec=i386_aout_vec
     ;;
   i[3-7]86-*-vxworks*)
-    targ_defvec=bfd_elf32_i386_vxworks_vec
+    targ_defvec=i386_elf32_vxworks_vec
     targ_underscore=yes
     ;;
   i[3-7]86-*-chaos)
-    targ_defvec=bfd_elf32_i386_vec
+    targ_defvec=i386_elf32_vec
     targ_selfvecs=i386chaos_vec
     ;;
 
   i860-*-mach3* | i860-*-osf1* | i860-*-coff*)
-    targ_defvec=i860coff_vec
+    targ_defvec=i860_coff_vec
     ;;
   i860-stardent-sysv4* | i860-stardent-elf*)
-    targ_defvec=bfd_elf32_i860_little_vec
-    targ_selvecs="bfd_elf32_i860_vec bfd_elf32_i860_little_vec"
+    targ_defvec=i860_elf32_le_vec
+    targ_selvecs="i860_elf32_vec i860_elf32_le_vec"
     ;;
   i860-*-sysv4* | i860-*-elf*)
-    targ_defvec=bfd_elf32_i860_vec
+    targ_defvec=i860_elf32_vec
     ;;
 
   i960-*-vxworks4* | i960-*-vxworks5.0)
-    targ_defvec=b_out_vec_little_host
-    targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec"
+    targ_defvec=bout_le_vec
+    targ_selvecs="bout_be_vec icoff_le_vec icoff_be_vec ieee_vec"
     targ_underscore=yes
     ;;
   i960-*-vxworks5.* | i960-*-coff* | i960-*-sysv*)
-    targ_defvec=icoff_little_vec
-    targ_selvecs="icoff_big_vec b_out_vec_little_host b_out_vec_big_host ieee_vec"
+    targ_defvec=icoff_le_vec
+    targ_selvecs="icoff_be_vec bout_le_vec bout_be_vec ieee_vec"
     targ_underscore=yes
     ;;
   i960-*-vxworks* | i960-*-aout* | i960-*-bout* | i960-*-nindy*)
-    targ_defvec=b_out_vec_little_host
-    targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec"
+    targ_defvec=bout_le_vec
+    targ_selvecs="bout_be_vec icoff_le_vec icoff_be_vec ieee_vec"
     targ_underscore=yes
     ;;
   i960-*-elf*)
-    targ_defvec=bfd_elf32_i960_vec
-    targ_selvecs="icoff_little_vec icoff_big_vec"
+    targ_defvec=i960_elf32_vec
+    targ_selvecs="icoff_le_vec icoff_be_vec"
     ;;
 
   ip2k-*-elf)
-    targ_defvec=bfd_elf32_ip2k_vec
+    targ_defvec=ip2k_elf32_vec
     ;;
 
   iq2000-*-elf)
-    targ_defvec=bfd_elf32_iq2000_vec
+    targ_defvec=iq2000_elf32_vec
     ;;
 
   lm32-*-elf | lm32-*-rtems*)
-    targ_defvec=bfd_elf32_lm32_vec
-    targ_selvecs=bfd_elf32_lm32fdpic_vec
+    targ_defvec=lm32_elf32_vec
+    targ_selvecs=lm32_elf32_fdpic_vec
     ;;
 
   lm32-*-*linux*)
-    targ_defvec=bfd_elf32_lm32fdpic_vec
-    targ_selvecs=bfd_elf32_lm32_vec
+    targ_defvec=lm32_elf32_fdpic_vec
+    targ_selvecs=lm32_elf32_vec
     ;;
 
   m32c-*-elf | m32c-*-rtems*)
-    targ_defvec=bfd_elf32_m32c_vec
+    targ_defvec=m32c_elf32_vec
     ;;
 
   m32r*le-*-linux*)
-    targ_defvec=bfd_elf32_m32rlelin_vec
-    targ_selvecs="bfd_elf32_m32rlin_vec  bfd_elf32_m32rlelin_vec"
+    targ_defvec=m32r_elf32_linux_le_vec
+    targ_selvecs="m32r_elf32_linux_vec  m32r_elf32_linux_le_vec"
     ;;
   m32r*-*-linux*)
-    targ_defvec=bfd_elf32_m32rlin_vec
-    targ_selvecs="bfd_elf32_m32rlin_vec  bfd_elf32_m32rlelin_vec"
+    targ_defvec=m32r_elf32_linux_vec
+    targ_selvecs="m32r_elf32_linux_vec  m32r_elf32_linux_le_vec"
     ;;
   m32r*le-*-*)
-    targ_defvec=bfd_elf32_m32rle_vec
-    targ_selvecs="bfd_elf32_m32r_vec bfd_elf32_m32rle_vec"
+    targ_defvec=m32r_elf32_le_vec
+    targ_selvecs="m32r_elf32_vec m32r_elf32_le_vec"
     ;;
   m32r-*-*)
-    targ_defvec=bfd_elf32_m32r_vec
+    targ_defvec=m32r_elf32_vec
     ;;
 
   m68hc11-*-* | m6811-*-*)
-    targ_defvec=bfd_elf32_m68hc11_vec
-    targ_selvecs="bfd_elf32_m68hc11_vec bfd_elf32_m68hc12_vec"
+    targ_defvec=m68hc11_elf32_vec
+    targ_selvecs="m68hc11_elf32_vec m68hc12_elf32_vec"
     ;;
   m68hc12-*-* | m6812-*-*)
-    targ_defvec=bfd_elf32_m68hc12_vec
-    targ_selvecs="bfd_elf32_m68hc11_vec bfd_elf32_m68hc12_vec"
+    targ_defvec=m68hc12_elf32_vec
+    targ_selvecs="m68hc11_elf32_vec m68hc12_elf32_vec"
     ;;
 
   m68*-motorola-sysv*)
-    targ_defvec=m68ksysvcoff_vec
+    targ_defvec=m68k_coff_sysv_vec
     ;;
   m68*-hp-bsd*)
-    targ_defvec=hp300bsd_vec
+    targ_defvec=m68k_aout_hp300bsd_vec
     targ_underscore=yes
     ;;
   m68*-*-aout*)
-    targ_defvec=aout0_big_vec
-    # We include cisco_core_big_vec here, rather than making a separate cisco
+    targ_defvec=aout0_be_vec
+    # We include core_cisco_be_vec here, rather than making a separate cisco
     # configuration, so that cisco-core.c gets routinely tested at
     # least for compilation.
-    targ_selvecs="cisco_core_big_vec ieee_vec"
+    targ_selvecs="core_cisco_be_vec ieee_vec"
     targ_underscore=yes
     ;;
   m68*-*-elf* | m68*-*-sysv4* | m68*-*-uclinux*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs="m68kcoff_vec ieee_vec"
+    targ_defvec=m68k_elf32_vec
+    targ_selvecs="m68k_coff_vec ieee_vec"
     ;;
   m68*-*-rtems*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs="m68kcoff_vec versados_vec ieee_vec aout0_big_vec"
+    targ_defvec=m68k_elf32_vec
+    targ_selvecs="m68k_coff_vec m68k_versados_vec ieee_vec aout0_be_vec"
     ;;
   m68*-*-coff* | m68*-*-sysv*)
-    targ_defvec=m68kcoff_vec
-    targ_selvecs="m68kcoff_vec versados_vec ieee_vec"
+    targ_defvec=m68k_coff_vec
+    targ_selvecs="m68k_coff_vec m68k_versados_vec ieee_vec"
     ;;
   m68*-*-hpux*)
-    targ_defvec=hp300hpux_vec
+    targ_defvec=m68k_aout_hp300hpux_vec
     targ_underscore=yes
     ;;
   m68*-*-linux*aout*)
-    targ_defvec=m68klinux_vec
-    targ_selvecs=bfd_elf32_m68k_vec
+    targ_defvec=m68k_aout_linux_vec
+    targ_selvecs=m68k_elf32_vec
     targ_underscore=yes
     ;;
   m68*-*-linux-*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs=m68klinux_vec
+    targ_defvec=m68k_elf32_vec
+    targ_selvecs=m68k_aout_linux_vec
     ;;
   m68*-*-gnu*)
-    targ_defvec=bfd_elf32_m68k_vec
+    targ_defvec=m68k_elf32_vec
     # targ_selvecs=m68kmach3_vec
     # targ_cflags=-DSTAT_FOR_EXEC
     ;;
   m68*-hp*-netbsd*)
-    targ_defvec=m68k4knetbsd_vec
-    targ_selvecs="m68knetbsd_vec hp300bsd_vec sunos_big_vec"
+    targ_defvec=m68k_aout_4knbsd_vec
+    targ_selvecs="m68k_aout_nbsd_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
     targ_underscore=yes
     ;;
   m68*-*-netbsdelf*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs="m68knetbsd_vec m68k4knetbsd_vec hp300bsd_vec sunos_big_vec"
+    targ_defvec=m68k_elf32_vec
+    targ_selvecs="m68k_aout_nbsd_vec m68k_aout_4knbsd_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
     ;;
   m68*-*-netbsdaout* | m68*-*-netbsd*)
-    targ_defvec=m68knetbsd_vec
-    targ_selvecs="m68k4knetbsd_vec bfd_elf32_m68k_vec hp300bsd_vec sunos_big_vec"
+    targ_defvec=m68k_aout_nbsd_vec
+    targ_selvecs="m68k_aout_4knbsd_vec m68k_elf32_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
     targ_underscore=yes
     ;;
   m68*-*-openbsd*)
-    targ_defvec=m68knetbsd_vec
-    targ_selvecs="m68k4knetbsd_vec hp300bsd_vec sunos_big_vec"
+    targ_defvec=m68k_aout_nbsd_vec
+    targ_selvecs="m68k_aout_4knbsd_vec m68k_aout_hp300bsd_vec sparc_aout_sunos_be_vec"
     targ_underscore=yes
     ;;
   m68*-*-sunos* | m68*-*-os68k* | m68*-*-vxworks* | m68*-netx-* | \
   m68*-*-bsd* | m68*-*-vsta*)
-    targ_defvec=sunos_big_vec
+    targ_defvec=sparc_aout_sunos_be_vec
     targ_underscore=yes
     ;;
   m68*-ericsson-*)
-    targ_defvec=sunos_big_vec
-    targ_selvecs="m68kcoff_vec versados_vec tekhex_vec"
+    targ_defvec=sparc_aout_sunos_be_vec
+    targ_selvecs="m68k_coff_vec m68k_versados_vec tekhex_vec"
     targ_underscore=yes
     ;;
   m68*-cbm-*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs=m68kcoff_vec
+    targ_defvec=m68k_elf32_vec
+    targ_selvecs=m68k_coff_vec
     ;;
   m68*-*-psos*)
-    targ_defvec=bfd_elf32_m68k_vec
+    targ_defvec=m68k_elf32_vec
     targ_selvecs=ieee_vec
     targ_underscore=yes
     ;;
 
   m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*)
-    targ_defvec=bfd_elf32_m88k_vec
-    targ_selvecs=m88kbcs_vec
+    targ_defvec=m88k_elf32_vec
+    targ_selvecs=m88k_coff_bcs_vec
     ;;
   m88*-*-mach3*)
-    targ_defvec=m88kmach3_vec
+    targ_defvec=m88k_aout_mach3_vec
     targ_cflags=-DSTAT_FOR_EXEC
     ;;
   m88*-*-openbsd*)
-   targ_defvec=m88kopenbsd_vec
+   targ_defvec=m88k_aout_obsd_vec
    targ_underscore=yes
    ;;
   m88*-*-*)
-    targ_defvec=m88kbcs_vec
+    targ_defvec=m88k_coff_bcs_vec
     targ_underscore=yes
     ;;
 
   mcore-*-elf)
-    targ_defvec=bfd_elf32_mcore_big_vec
-    targ_selvecs="bfd_elf32_mcore_big_vec bfd_elf32_mcore_little_vec"
+    targ_defvec=mcore_elf32_be_vec
+    targ_selvecs="mcore_elf32_be_vec mcore_elf32_le_vec"
     ;;
   mcore-*-pe)
-    targ_defvec=mcore_pe_big_vec
-    targ_selvecs="mcore_pe_big_vec mcore_pe_little_vec mcore_pei_big_vec mcore_pei_little_vec"
+    targ_defvec=mcore_pe_be_vec
+    targ_selvecs="mcore_pe_be_vec mcore_pe_le_vec mcore_pei_be_vec mcore_pei_le_vec"
     ;;
 
   mep-*-elf)
-    targ_defvec=bfd_elf32_mep_vec
-    targ_selvecs=bfd_elf32_mep_little_vec
+    targ_defvec=mep_elf32_vec
+    targ_selvecs=mep_elf32_le_vec
     ;;
 
   metag-*-*)
-    targ_defvec=bfd_elf32_metag_vec
+    targ_defvec=metag_elf32_vec
     targ_underscore=yes
     ;;
 
   microblazeel*-*)
-    targ_defvec=bfd_elf32_microblazeel_vec
-    targ_selvecs=bfd_elf32_microblaze_vec
+    targ_defvec=microblaze_elf32_le_vec
+    targ_selvecs=microblaze_elf32_vec
     ;;
 
   microblaze*-*)
-    targ_defvec=bfd_elf32_microblaze_vec
-    targ_selvecs=bfd_elf32_microblazeel_vec
+    targ_defvec=microblaze_elf32_vec
+    targ_selvecs=microblaze_elf32_le_vec
     ;;
 
   mips*-big-*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
+    targ_defvec=mips_ecoff_be_vec
+    targ_selvecs=mips_ecoff_le_vec
     ;;
 #ifdef BFD64
   mips*el-*-netbsd*)
-    targ_defvec=bfd_elf32_tradlittlemips_vec
-    targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_little_vec ecoff_big_vec"
+    targ_defvec=mips_elf32_trad_le_vec
+    targ_selvecs="mips_elf32_trad_be_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec mips_ecoff_le_vec mips_ecoff_be_vec"
     ;;
   mips*-*-netbsd*)
-    targ_defvec=bfd_elf32_tradbigmips_vec
-    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    targ_defvec=mips_elf32_trad_be_vec
+    targ_selvecs="mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
 #endif
   mips*-dec-* | mips*el-*-ecoff*)
-    targ_defvec=ecoff_little_vec
-    targ_selvecs=ecoff_big_vec
+    targ_defvec=mips_ecoff_le_vec
+    targ_selvecs=mips_ecoff_be_vec
     ;;
   mips*-*-ecoff*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
+    targ_defvec=mips_ecoff_be_vec
+    targ_selvecs=mips_ecoff_le_vec
     ;;
 #ifdef BFD64
   mips*-*-irix6*)
-    targ_defvec=bfd_elf32_nbigmips_vec
-    targ_selvecs="bfd_elf32_nlittlemips_vec bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_n_be_vec
+    targ_selvecs="mips_elf32_n_le_vec mips_elf32_be_vec mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips64*-ps2-elf*)
-    targ_defvec=bfd_elf32_nlittlemips_vec
-    targ_selvecs="bfd_elf32_nlittlemips_vec bfd_elf32_nbigmips_vec bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_n_le_vec
+    targ_selvecs="mips_elf32_n_le_vec mips_elf32_n_be_vec mips_elf32_be_vec mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips*-ps2-elf*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_le_vec
+    targ_selvecs="mips_elf32_be_vec mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips*-*-irix5*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
+    targ_defvec=mips_elf32_be_vec
+    targ_selvecs="mips_elf32_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
 #endif
   mips*-sgi-* | mips*-*-bsd*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
+    targ_defvec=mips_ecoff_be_vec
+    targ_selvecs=mips_ecoff_le_vec
     ;;
   mips*-*-lnews*)
-    targ_defvec=ecoff_biglittle_vec
-    targ_selvecs="ecoff_little_vec ecoff_big_vec"
+    targ_defvec=mips_ecoff_bele_vec
+    targ_selvecs="mips_ecoff_le_vec mips_ecoff_be_vec"
     ;;
 #ifdef BFD64
   mips*-*-sysv4*)
-    targ_defvec=bfd_elf32_tradbigmips_vec
-    targ_selvecs="bfd_elf32_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    targ_defvec=mips_elf32_trad_be_vec
+    targ_selvecs="mips_elf32_trad_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
 #endif
   mips*-*-sysv* | mips*-*-riscos*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
+    targ_defvec=mips_ecoff_be_vec
+    targ_selvecs=mips_ecoff_le_vec
     ;;
 #ifdef BFD64
   mips*el-*-vxworks*)
-    targ_defvec=bfd_elf32_littlemips_vxworks_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf32_bigmips_vxworks_vec bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_vxworks_le_vec
+    targ_selvecs="mips_elf32_le_vec mips_elf32_vxworks_be_vec mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips*-*-vxworks*)
-    targ_defvec=bfd_elf32_bigmips_vxworks_vec
-    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf32_littlemips_vxworks_vec bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_vxworks_be_vec
+    targ_selvecs="mips_elf32_be_vec mips_elf32_vxworks_le_vec mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips*el-sde-elf*)
-    targ_defvec=bfd_elf32_tradlittlemips_vec
-    targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    targ_defvec=mips_elf32_trad_le_vec
+    targ_selvecs="mips_elf32_trad_be_vec mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
     ;;
   mips*-sde-elf* | mips*-mti-elf*)
-    targ_defvec=bfd_elf32_tradbigmips_vec
-    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    targ_defvec=mips_elf32_trad_be_vec
+    targ_selvecs="mips_elf32_trad_le_vec mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
     ;;
   mips*el-*-elf* | mips*el-*-vxworks* | mips*-*-chorus*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_le_vec
+    targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks | mips*-*-windiss)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_be_vec
+    targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips*-*-none)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    targ_defvec=mips_elf32_be_vec
+    targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec"
     ;;
   mips64*-*-openbsd*)
-    targ_defvec=bfd_elf64_tradbigmips_vec
-    targ_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    targ_defvec=mips_elf64_trad_be_vec
+    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec"
     ;;
   mips*el-*-openbsd*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
+    targ_defvec=mips_elf32_le_vec
+    targ_selvecs="mips_elf32_be_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_le_vec mips_ecoff_be_vec"
     ;;
   mips*-*-openbsd*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"
+    targ_defvec=mips_elf32_be_vec
+    targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
     ;;
   mips64*el-*-linux*)
-    targ_defvec=bfd_elf32_ntradlittlemips_vec
-    targ_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_tradbigmips_vec"
+    targ_defvec=mips_elf32_ntrad_le_vec
+    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
     ;;
   mips64*-*-linux*)
-    targ_defvec=bfd_elf32_ntradbigmips_vec
-    targ_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    targ_defvec=mips_elf32_ntrad_be_vec
+    targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
     ;;
   mips*el-*-linux*)
-    targ_defvec=bfd_elf32_tradlittlemips_vec
-    targ_selvecs="bfd_elf32_tradbigmips_vec ecoff_little_vec ecoff_big_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec"
+    targ_defvec=mips_elf32_trad_le_vec
+    targ_selvecs="mips_elf32_trad_be_vec mips_ecoff_le_vec mips_ecoff_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_le_vec mips_elf32_ntrad_be_vec mips_elf64_trad_be_vec"
     ;;
   mips*-*-linux*)
-    targ_defvec=bfd_elf32_tradbigmips_vec
-    targ_selvecs="bfd_elf32_tradlittlemips_vec ecoff_big_vec ecoff_little_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec"
+    targ_defvec=mips_elf32_trad_be_vec
+    targ_selvecs="mips_elf32_trad_le_vec mips_ecoff_be_vec mips_ecoff_le_vec mips_elf32_ntrad_be_vec mips_elf64_trad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_le_vec"
     ;;
   mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
     # FreeBSD vectors
-    targ_defvec=bfd_elf32_ntradlittlemips_freebsd_vec
-    targ_selvecs="bfd_elf32_ntradbigmips_freebsd_vec bfd_elf32_tradlittlemips_freebsd_vec bfd_elf32_tradbigmips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec"
+    targ_defvec=mips_elf32_ntradfbsd_le_vec
+    targ_selvecs="mips_elf32_ntradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf64_tradfbsd_le_vec mips_elf64_tradfbsd_be_vec"
     # Generic vectors
-    targ_selvecs="${targ_selvecs} bfd_elf32_ntradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf64_tradlittlemips_vec bfd_elf64_tradbigmips_vec"
+    targ_selvecs="${targ_selvecs} mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
     ;;
   mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
     # FreeBSD vectors
-    targ_defvec=bfd_elf32_ntradbigmips_freebsd_vec
-    targ_selvecs="bfd_elf32_ntradlittlemips_freebsd_vec bfd_elf32_tradbigmips_freebsd_vec bfd_elf32_tradlittlemips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec"
+    targ_defvec=mips_elf32_ntradfbsd_be_vec
+    targ_selvecs="mips_elf32_ntradfbsd_le_vec mips_elf32_tradfbsd_be_vec mips_elf32_tradfbsd_le_vec mips_elf64_tradfbsd_be_vec mips_elf64_tradfbsd_le_vec"
     # Generic vectors
-    targ_selvecs="${targ_selvecs} bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec"
+    targ_selvecs="${targ_selvecs} mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
     ;;
   mips*el-*-freebsd* | mips*el-*-kfreebsd*-gnu)
     # FreeBSD vectors
-    targ_defvec=bfd_elf32_tradlittlemips_freebsd_vec
-    targ_selvecs="bfd_elf32_tradbigmips_freebsd_vec bfd_elf32_ntradlittlemips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec bfd_elf32_ntradbigmips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec"
+    targ_defvec=mips_elf32_tradfbsd_le_vec
+    targ_selvecs="mips_elf32_tradfbsd_be_vec mips_elf32_ntradfbsd_le_vec mips_elf64_tradfbsd_le_vec mips_elf32_ntradfbsd_be_vec mips_elf64_tradfbsd_be_vec"
     # Generic vectors
-    targ_selvecs="${targ_selvecs} bfd_elf32_tradlittlemips_vec bfd_elf32_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec"
+    targ_selvecs="${targ_selvecs} mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_le_vec mips_elf32_ntrad_be_vec mips_elf64_trad_be_vec"
     ;;
   mips*-*-freebsd* | mips*-*-kfreebsd*-gnu)
     # FreeBSD vectors
-    targ_defvec=bfd_elf32_tradbigmips_freebsd_vec
-    targ_selvecs="bfd_elf32_tradlittlemips_freebsd_vec bfd_elf32_ntradbigmips_freebsd_vec bfd_elf64_tradbigmips_freebsd_vec bfd_elf32_ntradlittlemips_freebsd_vec bfd_elf64_tradlittlemips_freebsd_vec"
+    targ_defvec=mips_elf32_tradfbsd_be_vec
+    targ_selvecs="mips_elf32_tradfbsd_le_vec mips_elf32_ntradfbsd_be_vec mips_elf64_tradfbsd_be_vec mips_elf32_ntradfbsd_le_vec mips_elf64_tradfbsd_le_vec"
     # Generic vectors
-    targ_selvecs="${targ_selvecs} bfd_elf32_tradbigmips_vec bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec"
+    targ_selvecs="${targ_selvecs} mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf32_ntrad_be_vec mips_elf64_trad_be_vec mips_elf32_ntrad_le_vec mips_elf64_trad_le_vec"
     ;;
   mmix-*-*)
-    targ_defvec=bfd_elf64_mmix_vec
-    targ_selvecs=bfd_mmo_vec
+    targ_defvec=mmix_elf64_vec
+    targ_selvecs=mmix_mmo_vec
     want64=true
     ;;
 #endif
   mn10200-*-*)
-    targ_defvec=bfd_elf32_mn10200_vec
+    targ_defvec=mn10200_elf32_vec
     ;;
 
   mn10300-*-*)
-    targ_defvec=bfd_elf32_mn10300_vec
+    targ_defvec=mn10300_elf32_vec
     targ_underscore=yes
     ;;
 
   mt-*-elf)
-    targ_defvec=bfd_elf32_mt_vec
+    targ_defvec=mt_elf32_vec
     ;;
 
   msp430-*-*)
-    targ_defvec=bfd_elf32_msp430_vec
-    targ_selvecs=bfd_elf32_msp430_ti_vec
+    targ_defvec=msp430_elf32_vec
+    targ_selvecs=msp430_elf32_ti_vec
     ;;
 
   nds32*le-*-linux*)
-    targ_defvec=bfd_elf32_nds32lelin_vec
-    targ_selvecs=bfd_elf32_nds32belin_vec
+    targ_defvec=nds32_elf32_linux_le_vec
+    targ_selvecs=nds32_elf32_linux_be_vec
     ;;
 
   nds32*be-*-linux*)
-    targ_defvec=bfd_elf32_nds32belin_vec
-    targ_selvecs=bfd_elf32_nds32lelin_vec
+    targ_defvec=nds32_elf32_linux_be_vec
+    targ_selvecs=nds32_elf32_linux_le_vec
     ;;
 
   nds32*le-*-*)
-    targ_defvec=bfd_elf32_nds32le_vec
-    targ_selvecs=bfd_elf32_nds32be_vec
+    targ_defvec=nds32_elf32_le_vec
+    targ_selvecs=nds32_elf32_be_vec
     ;;
 
   nds32*be-*-*)
-    targ_defvec=bfd_elf32_nds32be_vec
-    targ_selvecs=bfd_elf32_nds32le_vec
+    targ_defvec=nds32_elf32_be_vec
+    targ_selvecs=nds32_elf32_le_vec
     ;;
 
   ns32k-pc532-mach* | ns32k-pc532-ux*)
-    targ_defvec=pc532machaout_vec
+    targ_defvec=ns32k_aout_pc532mach_vec
     targ_underscore=yes
     ;;
   ns32k-*-netbsd* | ns32k-*-lites* | ns32k-*-openbsd*)
-    targ_defvec=pc532netbsd_vec
+    targ_defvec=ns32k_aout_pc532nbsd_vec
     targ_underscore=yes
     ;;
 
   nios2eb-*-*)
-    targ_defvec=bfd_elf32_bignios2_vec
-    targ_selvecs=bfd_elf32_littlenios2_vec
+    targ_defvec=nios2_elf32_be_vec
+    targ_selvecs=nios2_elf32_le_vec
     ;;
 
   nios2el-*-*)
-    targ_defvec=bfd_elf32_littlenios2_vec
-    targ_selvecs=bfd_elf32_bignios2_vec
+    targ_defvec=nios2_elf32_le_vec
+    targ_selvecs=nios2_elf32_be_vec
     ;;
 
   nios2-*-*)
-    targ_defvec=bfd_elf32_littlenios2_vec
-    targ_selvecs=bfd_elf32_bignios2_vec
+    targ_defvec=nios2_elf32_le_vec
+    targ_selvecs=nios2_elf32_be_vec
     ;;
 
   or1k-*-elf | or1k-*-linux*)
-    targ_defvec=bfd_elf32_or1k_vec
+    targ_defvec=or1k_elf32_vec
     ;;
 
   or1knd-*-elf | or1knd-*-linux*)
-    targ_defvec=bfd_elf32_or1k_vec
+    targ_defvec=or1k_elf32_vec
     ;;
 
   pdp11-*-*)
@@ -1184,45 +1184,45 @@ case "${targ}" in
     ;;
 
   pj-*-*)
-    targ_defvec=bfd_elf32_pj_vec
-    targ_selvecs="bfd_elf32_pj_vec bfd_elf32_pjl_vec"
+    targ_defvec=pj_elf32_vec
+    targ_selvecs="pj_elf32_vec pj_elf32_le_vec"
     ;;
 
   pjl-*-*)
-    targ_defvec=bfd_elf32_pjl_vec
-    targ_selvecs="bfd_elf32_pjl_vec bfd_elf32_pj_vec bfd_elf32_i386_vec"
+    targ_defvec=pj_elf32_le_vec
+    targ_selvecs="pj_elf32_le_vec pj_elf32_vec i386_elf32_vec"
     ;;
 
   powerpc-*-aix5.[01] | rs6000-*-aix5.[01])
-    targ_defvec=rs6000coff_vec
-    targ_selvecs="aix5coff64_vec"
+    targ_defvec=rs6000_xcoff_vec
+    targ_selvecs="rs6000_xcoff64_aix_vec"
     want64=true
     ;;
 #ifdef BFD64
   powerpc64-*-aix5.[01] | rs6000-*-aix5.[01])
-    targ_defvec=aix5coff64_vec
-    targ_selvecs="rs6000coff_vec"
+    targ_defvec=rs6000_xcoff64_aix_vec
+    targ_selvecs="rs6000_xcoff_vec"
     want64=true
     ;;
 #endif
   powerpc-*-aix[5-9]* | rs6000-*-aix[5-9]*)
     targ_cflags=-DAIX_WEAK_SUPPORT
-    targ_defvec=rs6000coff_vec
-    targ_selvecs="aix5coff64_vec"
+    targ_defvec=rs6000_xcoff_vec
+    targ_selvecs="rs6000_xcoff64_aix_vec"
     want64=true
     ;;
 #ifdef BFD64
   powerpc64-*-aix[5-9]* | rs6000-*-aix[5-9]*)
     targ_cflags=-DAIX_WEAK_SUPPORT
-    targ_defvec=aix5coff64_vec
-    targ_selvecs="rs6000coff_vec"
+    targ_defvec=rs6000_xcoff64_aix_vec
+    targ_selvecs="rs6000_xcoff_vec"
     want64=true
     ;;
 #endif
 
   powerpc-*-aix* | powerpc-*-beos* | rs6000-*-*)
-    targ_defvec=rs6000coff_vec
-    targ64_selvecs=rs6000coff64_vec
+    targ_defvec=rs6000_xcoff_vec
+    targ64_selvecs=rs6000_xcoff64_vec
     case "${targ}" in
 	*-*-aix4.[3456789]* | *-*-aix[56789]*)
 	want64=true;;
@@ -1232,44 +1232,44 @@ case "${targ}" in
     ;;
 #ifdef BFD64
   powerpc64-*-aix*)
-    targ_defvec=rs6000coff64_vec
-    targ_selvecs=rs6000coff_vec
+    targ_defvec=rs6000_xcoff64_vec
+    targ_selvecs=rs6000_xcoff_vec
     want64=true
     ;;
   powerpc64-*-freebsd*)
-    targ_defvec=bfd_elf64_powerpc_freebsd_vec
-    targ_selvecs="bfd_elf64_powerpc_vec bfd_elf32_powerpc_vec bfd_elf32_powerpc_freebsd_vec bfd_elf32_powerpcle_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec"
+    targ_defvec=powerpc_elf64_fbsd_vec
+    targ_selvecs="powerpc_elf64_vec powerpc_elf32_vec powerpc_elf32_fbsd_vec powerpc_elf32_le_vec rs6000_xcoff_vec rs6000_xcoff64_vec rs6000_xcoff64_aix_vec"
     want64=true
     ;;
   powerpc64-*-elf* | powerpc-*-elf64* | powerpc64-*-linux* | \
   powerpc64-*-*bsd*)
-    targ_defvec=bfd_elf64_powerpc_vec
-    targ_selvecs="bfd_elf64_powerpcle_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec"
+    targ_defvec=powerpc_elf64_vec
+    targ_selvecs="powerpc_elf64_le_vec powerpc_elf32_vec powerpc_elf32_le_vec rs6000_xcoff_vec rs6000_xcoff64_vec rs6000_xcoff64_aix_vec"
     want64=true
     ;;
   powerpc64le-*-elf* | powerpcle-*-elf64* | powerpc64le-*-linux* | \
   powerpc64le-*-*bsd*)
-    targ_defvec=bfd_elf64_powerpcle_vec
-    targ_selvecs="bfd_elf64_powerpc_vec bfd_elf32_powerpcle_vec bfd_elf32_powerpc_vec rs6000coff_vec rs6000coff64_vec aix5coff64_vec"
+    targ_defvec=powerpc_elf64_le_vec
+    targ_selvecs="powerpc_elf64_vec powerpc_elf32_le_vec powerpc_elf32_vec rs6000_xcoff_vec rs6000_xcoff64_vec rs6000_xcoff64_aix_vec"
     want64=true
     ;;
 #endif
   powerpc-*-*freebsd*)
-    targ_defvec=bfd_elf32_powerpc_freebsd_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec bfd_elf64_powerpc_freebsd_vec"
+    targ_defvec=powerpc_elf32_fbsd_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"
+    targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec powerpc_elf64_fbsd_vec"
     ;;
   powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
   powerpc-*-solaris2* | powerpc-*-linux-* | powerpc-*-rtems* | \
   powerpc-*-chorus*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    targ_defvec=powerpc_elf32_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_le_vec powerpc_boot_vec"
+    targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
     ;;
   powerpc-*-kaos*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="bfd_elf32_powerpcle_vec ppcboot_vec"
-    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    targ_defvec=powerpc_elf32_vec
+    targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec"
+    targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
     ;;
   powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*)
     targ_defvec=mach_o_be_vec
@@ -1277,415 +1277,415 @@ case "${targ}" in
     targ_archs="$targ_archs bfd_i386_arch"
     ;;
   powerpc-*-macos*)
-    targ_defvec=pmac_xcoff_vec
+    targ_defvec=powerpc_xcoff_vec
     ;;
   powerpc-*-lynxos*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="rs6000coff_vec"
+    targ_defvec=powerpc_elf32_vec
+    targ_selvecs="rs6000_xcoff_vec"
     targ_cflags=-DSMALL_ARCHIVE
     ;;
   powerpc-*-netware*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="nlm32_powerpc_vec rs6000coff_vec"
+    targ_defvec=powerpc_elf32_vec
+    targ_selvecs="powerpc_nlm32_vec rs6000_xcoff_vec"
     ;;
   powerpc-*-nto*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
+    targ_defvec=powerpc_elf32_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_le_vec powerpc_boot_vec"
     ;;
   powerpc-*-vxworks* | powerpc-*-windiss*)
-    targ_defvec=bfd_elf32_powerpc_vxworks_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    targ_defvec=powerpc_elf32_vxworks_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"
+    targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
     ;;
   powerpcle-*-nto*)
-    targ_defvec=bfd_elf32_powerpcle_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
+    targ_defvec=powerpc_elf32_le_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_boot_vec"
     ;;
   powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
   powerpcle-*-solaris2* | powerpcle-*-linux-* | powerpcle-*-vxworks*)
-    targ_defvec=bfd_elf32_powerpcle_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-    targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
+    targ_defvec=powerpc_elf32_le_vec
+    targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_boot_vec"
+    targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
     ;;
   powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin*)
-    targ_defvec=bfd_powerpcle_pe_vec
-    targ_selvecs="bfd_powerpcle_pei_vec bfd_powerpc_pei_vec bfd_powerpcle_pe_vec bfd_powerpc_pe_vec"
+    targ_defvec=powerpc_pe_le_vec
+    targ_selvecs="powerpc_pei_le_vec powerpc_pei_vec powerpc_pe_le_vec powerpc_pe_vec"
     ;;
 
   rl78-*-elf)
-    targ_defvec=bfd_elf32_rl78_vec
+    targ_defvec=rl78_elf32_vec
     ;;
 
   rx-*-elf)
-    targ_defvec=bfd_elf32_rx_le_vec
-    targ_selvecs="bfd_elf32_rx_be_vec bfd_elf32_rx_le_vec bfd_elf32_rx_be_ns_vec"
+    targ_defvec=rx_elf32_le_vec
+    targ_selvecs="rx_elf32_be_vec rx_elf32_le_vec rx_elf32_be_ns_vec"
     ;;
 
   s390-*-linux*)
-    targ_defvec=bfd_elf32_s390_vec
-    targ64_selvecs=bfd_elf64_s390_vec
+    targ_defvec=s390_elf32_vec
+    targ64_selvecs=s390_elf64_vec
     want64=true
     ;;
 #ifdef BFD64
   s390x-*-linux*)
-    targ_defvec=bfd_elf64_s390_vec
-    targ_selvecs=bfd_elf32_s390_vec
+    targ_defvec=s390_elf64_vec
+    targ_selvecs=s390_elf32_vec
     want64=true
     ;;
   s390x-*-tpf*)
-    targ_defvec=bfd_elf64_s390_vec
+    targ_defvec=s390_elf64_vec
     want64=true
     ;;
 
   score*-*-elf*)
-    targ_defvec=bfd_elf32_bigscore_vec
-    targ_selvecs=bfd_elf32_littlescore_vec
+    targ_defvec=score_elf32_be_vec
+    targ_selvecs=score_elf32_le_vec
     ;;
 
   sh64l*-*-elf*)
-    targ_defvec=bfd_elf32_sh64l_vec
-    targ_selvecs="bfd_elf32_sh64_vec bfd_elf64_sh64l_vec bfd_elf64_sh64_vec bfd_elf32_shl_vec bfd_elf32_sh_vec"
+    targ_defvec=sh64_elf32_le_vec
+    targ_selvecs="sh64_elf32_vec sh64_elf64_le_vec sh64_elf64_vec sh_elf32_le_vec sh_elf32_vec"
     targ_underscore=yes
     want64=true
     ;;
   sh64-*-elf*)
-    targ_defvec=bfd_elf32_sh64_vec
-    targ_selvecs="bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec bfd_elf32_sh_vec bfd_elf32_shl_vec"
+    targ_defvec=sh64_elf32_vec
+    targ_selvecs="sh64_elf32_le_vec sh64_elf64_vec sh64_elf64_le_vec sh_elf32_vec sh_elf32_le_vec"
     targ_underscore=yes
     want64=true
     ;;
   sh64eb-*-linux*)
-    targ_defvec=bfd_elf32_sh64blin_vec
-    targ_selvecs="bfd_elf32_sh64lin_vec bfd_elf64_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf32_shblin_vec bfd_elf32_shlin_vec"
+    targ_defvec=sh64_elf32_linux_be_vec
+    targ_selvecs="sh64_elf32_linux_vec sh64_elf64_linux_be_vec sh64_elf64_linux_vec sh_elf32_linux_be_vec sh_elf32_linux_vec"
     want64=true
     ;;
   sh64-*-linux*)
-    targ_defvec=bfd_elf32_sh64lin_vec
-    targ_selvecs="bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec bfd_elf32_shlin_vec bfd_elf32_shblin_vec"
+    targ_defvec=sh64_elf32_linux_vec
+    targ_selvecs="sh64_elf32_linux_be_vec sh64_elf64_linux_vec sh64_elf64_linux_be_vec sh_elf32_linux_vec sh_elf32_linux_be_vec"
     want64=true
     ;;
   sh-*-linux*)
-    targ_defvec=bfd_elf32_shblin_vec
-    targ_selvecs="bfd_elf32_shlin_vec bfd_elf32_sh64lin_vec bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec"
+    targ_defvec=sh_elf32_linux_be_vec
+    targ_selvecs="sh_elf32_linux_vec sh64_elf32_linux_vec sh64_elf32_linux_be_vec sh64_elf64_linux_vec sh64_elf64_linux_be_vec"
     want64=true
     ;;
 #endif /* BFD64 */
 
   sh*eb-*-linux*)
-    targ_defvec=bfd_elf32_shblin_vec
-    targ_selvecs=bfd_elf32_shlin_vec
+    targ_defvec=sh_elf32_linux_be_vec
+    targ_selvecs=sh_elf32_linux_vec
     ;;
   sh*-*-linux*)
-    targ_defvec=bfd_elf32_shlin_vec
-    targ_selvecs=bfd_elf32_shblin_vec
+    targ_defvec=sh_elf32_linux_vec
+    targ_selvecs=sh_elf32_linux_be_vec
     ;;
 
   sh-*-uclinux* | sh[12]-*-uclinux*)
-    targ_defvec=bfd_elf32_sh_vec
-    targ_selvecs="bfd_elf32_shl_vec bfd_elf32_shblin_vec bfd_elf32_shlin_vec bfd_elf32_shfd_vec bfd_elf32_shbfd_vec"
+    targ_defvec=sh_elf32_vec
+    targ_selvecs="sh_elf32_le_vec sh_elf32_linux_be_vec sh_elf32_linux_vec sh_elf32_fdpic_le_vec sh_elf32_fdpic_be_vec"
 #ifdef BFD64
-    targ_selvecs="${targ_selvecs} bfd_elf32_sh64lin_vec bfd_elf32_sh64blin_vec bfd_elf64_sh64lin_vec bfd_elf64_sh64blin_vec"
+    targ_selvecs="${targ_selvecs} sh64_elf32_linux_vec sh64_elf32_linux_be_vec sh64_elf64_linux_vec sh64_elf64_linux_be_vec"
 #endif
     ;;
 
 #ifdef BFD64
   sh5le-*-netbsd*)
-    targ_defvec=bfd_elf32_sh64lnbsd_vec
-    targ_selvecs="bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    targ_defvec=sh64_elf32_nbsd_le_vec
+    targ_selvecs="sh64_elf32_nbsd_vec sh64_elf64_nbsd_le_vec sh64_elf64_nbsd_vec sh_elf32_nbsd_vec sh_elf32_nbsd_le_vec"
     want64=true
     ;;
   sh5-*-netbsd*)
-    targ_defvec=bfd_elf32_sh64nbsd_vec
-    targ_selvecs="bfd_elf32_sh64lnbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    targ_defvec=sh64_elf32_nbsd_vec
+    targ_selvecs="sh64_elf32_nbsd_le_vec sh64_elf64_nbsd_le_vec sh64_elf64_nbsd_vec sh_elf32_nbsd_vec sh_elf32_nbsd_le_vec"
     want64=true
     ;;
 
   sh64le-*-netbsd*)
-    targ_defvec=bfd_elf64_sh64lnbsd_vec
-    targ_selvecs="bfd_elf64_sh64nbsd_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    targ_defvec=sh64_elf64_nbsd_le_vec
+    targ_selvecs="sh64_elf64_nbsd_vec sh64_elf32_nbsd_le_vec sh64_elf32_nbsd_vec sh_elf32_nbsd_vec sh_elf32_nbsd_le_vec"
     want64=true
     ;;
   sh64-*-netbsd*)
-    targ_defvec=bfd_elf64_sh64nbsd_vec
-    targ_selvecs="bfd_elf64_sh64lnbsd_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf32_shnbsd_vec bfd_elf32_shlnbsd_vec"
+    targ_defvec=sh64_elf64_nbsd_vec
+    targ_selvecs="sh64_elf64_nbsd_le_vec sh64_elf32_nbsd_le_vec sh64_elf32_nbsd_vec sh_elf32_nbsd_vec sh_elf32_nbsd_le_vec"
     want64=true
     ;;
 
   sh*l*-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shlnbsd_vec
-    targ_selvecs="bfd_elf32_shnbsd_vec shcoff_vec shlcoff_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
+    targ_defvec=sh_elf32_nbsd_le_vec
+    targ_selvecs="sh_elf32_nbsd_vec sh_coff_vec sh_coff_le_vec sh64_elf32_nbsd_le_vec sh64_elf32_nbsd_vec sh64_elf64_nbsd_le_vec sh64_elf64_nbsd_vec"
     want64=true
     ;;
   sh-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shnbsd_vec
-    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec bfd_elf32_sh64lnbsd_vec bfd_elf32_sh64nbsd_vec bfd_elf64_sh64lnbsd_vec bfd_elf64_sh64nbsd_vec"
+    targ_defvec=sh_elf32_nbsd_vec
+    targ_selvecs="sh_elf32_nbsd_le_vec sh_coff_vec sh_coff_le_vec sh64_elf32_nbsd_le_vec sh64_elf32_nbsd_vec sh64_elf64_nbsd_le_vec sh64_elf64_nbsd_vec"
     want64=true
     ;;
 #endif
 
   sh*-*-netbsdelf*)
-    targ_defvec=bfd_elf32_shnbsd_vec
-    targ_selvecs="bfd_elf32_shlnbsd_vec shcoff_vec shlcoff_vec"
+    targ_defvec=sh_elf32_nbsd_vec
+    targ_selvecs="sh_elf32_nbsd_le_vec sh_coff_vec sh_coff_le_vec"
     ;;
   sh*-*-symbianelf*)
-    targ_defvec=bfd_elf32_shl_symbian_vec
-    targ_selvecs="shlcoff_vec shlcoff_small_vec"
+    targ_defvec=sh_elf32_symbian_le_vec
+    targ_selvecs="sh_coff_le_vec sh_coff_small_le_vec"
     targ_underscore=yes
     ;;
 
 #ifdef BFD64
   shl*-*-elf* | sh[1234]l*-*-elf* | sh3el*-*-elf* | shl*-*-kaos*)
-    targ_defvec=bfd_elf32_shl_vec
-    targ_selvecs="bfd_elf32_sh_vec shlcoff_vec shcoff_vec shlcoff_small_vec shcoff_small_vec bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
+    targ_defvec=sh_elf32_le_vec
+    targ_selvecs="sh_elf32_vec sh_coff_le_vec sh_coff_vec sh_coff_small_le_vec sh_coff_small_vec sh64_elf32_vec sh64_elf32_le_vec sh64_elf64_vec sh64_elf64_le_vec"
     targ_underscore=yes
     want64=true
     ;;
 #endif
 
   sh-*-rtemscoff*)
-    targ_defvec=shcoff_vec
-    targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_defvec=sh_coff_vec
+    targ_selvecs="sh_coff_vec sh_coff_le_vec sh_coff_small_vec sh_coff_small_le_vec"
     targ_underscore=yes
     ;;
 
 #ifdef BFD64
   sh-*-elf* | sh[1234]*-elf* | sh-*-rtems* | sh-*-kaos*)
-    targ_defvec=bfd_elf32_sh_vec
-    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec bfd_elf32_sh64_vec bfd_elf32_sh64l_vec bfd_elf64_sh64_vec bfd_elf64_sh64l_vec"
+    targ_defvec=sh_elf32_vec
+    targ_selvecs="sh_elf32_le_vec sh_coff_vec sh_coff_le_vec sh_coff_small_vec sh_coff_small_le_vec sh64_elf32_vec sh64_elf32_le_vec sh64_elf64_vec sh64_elf64_le_vec"
     targ_underscore=yes
     want64=true
     ;;
 #endif
 
   sh-*-nto*)
-    targ_defvec=bfd_elf32_sh_vec
-    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_defvec=sh_elf32_vec
+    targ_selvecs="sh_elf32_le_vec sh_coff_vec sh_coff_le_vec sh_coff_small_vec sh_coff_small_le_vec"
     targ_underscore=yes
     ;;
   sh*-*-openbsd*)
-    targ_defvec=bfd_elf32_shlnbsd_vec
-    targ_selvecs="bfd_elf32_shnbsd_vec shcoff_vec shlcoff_vec"
+    targ_defvec=sh_elf32_nbsd_le_vec
+    targ_selvecs="sh_elf32_nbsd_vec sh_coff_vec sh_coff_le_vec"
     ;;
   sh-*-pe)
-    targ_defvec=shlpe_vec
-    targ_selvecs="shlpe_vec shlpei_vec"
+    targ_defvec=sh_pe_le_vec
+    targ_selvecs="sh_pe_le_vec sh_pei_le_vec"
     targ_underscore=yes
     ;;
   sh-*-vxworks)
-    targ_defvec=bfd_elf32_shvxworks_vec
-    targ_selvecs="bfd_elf32_shlvxworks_vec"
+    targ_defvec=sh_elf32_vxworks_vec
+    targ_selvecs="sh_elf32_vxworks_le_vec"
     # FIXME None of the following are actually used on this target, but
     # they're necessary for coff-sh.c (which is unconditionally used) to be
     # compiled correctly.
-    targ_selvecs="$targ_selvecs shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_selvecs="$targ_selvecs sh_coff_vec sh_coff_le_vec sh_coff_small_vec sh_coff_small_le_vec"
     targ_underscore=yes
     ;;
   sh-*-*)
-    targ_defvec=shcoff_vec
-    targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
+    targ_defvec=sh_coff_vec
+    targ_selvecs="sh_coff_vec sh_coff_le_vec sh_coff_small_vec sh_coff_small_le_vec"
     targ_underscore=yes
     ;;
 
   sparclet-*-aout*)
-    targ_defvec=sunos_big_vec
-    targ_selvecs=sparcle_aout_vec
+    targ_defvec=sparc_aout_sunos_be_vec
+    targ_selvecs=sparc_aout_le_vec
     targ_underscore=yes
     ;;
   sparc86x-*-aout*)
-    targ_defvec=sunos_big_vec
+    targ_defvec=sparc_aout_sunos_be_vec
     targ_underscore=yes
     ;;
   sparclite-*-elf* | sparc86x-*-elf*)
-    targ_defvec=bfd_elf32_sparc_vec
+    targ_defvec=sparc_elf32_vec
     ;;
   sparc*-*-chorus*)
-    targ_defvec=bfd_elf32_sparc_vec
+    targ_defvec=sparc_elf32_vec
     ;;
   sparc-*-linux*aout*)
-    targ_defvec=sparclinux_vec
-    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+    targ_defvec=sparc_aout_linux_vec
+    targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
     targ_underscore=yes
     ;;
   sparc-*-linux-* | sparcv*-*-linux-*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
+    targ_defvec=sparc_elf32_vec
+    targ_selvecs="sparc_aout_linux_vec sparc_elf64_vec sparc_aout_sunos_be_vec"
     ;;
   sparc-*-netbsdelf*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs=sparcnetbsd_vec
+    targ_defvec=sparc_elf32_vec
+    targ_selvecs=sparc_aout_nbsd_vec
     ;;
   sparc-*-netbsdaout* | sparc-*-netbsd*)
-    targ_defvec=sparcnetbsd_vec
-    targ_selvecs=bfd_elf32_sparc_vec
+    targ_defvec=sparc_aout_nbsd_vec
+    targ_selvecs=sparc_elf32_vec
     targ_underscore=yes
     ;;
   sparc-*-openbsd[0-2].* | sparc-*-openbsd3.[0-1])
-    targ_defvec=sparcnetbsd_vec
+    targ_defvec=sparc_aout_nbsd_vec
     targ_underscore=yes
     ;;
   sparc-*-openbsd*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs=sparcnetbsd_vec
+    targ_defvec=sparc_elf32_vec
+    targ_selvecs=sparc_aout_nbsd_vec
     ;;
   sparc-*-elf*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs=sunos_big_vec
+    targ_defvec=sparc_elf32_vec
+    targ_selvecs=sparc_aout_sunos_be_vec
     ;;
   sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
-    targ_defvec=bfd_elf32_sparc_sol2_vec
-    targ_selvecs=sunos_big_vec
+    targ_defvec=sparc_elf32_sol2_vec
+    targ_selvecs=sparc_aout_sunos_be_vec
     ;;
 #ifdef BFD64
   sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
-    targ_defvec=bfd_elf32_sparc_sol2_vec
-    targ_selvecs="bfd_elf64_sparc_sol2_vec sunos_big_vec"
+    targ_defvec=sparc_elf32_sol2_vec
+    targ_selvecs="sparc_elf64_sol2_vec sparc_aout_sunos_be_vec"
     want64=true
     ;;
 #endif
   sparc-*-sysv4*)
-    targ_defvec=bfd_elf32_sparc_vec
+    targ_defvec=sparc_elf32_vec
     ;;
   sparc-*-vxworks*)
-    targ_defvec=bfd_elf32_sparc_vxworks_vec
-    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
+    targ_defvec=sparc_elf32_vxworks_vec
+    targ_selvecs="sparc_elf32_vec sparc_aout_sunos_be_vec"
     ;;
   sparc-*-netware*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs="nlm32_sparc_vec sunos_big_vec"
+    targ_defvec=sparc_elf32_vec
+    targ_selvecs="sparc_nlm32_vec sparc_aout_sunos_be_vec"
     ;;
 #ifdef BFD64
   sparc64-*-aout*)
-    targ_defvec=sunos_big_vec
+    targ_defvec=sparc_aout_sunos_be_vec
     targ_underscore=yes
     want64=true
     ;;
   sparc64*-*-linux-*)
-    targ_defvec=bfd_elf64_sparc_vec
-    targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
+    targ_defvec=sparc_elf64_vec
+    targ_selvecs="sparc_elf32_vec sparc_aout_linux_vec sparc_aout_sunos_be_vec"
     want64=true
     ;;
   sparc64-*-elf* | sparc64-*-rtems* )
-    targ_defvec=bfd_elf64_sparc_vec
-    targ_selvecs=bfd_elf32_sparc_vec
+    targ_defvec=sparc_elf64_vec
+    targ_selvecs=sparc_elf32_vec
     want64=true
     ;;
 #endif /* BFD64 */
   sparc*-*-coff*)
-    targ_defvec=sparccoff_vec
+    targ_defvec=sparc_coff_vec
     ;;
   sparc-*-rtems*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs="sunos_big_vec sparccoff_vec"
+    targ_defvec=sparc_elf32_vec
+    targ_selvecs="sparc_aout_sunos_be_vec sparc_coff_vec"
     ;;
   sparc*-*-*)
-    targ_defvec=sunos_big_vec
+    targ_defvec=sparc_aout_sunos_be_vec
     targ_underscore=yes
     ;;
 
   spu-*-elf)
-    targ_defvec=bfd_elf32_spu_vec
+    targ_defvec=spu_elf32_vec
     want64=true
     ;;
 
-#if HAVE_host_aout_vec
+#if HAVE_aout_vec
   tahoe-*-*)
-    targ_defvec=host_aout_vec
+    targ_defvec=aout_vec
     targ_underscore=yes
     ;;
 #endif
 
   tic6x-*-elf)
-    targ_defvec=bfd_elf32_tic6x_elf_le_vec
-    targ_selvecs="bfd_elf32_tic6x_elf_be_vec bfd_elf32_tic6x_le_vec bfd_elf32_tic6x_be_vec"
+    targ_defvec=tic6x_elf32_c6000_le_vec
+    targ_selvecs="tic6x_elf32_c6000_be_vec tic6x_elf32_le_vec tic6x_elf32_be_vec"
     ;;
 
   tic6x-*-uclinux)
-    targ_defvec=bfd_elf32_tic6x_linux_le_vec
-    targ_selvecs="bfd_elf32_tic6x_linux_be_vec bfd_elf32_tic6x_le_vec bfd_elf32_tic6x_be_vec"
+    targ_defvec=tic6x_elf32_linux_le_vec
+    targ_selvecs="tic6x_elf32_linux_be_vec tic6x_elf32_le_vec tic6x_elf32_be_vec"
     ;;
 
   tic80*-*-*)
-    targ_defvec=tic80coff_vec
+    targ_defvec=tic80_coff_vec
     targ_underscore=yes
     ;;
 
 #ifdef BFD64
   tilegx-*-*)
-    targ_defvec=bfd_elf64_tilegx_le_vec
-    targ_selvecs="bfd_elf64_tilegx_be_vec bfd_elf32_tilegx_be_vec bfd_elf32_tilegx_le_vec"
+    targ_defvec=tilegx_elf64_le_vec
+    targ_selvecs="tilegx_elf64_be_vec tilegx_elf32_be_vec tilegx_elf32_le_vec"
     ;;
   tilegxbe-*-*)
-    targ_defvec=bfd_elf64_tilegx_be_vec
-    targ_selvecs="bfd_elf64_tilegx_le_vec bfd_elf32_tilegx_be_vec bfd_elf32_tilegx_le_vec"
+    targ_defvec=tilegx_elf64_be_vec
+    targ_selvecs="tilegx_elf64_le_vec tilegx_elf32_be_vec tilegx_elf32_le_vec"
     ;;
 #endif
 
   tilepro-*-*)
-    targ_defvec=bfd_elf32_tilepro_vec
+    targ_defvec=tilepro_elf32_vec
     ;;
 
   v850*-*-*)
-    targ_defvec=bfd_elf32_v850_vec
-    targ_selvecs="bfd_elf32_v850_rh850_vec"
+    targ_defvec=v850_elf32_vec
+    targ_selvecs="v800_elf32_vec"
     ;;
 
   vax-*-netbsdelf*)
-    targ_defvec=bfd_elf32_vax_vec
-    targ_selvecs="vaxnetbsd_vec vax1knetbsd_vec"
+    targ_defvec=vax_elf32_vec
+    targ_selvecs="vax_aout_nbsd_vec vax_aout_1knbsd_vec"
     ;;
 
   vax-*-netbsdaout* | vax-*-netbsd*)
-    targ_defvec=vaxnetbsd_vec
-    targ_selvecs="bfd_elf32_vax_vec vax1knetbsd_vec"
+    targ_defvec=vax_aout_nbsd_vec
+    targ_selvecs="vax_elf32_vec vax_aout_1knbsd_vec"
     targ_underscore=yes
     ;;
 
   vax-*-bsd* | vax-*-ultrix*)
-    targ_defvec=vaxbsd_vec
+    targ_defvec=vax_aout_bsd_vec
     targ_underscore=yes
     ;;
 
   vax-*-openbsd*)
-    targ_defvec=vaxnetbsd_vec
+    targ_defvec=vax_aout_nbsd_vec
     targ_underscore=yes
     ;;
 
   vax-*-linux-*)
-    targ_defvec=bfd_elf32_vax_vec
+    targ_defvec=vax_elf32_vec
     ;;
 
   we32k-*-*)
-    targ_defvec=we32kcoff_vec
+    targ_defvec=we32k_coff_vec
     ;;
 
   w65-*-*)
-    targ_defvec=w65_vec
+    targ_defvec=w65_coff_vec
     ;;
     
   xgate-*-*)
-    targ_defvec=bfd_elf32_xgate_vec
-    targ_selvecs="bfd_elf32_xgate_vec"
+    targ_defvec=xgate_elf32_vec
+    targ_selvecs="xgate_elf32_vec"
     ;;
  	
   xstormy16-*-elf)
-    targ_defvec=bfd_elf32_xstormy16_vec
+    targ_defvec=xstormy16_elf32_vec
     ;;
 
   xtensa*-*-*)
-    targ_defvec=bfd_elf32_xtensa_le_vec
-    targ_selvecs=bfd_elf32_xtensa_be_vec
+    targ_defvec=xtensa_elf32_le_vec
+    targ_selvecs=xtensa_elf32_be_vec
     ;;
  xc16x-*-elf)
-    targ_defvec=bfd_elf32_xc16x_vec
+    targ_defvec=xc16x_elf32_vec
     ;;
 
   z80-*-*)
-    targ_defvec=z80coff_vec
+    targ_defvec=z80_coff_vec
     targ_underscore=no
     ;;
 
   z8k*-*-*)
-    targ_defvec=z8kcoff_vec
+    targ_defvec=z8k_coff_vec
     targ_underscore=yes
     ;;
 
@@ -1694,17 +1694,17 @@ case "${targ}" in
     ;;
 
   *-adobe-*)
-    targ_defvec=a_out_adobe_vec
+    targ_defvec=aout_adobe_vec
     targ_underscore=yes
     ;;
 
   *-sony-*)
-    targ_defvec=newsos3_vec
+    targ_defvec=m68k_aout_newsos3_vec
     targ_underscore=yes
     ;;
 
   *-tandem-*)
-    targ_defvec=m68kcoff_vec
+    targ_defvec=m68k_coff_vec
     targ_selvecs=ieee_vec
     ;;
 # END OF targmatch.h
@@ -1717,7 +1717,7 @@ esac
 
 # All MIPS ELF targets need a 64-bit bfd_vma.
 case "${targ_defvec} ${targ_selvecs}" in
-  *elf*mips*)
+  *mips_elf*)
     want64=true
     ;;
 esac
@@ -1733,24 +1733,24 @@ esac
 # to be used on an arbitrary ELF file for anything other than
 # relocation information.
 case "${targ_defvec} ${targ_selvecs}" in
-  *bfd_elf64* | *bfd_elf32_n*mips*)
-    targ_selvecs="${targ_selvecs} bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec"
+  *elf64* | *mips_elf32_n*)
+    targ_selvecs="${targ_selvecs} elf64_le_vec elf64_be_vec elf32_le_vec elf32_be_vec"
     ;;
-  *bfd_elf32*)
-    targ_selvecs="${targ_selvecs} bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec"
+  *elf32*)
+    targ_selvecs="${targ_selvecs} elf32_le_vec elf32_be_vec"
     ;;
 esac
 
 # If we support Intel L1OM target, then add support for bfd_l1om_arch.
 case "${targ_defvec} ${targ_selvecs}" in
-  *bfd_elf64_l1om_vec*)
+  *l1om_elf64*)
     targ_archs="$targ_archs bfd_l1om_arch"
     ;;
 esac
 
 # If we support Intel K1OM target, then add support for bfd_k1om_arch.
 case "${targ_defvec} ${targ_selvecs}" in
-  *bfd_elf64_k1om_vec*)
+  *k1om_elf64*)
     targ_archs="$targ_archs bfd_k1om_arch"
     ;;
 esac
diff --git a/bfd/configure b/bfd/configure
index 4227332..c260e55 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14024,7 +14024,7 @@ if test "${target}" = "${host}"; then
 	COREFILE=netbsd-core.lo
 	;;
   rs6000-*-lynx*)
-  	COREFILE=lynx-core.lo
+	COREFILE=lynx-core.lo
 	;;
   rs6000-*-aix[5-9].* | powerpc-*-aix[5-9].*)
         COREFILE=rs6000-core.lo
@@ -14081,7 +14081,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	TRAD_HEADER='"hosts/tahoe.h"'
 	;;
   vax-*-netbsd* | vax-*-openbsd*)
-  	COREFILE=netbsd-core.lo
+	COREFILE=netbsd-core.lo
 	;;
   vax-*-ultrix2*)
 	COREFILE=trad-core.lo
@@ -15212,353 +15212,347 @@ do
     # This list is alphabetized to make it easy to compare
     # with the two vector lists in targets.c.  For the same reason,
     # use one entry per line, even though this leads to long lines.
-    a_out_adobe_vec)		tb="$tb aout-adobe.lo aout32.lo" ;;
-    aix5coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
-    aout0_big_vec)		tb="$tb aout0.lo aout32.lo" ;;
-    aout_arm_big_vec)		tb="$tb aout-arm.lo aout32.lo" ;;
-    aout_arm_little_vec)	tb="$tb aout-arm.lo aout32.lo" ;;
-    apollocoff_vec)		tb="$tb coff-apollo.lo" ;;
-    arm_epoc_pe_big_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_epoc_pe_little_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_epoc_pei_big_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
-    arm_epoc_pei_little_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pe_big_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pe_little_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pei_big_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pei_little_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
-    armcoff_big_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armcoff_little_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armnetbsd_vec)		tb="$tb armnetbsd.lo aout32.lo" ;;
-    armpe_big_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
-    armpe_little_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
-    armpei_big_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
-    armpei_little_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
-    b_out_vec_big_host)		tb="$tb bout.lo aout32.lo" ;;
-    b_out_vec_little_host)	tb="$tb bout.lo aout32.lo" ;;
-    bfd_pei_ia64_vec)		tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
-    bfd_elf32_am33lin_vec)	tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
-    bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
-    bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
-    bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
-    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_nacl_vec)	tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_bigmips_vxworks_vec)
-			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_bigmoxie_vec)	tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
-    bfd_elf32_bignios2_vec)	tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
-    bfd_elf32_cr16_vec)		tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
-    bfd_elf32_cr16c_vec)	tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
-    bfd_elf32_cris_vec)		tb="$tb elf32-cris.lo elf32.lo $elf" ;;
-    bfd_elf32_crx_vec)          tb="$tb elf32-crx.lo elf32.lo $elf" ;;
-    bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
-    bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
-    bfd_elf32_dlx_big_vec)	tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
-    bfd_elf32_epiphany_vec)	tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
-    bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
-    bfd_elf32_frv_vec)		tb="$tb elf32-frv.lo elf32.lo $elf" ;;
-    bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
-    bfd_elf32_h8300_vec)	tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_linux_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_nbsd_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_sol2_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_nacl_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_vxworks_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i860_little_vec)	tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-    bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-    bfd_elf32_i960_vec)		tb="$tb elf32-i960.lo elf32.lo $elf" ;;
-    bfd_elf32_ia64_big_vec)	tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
-    bfd_elf32_ia64_hpux_big_vec) tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf";;
-    bfd_elf32_ip2k_vec)		tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
-    bfd_elf32_iq2000_vec)       tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
-    bfd_elf32_lm32_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
-    bfd_elf32_lm32fdpic_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
-    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_nacl_vec) tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_littlemips_vxworks_vec)
-			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_littlemoxie_vec)	tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
-    bfd_elf32_littlenios2_vec)	tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
-    bfd_elf32_m32c_vec)         tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
-    bfd_elf32_m32r_vec)		tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m32rle_vec)       tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m32rlin_vec)      tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m32rlelin_vec)    tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m68hc11_vec)	tb="$tb elf32-m68hc11.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
-    bfd_elf32_m68hc12_vec)	tb="$tb elf32-m68hc12.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
-    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
-    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_big_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mep_vec)		tb="$tb elf32-mep.lo elf32.lo $elf" ;;
-    bfd_elf32_mep_little_vec)	tb="$tb elf32-mep.lo elf32.lo $elf" ;;
-    bfd_elf32_metag_vec)	tb="$tb elf32-metag.lo elf32.lo $elf" ;;
-    bfd_elf32_microblazeel_vec)	tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
-    bfd_elf32_microblaze_vec)	tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-    bfd_elf32_mt_vec)           tb="$tb elf32-mt.lo elf32.lo $elf" ;;
-    bfd_elf32_msp430_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
-    bfd_elf32_msp430_ti_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
-    bfd_elf32_nbigmips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_nlittlemips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_ntradbigmips_vec | bfd_elf32_ntradbigmips_freebsd_vec)
-				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_ntradlittlemips_vec | bfd_elf32_ntradlittlemips_freebsd_vec)
-				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_nds32be_vec)      tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_nds32le_vec)      tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_nds32belin_vec)   tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_nds32lelin_vec)   tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_or1k_vec)		tb="$tb elf32-or1k.lo elf32.lo $elf" ;;
-    bfd_elf32_pj_vec)           tb="$tb elf32-pj.lo elf32.lo $elf";;
-    bfd_elf32_pjl_vec)          tb="$tb elf32-pj.lo elf32.lo $elf";;
-    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_freebsd_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_rl78_vec)         tb="$tb elf32-rl78.lo $elf" ;;
-    bfd_elf32_rx_le_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
-    bfd_elf32_rx_be_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
-    bfd_elf32_rx_be_ns_vec)     tb="$tb elf32-rx.lo elf32.lo $elf" ;;
-    bfd_elf32_s390_vec)		tb="$tb elf32-s390.lo elf32.lo $elf" ;;
-    bfd_elf32_bigscore_vec)     tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
-    bfd_elf32_littlescore_vec)  tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
+    aout_adobe_vec)		 tb="$tb aout-adobe.lo aout32.lo" ;;
+    rs6000_xcoff64_aix_vec)	 tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    aout0_be_vec)		 tb="$tb aout0.lo aout32.lo" ;;
+    arm_aout_be_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
+    arm_aout_le_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
+    m68k_coff_apollo_vec)	 tb="$tb coff-apollo.lo" ;;
+    arm_pe_epoc_be_vec)		 tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_epoc_le_vec)		 tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_epoc_be_vec)	 tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_epoc_le_vec)	 tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_wince_be_vec)	 tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_wince_le_vec)	 tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_wince_be_vec)	 tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_wince_le_vec)	 tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_coff_be_vec)		 tb="$tb coff-arm.lo cofflink.lo " ;;
+    arm_coff_le_vec)		 tb="$tb coff-arm.lo cofflink.lo " ;;
+    arm_aout_nbsd_vec)		 tb="$tb armnetbsd.lo aout32.lo" ;;
+    arm_pe_be_vec)		 tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_le_vec)		 tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_be_vec)		 tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_le_vec)		 tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    bout_be_vec)		 tb="$tb bout.lo aout32.lo" ;;
+    bout_le_vec)		 tb="$tb bout.lo aout32.lo" ;;
+    ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
+    am33_elf32_linux_vec)	 tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
+    avr_elf32_vec)		 tb="$tb elf32-avr.lo elf32.lo $elf" ;;
+    bfin_elf32_vec)		 tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    bfin_elf32_fdpic_vec)	 tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    elf32_be_vec)		 tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    arc_elf32_be_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_nacl_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_symbian_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    mips_elf32_be_vec)		 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_vxworks_be_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    moxie_elf32_be_vec)		 tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
+    nios2_elf32_be_vec)		 tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
+    cr16_elf32_vec)		 tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
+    cr16c_elf32_vec)		 tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
+    cris_elf32_vec)		 tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    crx_elf32_vec)		 tb="$tb elf32-crx.lo elf32.lo $elf" ;;
+    d10v_elf32_vec)		 tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
+    d30v_elf32_vec)		 tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
+    dlx_elf32_be_vec)		 tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
+    epiphany_elf32_vec)		 tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
+    fr30_elf32_vec)		 tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
+    frv_elf32_vec)		 tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    frv_elf32_fdpic_vec)	 tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    h8300_elf32_vec)		 tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
+    hppa_elf32_linux_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    hppa_elf32_nbsd_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    hppa_elf32_vec)		 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    i370_elf32_vec)		 tb="$tb elf32-i370.lo elf32.lo $elf" ;;
+    i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_vec)		 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i860_elf32_le_vec)		 tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    i860_elf32_vec)		 tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    i960_elf32_vec)		 tb="$tb elf32-i960.lo elf32.lo $elf" ;;
+    ia64_elf32_be_vec)		 tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
+    ia64_elf32_hpux_be_vec)	 tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
+    ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
+    iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
+    lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    elf32_le_vec)		 tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    arc_elf32_le_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    arm_elf32_symbian_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_nacl_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    mips_elf32_le_vec)		 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_vxworks_le_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    moxie_elf32_le_vec)		 tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
+    nios2_elf32_le_vec)		 tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
+    m32c_elf32_vec)		 tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
+    m32r_elf32_vec)		 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m32r_elf32_le_vec)		 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m32r_elf32_linux_vec)	 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m32r_elf32_linux_le_vec)	 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m68hc11_elf32_vec)		 tb="$tb elf32-m68hc11.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    m68hc12_elf32_vec)		 tb="$tb elf32-m68hc12.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    m68k_elf32_vec)		 tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
+    m88k_elf32_vec)		 tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
+    mcore_elf32_be_vec)		 tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    mcore_elf32_le_vec)		 tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    mep_elf32_vec)		 tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    mep_elf32_le_vec)		 tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    metag_elf32_vec)		 tb="$tb elf32-metag.lo elf32.lo $elf" ;;
+    microblaze_elf32_le_vec)	 tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
+    microblaze_elf32_vec)	 tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
+    mn10200_elf32_vec)		 tb="$tb elf-m10200.lo elf32.lo $elf" ;;
+    mn10300_elf32_vec)		 tb="$tb elf-m10300.lo elf32.lo $elf" ;;
+    mt_elf32_vec)		 tb="$tb elf32-mt.lo elf32.lo $elf" ;;
+    msp430_elf32_vec)		 tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
+    msp430_elf32_ti_vec)	 tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
+    mips_elf32_n_be_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_n_le_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntrad_be_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntradfbsd_be_vec) tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntrad_le_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntradfbsd_le_vec) tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    nds32_elf32_be_vec)		 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    nds32_elf32_le_vec)		 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    nds32_elf32_linux_be_vec)	 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    nds32_elf32_linux_le_vec)	 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    or1k_elf32_vec)		 tb="$tb elf32-or1k.lo elf32.lo $elf" ;;
+    pj_elf32_vec)		 tb="$tb elf32-pj.lo elf32.lo $elf" ;;
+    pj_elf32_le_vec)		 tb="$tb elf32-pj.lo elf32.lo $elf" ;;
+    powerpc_elf32_vec)		 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    powerpc_elf32_le_vec)	 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    powerpc_elf32_fbsd_vec)	 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    powerpc_elf32_vxworks_vec)	 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    rl78_elf32_vec)		 tb="$tb elf32-rl78.lo elf32.lo $elf" ;;
+    rx_elf32_le_vec)		 tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    rx_elf32_be_vec)		 tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    rx_elf32_be_ns_vec)		 tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    s390_elf32_vec)		 tb="$tb elf32-s390.lo elf32.lo $elf" ;;
+    score_elf32_be_vec)		 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64 ;;
+    score_elf32_le_vec)		 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64 ;;
     # FIXME: We include cofflink.lo not because it's needed for
-    # bfd_elf32_sh64[l]_vec, but because we include bfd_elf32_sh[l]_vec
+    # sh64_elf32[_le]_vec, but because we include sh_elf32[_le]_vec
     # which needs it but does not list it.  Should be fixed in right place.
-    bfd_elf32_sh64_vec)		tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64l_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64lin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64blin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64lnbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
-    bfd_elf32_sh64nbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
-    bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shbfd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shblin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shfd_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shl_symbian_vec)	tb="$tb elf32-sh-symbian.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shlin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shlnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shlvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_sparc_sol2_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_sparc_vxworks_vec) tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_spu_vec)		tb="$tb elf32-spu.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_be_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_le_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_linux_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_linux_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_elf_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_elf_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tilegx_be_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
-    bfd_elf32_tilegx_le_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
-    bfd_elf32_tilepro_vec)	tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
-    bfd_elf32_tradbigmips_vec | bfd_elf32_tradbigmips_freebsd_vec)
-				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_tradlittlemips_vec | bfd_elf32_tradlittlemips_freebsd_vec)
-				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_us_cris_vec)	tb="$tb elf32-cris.lo elf32.lo $elf" ;;
-    bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-    bfd_elf32_v850_rh850_vec)	tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-    bfd_elf32_vax_vec)		tb="$tb elf32-vax.lo elf32.lo $elf" ;;
-    bfd_elf32_xstormy16_vec)	tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;;
-    bfd_elf32_xc16x_vec)		tb="$tb elf32-xc16x.lo elf32.lo $elf" ;;
-    bfd_elf32_xgate_vec)  	tb="$tb elf32-xgate.lo elf32.lo $elf" ;;
-    bfd_elf32_xtensa_le_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
-    bfd_elf32_xtensa_be_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
-    bfd_elf64_alpha_freebsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_alpha_vec)	tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_bigaarch64_vec)	tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf32_bigaarch64_vec)	tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_bigmips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_hppa_linux_vec)	tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_hppa_vec)		tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_big_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_hpux_big_vec) tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_little_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64-vms.lo elf64-ia64.lo elfxx-ia64.lo elf64.lo vms-lib.lo vms-misc.lo $elf"; target_size=64 ;;
-    bfd_elf64_littleaarch64_vec)tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf32_littleaarch64_vec)tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_powerpc_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_powerpcle_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_powerpc_freebsd_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_s390_vec)		tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_sh64_vec)		tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64l_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64lin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64blin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64lnbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64nbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_sparc_freebsd_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_sparc_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_tilegx_be_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
-    bfd_elf64_tilegx_le_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
-    bfd_elf64_tradbigmips_vec | bfd_elf64_tradbigmips_freebsd_vec)
-				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_tradlittlemips_vec | bfd_elf64_tradlittlemips_freebsd_vec)
-				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_x86_64_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_sol2_vec)  tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf32_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf32_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf64_l1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_l1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_k1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_k1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_mmo_vec)		tb="$tb mmo.lo" target_size=64 ;;
-    bfd_powerpc_pe_vec)         tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
-    bfd_powerpc_pei_vec)        tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
-    bfd_powerpcle_pe_vec)       tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
-    bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
-    cris_aout_vec)		tb="$tb aout-cris.lo" ;;
-    demo_64_vec)		tb="$tb demo64.lo aout64.lo"; target_size=64 ;;
-    ecoff_big_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_biglittle_vec)	tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_little_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoffalpha_little_vec)	tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;;
-    go32coff_vec)		tb="$tb coff-go32.lo cofflink.lo" ;;
-    go32stubbedcoff_vec)	tb="$tb coff-stgo32.lo cofflink.lo" ;;
-    h8300coff_vec)		tb="$tb coff-h8300.lo reloc16.lo" ;;
-    h8500coff_vec)		tb="$tb coff-h8500.lo reloc16.lo" ;;
-    host_aout_vec)		tb="$tb host-aout.lo aout32.lo" ;;
-    hp300bsd_vec)		tb="$tb hp300bsd.lo aout32.lo" ;;
-    hp300hpux_vec)		tb="$tb hp300hpux.lo aout32.lo" ;;
-    i386aout_vec)		tb="$tb i386aout.lo aout32.lo" ;;
-    i386bsd_vec)		tb="$tb i386bsd.lo aout32.lo" ;;
-    i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
-    x86_64coff_vec)		tb="$tb coff-x86_64.lo cofflink.lo"; target_size=64 ;;
-    i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
-    i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
-    i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
-    i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
-    i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
-    i386mach3_vec)		tb="$tb i386mach3.lo aout32.lo" ;;
-    i386msdos_vec)		tb="$tb i386msdos.lo" ;;
-    i386netbsd_vec)		tb="$tb i386netbsd.lo aout32.lo" ;;
-    i386os9k_vec)		tb="$tb i386os9k.lo aout32.lo" ;;
-    i386pe_vec)			tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
-    i386pei_vec)		tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;
-    x86_64pe_vec)		tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
-    x86_64pei_vec)		tb="$tb pei-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
-    x86_64pe_bigobj_vec)	tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
-    i860coff_vec)		tb="$tb coff-i860.lo cofflink.lo" ;;
-    icoff_big_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    icoff_little_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    ieee_vec)			tb="$tb ieee.lo" ;;
-    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.lo aout32.lo" ;;
-    m68kaux_coff_vec)		tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
-    m68kcoff_vec)		tb="$tb coff-m68k.lo cofflink.lo" ;;
-    m68kcoffun_vec)		tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
-    m68klinux_vec)		tb="$tb m68klinux.lo aout32.lo" ;;
-    m68knetbsd_vec)		tb="$tb m68knetbsd.lo aout32.lo" ;;
-    m68ksysvcoff_vec)		tb="$tb coff-svm68k.lo cofflink.lo" ;;
-    m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
-    m88kmach3_vec)		tb="$tb m88kmach3.lo aout32.lo" ;;
-    m88kopenbsd_vec)		tb="$tb m88kopenbsd.lo aout32.lo" ;;
-    mach_o_be_vec)              tb="$tb mach-o.lo" ;;
-    mach_o_le_vec)              tb="$tb mach-o.lo" ;;
-    mach_o_fat_vec)             tb="$tb mach-o.lo" ;;
-    mach_o_i386_vec)            tb="$tb mach-o-i386.lo" ;;
-    mach_o_x86_64_vec)          tb="$tb mach-o-x86-64.lo" ;;
-    mcore_pe_big_vec)		tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
-    mcore_pe_little_vec)	tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
-    mcore_pei_big_vec)		tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
-    mcore_pei_little_vec)	tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
-    mipslpe_vec)		tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;;
-    mipslpei_vec)		tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;;
-    newsos3_vec)		tb="$tb newsos3.lo aout32.lo" ;;
-    nlm32_alpha_vec)		tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"; target_size=64 ;;
-    nlm32_i386_vec)		tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
-    nlm32_powerpc_vec)		tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
-    nlm32_sparc_vec)		tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
-    pc532machaout_vec)		tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
-    pc532netbsd_vec)		tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
-    pef_vec)                    tb="$tb pef.lo" ;;
-    pef_xlib_vec)               tb="$tb pef.lo" ;;
-    pdp11_aout_vec)		tb="$tb pdp11.lo" ;;
-    plugin_vec)                 tb="$tb plugin.lo" ;;
-    pmac_xcoff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
-    ppcboot_vec)		tb="$tb ppcboot.lo" ;;
-    riscix_vec)			tb="$tb aout32.lo riscix.lo" ;;
-    rs6000coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
-    rs6000coff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
-    shcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shcoff_vec)			tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlpe_vec)			tb="$tb pe-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
-    shlpei_vec)			tb="$tb pei-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
-    som_vec)			tb="$tb som.lo" ;;
-    sparccoff_vec)		tb="$tb coff-sparc.lo" ;;
-    sparcle_aout_vec)		tb="$tb aout-sparcle.lo aout32.lo" ;;
-    sparclinux_vec)		tb="$tb sparclinux.lo aout32.lo" ;;
-    sparclynx_aout_vec)		tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
-    sparclynx_coff_vec)		tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
-    sparcnetbsd_vec)		tb="$tb sparcnetbsd.lo aout32.lo" ;;
-    sunos_big_vec)		tb="$tb sunos.lo aout32.lo" ;;
-    sym_vec)                    tb="$tb xsym.lo" ;;
-    tic30_aout_vec)		tb="$tb aout-tic30.lo" ;;
-    tic30_coff_vec)		tb="$tb coff-tic30.lo" ;;
-    tic4x_coff0_vec)            tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff0_beh_vec)        tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff1_vec)            tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff1_beh_vec)        tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff2_vec)            tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff2_beh_vec)        tb="$tb coff-tic4x.lo" ;;
-    tic54x_coff0_beh_vec)	tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff0_vec)		tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff1_beh_vec)	tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff1_vec)		tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff2_beh_vec)	tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff2_vec)		tb="$tb coff-tic54x.lo" ;;
-    tic80coff_vec)		tb="$tb coff-tic80.lo cofflink.lo" ;;
-    vaxnetbsd_vec)		tb="$tb vaxnetbsd.lo aout32.lo" ;;
-    vax1knetbsd_vec)		tb="$tb vax1knetbsd.lo aout32.lo" ;;
-    vaxbsd_vec)			tb="$tb vaxbsd.lo aout32.lo" ;;
-    versados_vec)		tb="$tb versados.lo" ;;
-    vms_alpha_vec)		tb="$tb vms-alpha.lo vms-misc.lo vms-lib.lo"; target_size=64 ;;
-    vms_lib_txt_vec)		tb="$tb vms-lib.lo vms-misc.lo" ;;
-    w65_vec)			tb="$tb coff-w65.lo reloc16.lo" ;;
-    we32kcoff_vec)		tb="$tb coff-we32k.lo" ;;
-    z80coff_vec)		tb="$tb coff-z80.lo reloc16.lo" ;;
-    z8kcoff_vec)		tb="$tb coff-z8k.lo reloc16.lo cofflink.lo" ;;
+    sh64_elf32_vec)		 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_le_vec)		 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_linux_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_linux_be_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_nbsd_le_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    sh64_elf32_nbsd_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    sh_elf32_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_fdpic_be_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_linux_be_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_fdpic_le_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_le_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_symbian_le_vec)	 tb="$tb elf32-sh-symbian.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_linux_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_nbsd_le_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_vxworks_le_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_nbsd_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_vxworks_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sparc_elf32_vec)		 tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    sparc_elf32_sol2_vec)	 tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    sparc_elf32_vxworks_vec)	 tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    spu_elf32_vec)		 tb="$tb elf32-spu.lo elf32.lo $elf" ;;
+    tic6x_elf32_be_vec)		 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_le_vec)		 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_linux_be_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_linux_le_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_c6000_be_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_c6000_le_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tilegx_elf32_be_vec)	 tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    tilegx_elf32_le_vec)	 tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    tilepro_elf32_vec)		 tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
+    mips_elf32_trad_be_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_tradfbsd_be_vec)  tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_trad_le_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_tradfbsd_le_vec)  tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    cris_elf32_us_vec)		 tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    v850_elf32_vec)		 tb="$tb elf32-v850.lo elf32.lo $elf" ;;
+    v800_elf32_vec)		 tb="$tb elf32-v850.lo elf32.lo $elf" ;;
+    vax_elf32_vec)		 tb="$tb elf32-vax.lo elf32.lo $elf" ;;
+    xstormy16_elf32_vec)	 tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;;
+    xc16x_elf32_vec)		 tb="$tb elf32-xc16x.lo elf32.lo $elf" ;;
+    xgate_elf32_vec)		 tb="$tb elf32-xgate.lo elf32.lo $elf" ;;
+    xtensa_elf32_le_vec)	 tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    xtensa_elf32_be_vec)	 tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    alpha_elf64_fbsd_vec)	 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    alpha_elf64_vec)		 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    aarch64_elf64_be_vec)	 tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    aarch64_elf32_be_vec)	 tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
+    elf64_be_vec)		 tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    mips_elf64_be_vec)		 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    hppa_elf64_linux_vec)	 tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    hppa_elf64_vec)		 tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_be_vec)		 tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_hpux_be_vec)	 tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_le_vec)		 tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_vms_vec)		 tb="$tb elf64-ia64-vms.lo elf64-ia64.lo elfxx-ia64.lo elf64.lo vms-lib.lo vms-misc.lo $elf"; target_size=64 ;;
+    aarch64_elf64_le_vec)	 tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    aarch64_elf32_le_vec)	 tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
+    elf64_le_vec)		 tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    mips_elf64_le_vec)		 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mmix_elf64_vec)		 tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
+    powerpc_elf64_vec)		 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    powerpc_elf64_le_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
+    powerpc_elf64_fbsd_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
+    s390_elf64_vec)		 tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
+    sh64_elf64_vec)		 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_le_vec)		 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_linux_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_linux_be_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_nbsd_le_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_nbsd_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sparc_elf64_vec)		 tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    sparc_elf64_fbsd_vec)	 tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    sparc_elf64_sol2_vec)	 tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    tilegx_elf64_be_vec)	 tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    tilegx_elf64_le_vec)	 tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    mips_elf64_trad_be_vec)	 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf64_tradfbsd_be_vec)  tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf64_trad_le_vec)	 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf64_tradfbsd_le_vec)  tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    x86_64_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf64_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf64_sol2_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf32_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
+    x86_64_elf32_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
+    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    mmix_mmo_vec)			 tb="$tb mmo.lo" target_size=64 ;;
+    powerpc_pe_vec)		 tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    powerpc_pei_vec)		 tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    powerpc_pe_le_vec)		 tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    powerpc_pei_le_vec)		 tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    cris_aout_vec)		 tb="$tb aout-cris.lo" ;;
+    aout64_vec)			 tb="$tb demo64.lo aout64.lo"; target_size=64 ;;
+    mips_ecoff_be_vec)		 tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    mips_ecoff_bele_vec)	 tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    mips_ecoff_le_vec)		 tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    alpha_ecoff_le_vec)		 tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;;
+    i386_coff_go32_vec)		 tb="$tb coff-go32.lo cofflink.lo" ;;
+    i386_coff_go32stubbed_vec)	 tb="$tb coff-stgo32.lo cofflink.lo" ;;
+    h8300_coff_vec)		 tb="$tb coff-h8300.lo reloc16.lo" ;;
+    h8500_coff_vec)		 tb="$tb coff-h8500.lo reloc16.lo" ;;
+    aout_vec)			 tb="$tb host-aout.lo aout32.lo" ;;
+    m68k_aout_hp300bsd_vec)	 tb="$tb hp300bsd.lo aout32.lo" ;;
+    m68k_aout_hp300hpux_vec)	 tb="$tb hp300hpux.lo aout32.lo" ;;
+    i386_aout_vec)		 tb="$tb i386aout.lo aout32.lo" ;;
+    i386_aout_bsd_vec)		 tb="$tb i386bsd.lo aout32.lo" ;;
+    i386_coff_vec)		 tb="$tb coff-i386.lo cofflink.lo" ;;
+    x86_64_coff_vec)		 tb="$tb coff-x86_64.lo cofflink.lo"; target_size=64 ;;
+    i386_aout_dynix_vec)	 tb="$tb i386dynix.lo aout32.lo" ;;
+    i386_aout_fbsd_vec)		 tb="$tb i386freebsd.lo aout32.lo" ;;
+    i386_aout_linux_vec)	 tb="$tb i386linux.lo aout32.lo" ;;
+    i386_aout_lynx_vec)		 tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
+    i386_coff_lynx_vec)		 tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
+    i386_aout_mach3_vec)	 tb="$tb i386mach3.lo aout32.lo" ;;
+    i386_msdos_vec)		 tb="$tb i386msdos.lo" ;;
+    i386_aout_nbsd_vec)		 tb="$tb i386netbsd.lo aout32.lo" ;;
+    i386_aout_os9k_vec)		 tb="$tb i386os9k.lo aout32.lo" ;;
+    i386_pe_vec)		 tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
+    i386_pei_vec)		 tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;
+    x86_64_pe_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    x86_64_pei_vec)		 tb="$tb pei-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    x86_64_pe_be_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    i860_coff_vec)		 tb="$tb coff-i860.lo cofflink.lo" ;;
+    icoff_be_vec)		 tb="$tb coff-i960.lo cofflink.lo" ;;
+    icoff_le_vec)		 tb="$tb coff-i960.lo cofflink.lo" ;;
+    ieee_vec)			 tb="$tb ieee.lo" ;;
+    m68k_aout_4knbsd_vec)	 tb="$tb m68k4knetbsd.lo aout32.lo" ;;
+    m68k_coff_aux_vec)		 tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
+    m68k_coff_vec)		 tb="$tb coff-m68k.lo cofflink.lo" ;;
+    m68k_coff_un_vec)		 tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
+    m68k_aout_linux_vec)	 tb="$tb m68klinux.lo aout32.lo" ;;
+    m68k_aout_nbsd_vec)		 tb="$tb m68knetbsd.lo aout32.lo" ;;
+    m68k_coff_sysv_vec)		 tb="$tb coff-svm68k.lo cofflink.lo" ;;
+    m88k_coff_bcs_vec)		 tb="$tb coff-m88k.lo" ;;
+    m88k_aout_mach3_vec)	 tb="$tb m88kmach3.lo aout32.lo" ;;
+    m88k_aout_obsd_vec)		 tb="$tb m88kopenbsd.lo aout32.lo" ;;
+    mach_o_be_vec)		 tb="$tb mach-o.lo" ;;
+    mach_o_le_vec)		 tb="$tb mach-o.lo" ;;
+    mach_o_fat_vec)		 tb="$tb mach-o.lo" ;;
+    i386_mach_o_vec)		 tb="$tb mach-o-i386.lo" ;;
+    x86_64_mach_o_vec)		 tb="$tb mach-o-x86-64.lo" ;;
+    mcore_pe_be_vec)		 tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pe_le_vec)		 tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_be_vec)		 tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_le_vec)		 tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mips_pe_le_vec)		 tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;;
+    mips_pei_le_vec)		 tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;;
+    m68k_aout_newsos3_vec)	 tb="$tb newsos3.lo aout32.lo" ;;
+    alpha_nlm32_vec)		 tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"; target_size=64 ;;
+    i386_nlm32_vec)		 tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
+    powerpc_nlm32_vec)		 tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
+    sparc_nlm32_vec)		 tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
+    ns32k_aout_pc532mach_vec)	 tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
+    ns32k_aout_pc532nbsd_vec)	 tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
+    pef_vec)			 tb="$tb pef.lo" ;;
+    pef_xlib_vec)		 tb="$tb pef.lo" ;;
+    pdp11_aout_vec)		 tb="$tb pdp11.lo" ;;
+    plugin_vec)			 tb="$tb plugin.lo" ;;
+    powerpc_xcoff_vec)		 tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    powerpc_boot_vec)		 tb="$tb ppcboot.lo" ;;
+    arm_aout_riscix_vec)	 tb="$tb aout32.lo riscix.lo" ;;
+    rs6000_xcoff64_vec)		 tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    rs6000_xcoff_vec)		 tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    sh_coff_small_vec)		 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_coff_vec)		 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_coff_small_le_vec)	 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_coff_le_vec)		 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_pe_le_vec)		 tb="$tb pe-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    sh_pei_le_vec)		 tb="$tb pei-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    hppa_som_vec)		 tb="$tb som.lo" ;;
+    sparc_coff_vec)		 tb="$tb coff-sparc.lo" ;;
+    sparc_aout_le_vec)		 tb="$tb aout-sparcle.lo aout32.lo" ;;
+    sparc_aout_linux_vec)	 tb="$tb sparclinux.lo aout32.lo" ;;
+    sparc_aout_lynx_vec)	 tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
+    sparc_coff_lynx_vec)	 tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
+    sparc_aout_nbsd_vec)	 tb="$tb sparcnetbsd.lo aout32.lo" ;;
+    sparc_aout_sunos_be_vec)	 tb="$tb sunos.lo aout32.lo" ;;
+    sym_vec)			 tb="$tb xsym.lo" ;;
+    tic30_aout_vec)		 tb="$tb aout-tic30.lo" ;;
+    tic30_coff_vec)		 tb="$tb coff-tic30.lo" ;;
+    tic4x_coff0_vec)		 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff0_beh_vec)	 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_vec)		 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_beh_vec)	 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_vec)		 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_beh_vec)	 tb="$tb coff-tic4x.lo" ;;
+    tic54x_coff0_beh_vec)	 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff0_vec)		 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_beh_vec)	 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_vec)		 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_beh_vec)	 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_vec)		 tb="$tb coff-tic54x.lo" ;;
+    tic80_coff_vec)		 tb="$tb coff-tic80.lo cofflink.lo" ;;
+    vax_aout_nbsd_vec)		 tb="$tb vaxnetbsd.lo aout32.lo" ;;
+    vax_aout_1knbsd_vec)	 tb="$tb vax1knetbsd.lo aout32.lo" ;;
+    vax_aout_bsd_vec)		 tb="$tb vaxbsd.lo aout32.lo" ;;
+    m68k_versados_vec)		 tb="$tb versados.lo" ;;
+    alpha_vms_vec)		 tb="$tb vms-alpha.lo vms-misc.lo vms-lib.lo"; target_size=64 ;;
+    alpha_vms_lib_txt_vec)	 tb="$tb vms-lib.lo vms-misc.lo" ;;
+    w65_coff_vec)		 tb="$tb coff-w65.lo reloc16.lo" ;;
+    we32k_coff_vec)		 tb="$tb coff-we32k.lo" ;;
+    z80_coff_vec)		 tb="$tb coff-z80.lo reloc16.lo" ;;
+    z8k_coff_vec)		 tb="$tb coff-z8k.lo reloc16.lo cofflink.lo" ;;
 
     # These appear out of order in targets.c
-    srec_vec)			tb="$tb srec.lo" ;;
-    symbolsrec_vec)		tb="$tb srec.lo" ;;
-    tekhex_vec)			tb="$tb tekhex.lo" ;;
-    cisco_core_big_vec)		tb="$tb cisco-core.lo" ;;
-    cisco_core_little_vec)	tb="$tb cisco-core.lo" ;;
+    srec_vec)			 tb="$tb srec.lo" ;;
+    symbolsrec_vec)		 tb="$tb srec.lo" ;;
+    tekhex_vec)			 tb="$tb tekhex.lo" ;;
+    core_cisco_be_vec)		 tb="$tb cisco-core.lo" ;;
+    core_cisco_le_vec)		 tb="$tb cisco-core.lo" ;;
 
-    "")			;;
+    "")				 ;;
     *) as_fn_error "*** unknown target vector $vec" "$LINENO" 5 ;;
     esac
 
diff --git a/bfd/configure.com b/bfd/configure.com
index bdf0196..707ba49 100644
--- a/bfd/configure.com
+++ b/bfd/configure.com
@@ -330,7 +330,7 @@ $ if ARCH.eqs."alpha"
 $ then
 $   create build.com
 $DECK
-$ DEFS="""SELECT_VECS=&vms_alpha_vec"","+-
+$ DEFS="""SELECT_VECS=&alpha_vms_vec"","+-
   """SELECT_ARCHITECTURES=&bfd_alpha_arch"""
 $ FILES="cpu-alpha,vms,vms-hdr,vms-gsd,vms-tir,vms-misc,"
 $EOD
@@ -339,7 +339,7 @@ $ if ARCH.eqs."ia64"
 $ then
 $   create build.com
 $DECK
-$ DEFS="""SELECT_VECS=&bfd_elf64_ia64_vms_vec"","+-
+$ DEFS="""SELECT_VECS=&ia64_elf64_vms_vec"","+-
   """SELECT_ARCHITECTURES=&bfd_ia64_arch"""
 $ FILES="cpu-ia64,elf64-ia64,elf-strtab,corefile,stabs,merge,elf-eh-frame,"+-
   "elflink,elf-attrs,dwarf1,elf64,"
diff --git a/bfd/configure.in b/bfd/configure.in
index b61a864..69ab4bf 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -428,7 +428,7 @@ changequote([,])dnl
 	COREFILE=netbsd-core.lo
 	;;
   rs6000-*-lynx*)
-  	COREFILE=lynx-core.lo
+	COREFILE=lynx-core.lo
 	;;
 changequote(,)dnl
   rs6000-*-aix[5-9].* | powerpc-*-aix[5-9].*)
@@ -469,7 +469,7 @@ changequote([,])dnl
 	TRAD_HEADER='"hosts/tahoe.h"'
 	;;
   vax-*-netbsd* | vax-*-openbsd*)
-  	COREFILE=netbsd-core.lo
+	COREFILE=netbsd-core.lo
 	;;
   vax-*-ultrix2*)
 	COREFILE=trad-core.lo
@@ -691,353 +691,347 @@ do
     # This list is alphabetized to make it easy to compare
     # with the two vector lists in targets.c.  For the same reason,
     # use one entry per line, even though this leads to long lines.
-    a_out_adobe_vec)		tb="$tb aout-adobe.lo aout32.lo" ;;
-    aix5coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
-    aout0_big_vec)		tb="$tb aout0.lo aout32.lo" ;;
-    aout_arm_big_vec)		tb="$tb aout-arm.lo aout32.lo" ;;
-    aout_arm_little_vec)	tb="$tb aout-arm.lo aout32.lo" ;;
-    apollocoff_vec)		tb="$tb coff-apollo.lo" ;;
-    arm_epoc_pe_big_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_epoc_pe_little_vec)	tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_epoc_pei_big_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
-    arm_epoc_pei_little_vec)	tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pe_big_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pe_little_vec)	tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pei_big_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
-    arm_wince_pei_little_vec)	tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
-    armcoff_big_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armcoff_little_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armnetbsd_vec)		tb="$tb armnetbsd.lo aout32.lo" ;;
-    armpe_big_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
-    armpe_little_vec)		tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
-    armpei_big_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
-    armpei_little_vec)		tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
-    b_out_vec_big_host)		tb="$tb bout.lo aout32.lo" ;;
-    b_out_vec_little_host)	tb="$tb bout.lo aout32.lo" ;;
-    bfd_pei_ia64_vec)		tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
-    bfd_elf32_am33lin_vec)	tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
-    bfd_elf32_avr_vec)		tb="$tb elf32-avr.lo elf32.lo $elf" ;;
-    bfd_elf32_bfin_vec)		tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
-    bfd_elf32_bfinfdpic_vec)	tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
-    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_nacl_vec)	tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigarm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_bigmips_vxworks_vec)
-			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_bigmoxie_vec)	tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
-    bfd_elf32_bignios2_vec)	tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
-    bfd_elf32_cr16_vec)		tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
-    bfd_elf32_cr16c_vec)	tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
-    bfd_elf32_cris_vec)		tb="$tb elf32-cris.lo elf32.lo $elf" ;;
-    bfd_elf32_crx_vec)          tb="$tb elf32-crx.lo elf32.lo $elf" ;;
-    bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
-    bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
-    bfd_elf32_dlx_big_vec)	tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
-    bfd_elf32_epiphany_vec)	tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
-    bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
-    bfd_elf32_frv_vec)		tb="$tb elf32-frv.lo elf32.lo $elf" ;;
-    bfd_elf32_frvfdpic_vec)	tb="$tb elf32-frv.lo elf32.lo $elf" ;;
-    bfd_elf32_h8300_vec)	tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_linux_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_nbsd_vec)	tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_sol2_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_nacl_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_vxworks_vec)	tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_i860_little_vec)	tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-    bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-    bfd_elf32_i960_vec)		tb="$tb elf32-i960.lo elf32.lo $elf" ;;
-    bfd_elf32_ia64_big_vec)	tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
-    bfd_elf32_ia64_hpux_big_vec) tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf";;
-    bfd_elf32_ip2k_vec)		tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
-    bfd_elf32_iq2000_vec)       tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
-    bfd_elf32_lm32_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
-    bfd_elf32_lm32fdpic_vec)         tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
-    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_vec)	tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_nacl_vec) tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_littlemips_vxworks_vec)
-			 	tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_littlemoxie_vec)	tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
-    bfd_elf32_littlenios2_vec)	tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
-    bfd_elf32_m32c_vec)         tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
-    bfd_elf32_m32r_vec)		tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m32rle_vec)       tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m32rlin_vec)      tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m32rlelin_vec)    tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m68hc11_vec)	tb="$tb elf32-m68hc11.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
-    bfd_elf32_m68hc12_vec)	tb="$tb elf32-m68hc12.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
-    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
-    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_big_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mep_vec)		tb="$tb elf32-mep.lo elf32.lo $elf" ;;
-    bfd_elf32_mep_little_vec)	tb="$tb elf32-mep.lo elf32.lo $elf" ;;
-    bfd_elf32_metag_vec)	tb="$tb elf32-metag.lo elf32.lo $elf" ;;
-    bfd_elf32_microblazeel_vec)	tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
-    bfd_elf32_microblaze_vec)	tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-    bfd_elf32_mt_vec)           tb="$tb elf32-mt.lo elf32.lo $elf" ;;
-    bfd_elf32_msp430_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
-    bfd_elf32_msp430_ti_vec)	tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
-    bfd_elf32_nbigmips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_nlittlemips_vec)	tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_ntradbigmips_vec | bfd_elf32_ntradbigmips_freebsd_vec)
-				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_ntradlittlemips_vec | bfd_elf32_ntradlittlemips_freebsd_vec)
-				tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf32_nds32be_vec)      tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_nds32le_vec)      tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_nds32belin_vec)   tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_nds32lelin_vec)   tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
-    bfd_elf32_or1k_vec)		tb="$tb elf32-or1k.lo elf32.lo $elf" ;;
-    bfd_elf32_pj_vec)           tb="$tb elf32-pj.lo elf32.lo $elf";;
-    bfd_elf32_pjl_vec)          tb="$tb elf32-pj.lo elf32.lo $elf";;
-    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_freebsd_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_vxworks_vec) tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_rl78_vec)         tb="$tb elf32-rl78.lo $elf" ;;
-    bfd_elf32_rx_le_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
-    bfd_elf32_rx_be_vec)        tb="$tb elf32-rx.lo elf32.lo $elf" ;;
-    bfd_elf32_rx_be_ns_vec)     tb="$tb elf32-rx.lo elf32.lo $elf" ;;
-    bfd_elf32_s390_vec)		tb="$tb elf32-s390.lo elf32.lo $elf" ;;
-    bfd_elf32_bigscore_vec)     tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
-    bfd_elf32_littlescore_vec)  tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64;;
+    aout_adobe_vec)		 tb="$tb aout-adobe.lo aout32.lo" ;;
+    rs6000_xcoff64_aix_vec)	 tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    aout0_be_vec)		 tb="$tb aout0.lo aout32.lo" ;;
+    arm_aout_be_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
+    arm_aout_le_vec)		 tb="$tb aout-arm.lo aout32.lo" ;;
+    m68k_coff_apollo_vec)	 tb="$tb coff-apollo.lo" ;;
+    arm_pe_epoc_be_vec)		 tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_epoc_le_vec)		 tb="$tb epoc-pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_epoc_be_vec)	 tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_epoc_le_vec)	 tb="$tb epoc-pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_wince_be_vec)	 tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_wince_le_vec)	 tb="$tb pe-arm-wince.lo pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_wince_be_vec)	 tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_wince_le_vec)	 tb="$tb pei-arm-wince.lo pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_coff_be_vec)		 tb="$tb coff-arm.lo cofflink.lo " ;;
+    arm_coff_le_vec)		 tb="$tb coff-arm.lo cofflink.lo " ;;
+    arm_aout_nbsd_vec)		 tb="$tb armnetbsd.lo aout32.lo" ;;
+    arm_pe_be_vec)		 tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pe_le_vec)		 tb="$tb pe-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_be_vec)		 tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    arm_pei_le_vec)		 tb="$tb pei-arm.lo peigen.lo cofflink.lo " ;;
+    bout_be_vec)		 tb="$tb bout.lo aout32.lo" ;;
+    bout_le_vec)		 tb="$tb bout.lo aout32.lo" ;;
+    ia64_pei_vec)		 tb="$tb pei-ia64.lo pepigen.lo cofflink.lo"; target_size=64 ;;
+    am33_elf32_linux_vec)	 tb="$tb elf32-am33lin.lo elf32.lo $elf" ;;
+    avr_elf32_vec)		 tb="$tb elf32-avr.lo elf32.lo $elf" ;;
+    bfin_elf32_vec)		 tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    bfin_elf32_fdpic_vec)	 tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
+    elf32_be_vec)		 tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    arc_elf32_be_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    arm_elf32_be_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_nacl_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_symbian_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_be_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    mips_elf32_be_vec)		 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_vxworks_be_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    moxie_elf32_be_vec)		 tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
+    nios2_elf32_be_vec)		 tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
+    cr16_elf32_vec)		 tb="$tb elf32-cr16.lo elf32.lo $elf" ;;
+    cr16c_elf32_vec)		 tb="$tb elf32-cr16c.lo elf32.lo $elf" ;;
+    cris_elf32_vec)		 tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    crx_elf32_vec)		 tb="$tb elf32-crx.lo elf32.lo $elf" ;;
+    d10v_elf32_vec)		 tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
+    d30v_elf32_vec)		 tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
+    dlx_elf32_be_vec)		 tb="$tb elf32-dlx.lo elf32.lo $elf" ;;
+    epiphany_elf32_vec)		 tb="$tb elf32-epiphany.lo elf32.lo $elf" ;;
+    fr30_elf32_vec)		 tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
+    frv_elf32_vec)		 tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    frv_elf32_fdpic_vec)	 tb="$tb elf32-frv.lo elf32.lo $elf" ;;
+    h8300_elf32_vec)		 tb="$tb elf32-h8300.lo elf32.lo $elf" ;;
+    hppa_elf32_linux_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    hppa_elf32_nbsd_vec)	 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    hppa_elf32_vec)		 tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
+    i370_elf32_vec)		 tb="$tb elf32-i370.lo elf32.lo $elf" ;;
+    i386_elf32_sol2_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_fbsd_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_nacl_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_vxworks_vec)	 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i386_elf32_vec)		 tb="$tb elf32-i386.lo elf-ifunc.lo elf-nacl.lo elf-vxworks.lo elf32.lo $elf" ;;
+    i860_elf32_le_vec)		 tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    i860_elf32_vec)		 tb="$tb elf32-i860.lo elf32.lo $elf" ;;
+    i960_elf32_vec)		 tb="$tb elf32-i960.lo elf32.lo $elf" ;;
+    ia64_elf32_be_vec)		 tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
+    ia64_elf32_hpux_be_vec)	 tb="$tb elf32-ia64.lo elfxx-ia64.lo elf32.lo $elf" ;;
+    ip2k_elf32_vec)		 tb="$tb elf32-ip2k.lo elf32.lo $elf" ;;
+    iq2000_elf32_vec)		 tb="$tb elf32-iq2000.lo elf32.lo $elf" ;;
+    lm32_elf32_vec)		 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    lm32_elf32_fdpic_vec)	 tb="$tb elf32-lm32.lo elf32.lo $elf" ;;
+    elf32_le_vec)		 tb="$tb elf32-gen.lo elf32.lo $elf" ;;
+    arc_elf32_le_vec)		 tb="$tb elf32-arc.lo elf32.lo $elf" ;;
+    arm_elf32_symbian_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_vxworks_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_le_vec)		 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    arm_elf32_nacl_le_vec)	 tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    mips_elf32_le_vec)		 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_vxworks_le_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    moxie_elf32_le_vec)		 tb="$tb elf32-moxie.lo elf32.lo $elf" ;;
+    nios2_elf32_le_vec)		 tb="$tb elf32-nios2.lo elf32.lo $elf" ;;
+    m32c_elf32_vec)		 tb="$tb elf32-m32c.lo elf32.lo $elf" ;;
+    m32r_elf32_vec)		 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m32r_elf32_le_vec)		 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m32r_elf32_linux_vec)	 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m32r_elf32_linux_le_vec)	 tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
+    m68hc11_elf32_vec)		 tb="$tb elf32-m68hc11.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    m68hc12_elf32_vec)		 tb="$tb elf32-m68hc12.lo elf32-m68hc1x.lo elf32.lo $elf" ;;
+    m68k_elf32_vec)		 tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
+    m88k_elf32_vec)		 tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
+    mcore_elf32_be_vec)		 tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    mcore_elf32_le_vec)		 tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
+    mep_elf32_vec)		 tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    mep_elf32_le_vec)		 tb="$tb elf32-mep.lo elf32.lo $elf" ;;
+    metag_elf32_vec)		 tb="$tb elf32-metag.lo elf32.lo $elf" ;;
+    microblaze_elf32_le_vec)	 tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
+    microblaze_elf32_vec)	 tb="$tb elf32-microblaze.lo elf32.lo $elf" ;;
+    mn10200_elf32_vec)		 tb="$tb elf-m10200.lo elf32.lo $elf" ;;
+    mn10300_elf32_vec)		 tb="$tb elf-m10300.lo elf32.lo $elf" ;;
+    mt_elf32_vec)		 tb="$tb elf32-mt.lo elf32.lo $elf" ;;
+    msp430_elf32_vec)		 tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
+    msp430_elf32_ti_vec)	 tb="$tb elf32-msp430.lo elf32.lo $elf" ;;
+    mips_elf32_n_be_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_n_le_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntrad_be_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntradfbsd_be_vec) tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntrad_le_vec)	 tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf32_ntradfbsd_le_vec) tb="$tb elfn32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    nds32_elf32_be_vec)		 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    nds32_elf32_le_vec)		 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    nds32_elf32_linux_be_vec)	 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    nds32_elf32_linux_le_vec)	 tb="$tb elf32-nds32.lo elf32.lo $elf" ;;
+    or1k_elf32_vec)		 tb="$tb elf32-or1k.lo elf32.lo $elf" ;;
+    pj_elf32_vec)		 tb="$tb elf32-pj.lo elf32.lo $elf" ;;
+    pj_elf32_le_vec)		 tb="$tb elf32-pj.lo elf32.lo $elf" ;;
+    powerpc_elf32_vec)		 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    powerpc_elf32_le_vec)	 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    powerpc_elf32_fbsd_vec)	 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    powerpc_elf32_vxworks_vec)	 tb="$tb elf32-ppc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    rl78_elf32_vec)		 tb="$tb elf32-rl78.lo elf32.lo $elf" ;;
+    rx_elf32_le_vec)		 tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    rx_elf32_be_vec)		 tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    rx_elf32_be_ns_vec)		 tb="$tb elf32-rx.lo elf32.lo $elf" ;;
+    s390_elf32_vec)		 tb="$tb elf32-s390.lo elf32.lo $elf" ;;
+    score_elf32_be_vec)		 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64 ;;
+    score_elf32_le_vec)		 tb="$tb elf32-score.lo elf32-score7.lo elf32.lo $elf"; want64=true; target_size=64 ;;
     # FIXME: We include cofflink.lo not because it's needed for
-    # bfd_elf32_sh64[l]_vec, but because we include bfd_elf32_sh[l]_vec
+    # sh64_elf32[_le]_vec, but because we include sh_elf32[_le]_vec
     # which needs it but does not list it.  Should be fixed in right place.
-    bfd_elf32_sh64_vec)		tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64l_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64lin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64blin_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
-    bfd_elf32_sh64lnbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
-    bfd_elf32_sh64nbsd_vec)	tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
-    bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shbfd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shblin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shfd_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shl_symbian_vec)	tb="$tb elf32-sh-symbian.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shlin_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shlnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shlvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shnbsd_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
-    bfd_elf32_shvxworks_vec)	tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_sparc_sol2_vec)	tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_sparc_vxworks_vec) tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
-    bfd_elf32_spu_vec)		tb="$tb elf32-spu.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_be_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_le_vec)	tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_linux_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_linux_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_elf_be_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tic6x_elf_le_vec) tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
-    bfd_elf32_tilegx_be_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
-    bfd_elf32_tilegx_le_vec)	tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
-    bfd_elf32_tilepro_vec)	tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
-    bfd_elf32_tradbigmips_vec | bfd_elf32_tradbigmips_freebsd_vec)
-				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_tradlittlemips_vec | bfd_elf32_tradlittlemips_freebsd_vec)
-				tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf32_us_cris_vec)	tb="$tb elf32-cris.lo elf32.lo $elf" ;;
-    bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-    bfd_elf32_v850_rh850_vec)	tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-    bfd_elf32_vax_vec)		tb="$tb elf32-vax.lo elf32.lo $elf" ;;
-    bfd_elf32_xstormy16_vec)	tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;;
-    bfd_elf32_xc16x_vec)		tb="$tb elf32-xc16x.lo elf32.lo $elf" ;;
-    bfd_elf32_xgate_vec)  	tb="$tb elf32-xgate.lo elf32.lo $elf" ;;
-    bfd_elf32_xtensa_le_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
-    bfd_elf32_xtensa_be_vec)	tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
-    bfd_elf64_alpha_freebsd_vec) tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_alpha_vec)	tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_bigaarch64_vec)	tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf32_bigaarch64_vec)	tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_bigmips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_hppa_linux_vec)	tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_hppa_vec)		tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_big_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_hpux_big_vec) tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_little_vec)	tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64-vms.lo elf64-ia64.lo elfxx-ia64.lo elf64.lo vms-lib.lo vms-misc.lo $elf"; target_size=64 ;;    
-    bfd_elf64_littleaarch64_vec)tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf32_littleaarch64_vec)tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_powerpc_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_powerpcle_vec)	tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_powerpc_freebsd_vec) tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_s390_vec)		tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_sh64_vec)		tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64l_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64lin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64blin_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64lnbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sh64nbsd_vec)	tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
-    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_sparc_freebsd_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_sparc_sol2_vec) tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_tilegx_be_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
-    bfd_elf64_tilegx_le_vec)	tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
-    bfd_elf64_tradbigmips_vec | bfd_elf64_tradbigmips_freebsd_vec)
-				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_tradlittlemips_vec | bfd_elf64_tradlittlemips_freebsd_vec)
-				tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
-    bfd_elf64_x86_64_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_sol2_vec)  tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf32_x86_64_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf32_x86_64_nacl_vec)	tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
-    bfd_elf64_l1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_l1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_k1om_vec)		tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_k1om_freebsd_vec) tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_mmo_vec)		tb="$tb mmo.lo" target_size=64 ;;
-    bfd_powerpc_pe_vec)         tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
-    bfd_powerpc_pei_vec)        tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
-    bfd_powerpcle_pe_vec)       tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
-    bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
-    cris_aout_vec)		tb="$tb aout-cris.lo" ;;
-    demo_64_vec)		tb="$tb demo64.lo aout64.lo"; target_size=64 ;;
-    ecoff_big_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_biglittle_vec)	tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_little_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoffalpha_little_vec)	tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;;
-    go32coff_vec)		tb="$tb coff-go32.lo cofflink.lo" ;;
-    go32stubbedcoff_vec)	tb="$tb coff-stgo32.lo cofflink.lo" ;;
-    h8300coff_vec)		tb="$tb coff-h8300.lo reloc16.lo" ;;
-    h8500coff_vec)		tb="$tb coff-h8500.lo reloc16.lo" ;;
-    host_aout_vec)		tb="$tb host-aout.lo aout32.lo" ;;
-    hp300bsd_vec)		tb="$tb hp300bsd.lo aout32.lo" ;;
-    hp300hpux_vec)		tb="$tb hp300hpux.lo aout32.lo" ;;
-    i386aout_vec)		tb="$tb i386aout.lo aout32.lo" ;;
-    i386bsd_vec)		tb="$tb i386bsd.lo aout32.lo" ;;
-    i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
-    x86_64coff_vec)		tb="$tb coff-x86_64.lo cofflink.lo"; target_size=64 ;;
-    i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
-    i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
-    i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
-    i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
-    i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
-    i386mach3_vec)		tb="$tb i386mach3.lo aout32.lo" ;;
-    i386msdos_vec)		tb="$tb i386msdos.lo" ;;
-    i386netbsd_vec)		tb="$tb i386netbsd.lo aout32.lo" ;;
-    i386os9k_vec)		tb="$tb i386os9k.lo aout32.lo" ;;
-    i386pe_vec)			tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
-    i386pei_vec)		tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;
-    x86_64pe_vec)		tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
-    x86_64pei_vec)		tb="$tb pei-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
-    x86_64pe_bigobj_vec)	tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
-    i860coff_vec)		tb="$tb coff-i860.lo cofflink.lo" ;;
-    icoff_big_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    icoff_little_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    ieee_vec)			tb="$tb ieee.lo" ;;
-    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.lo aout32.lo" ;;
-    m68kaux_coff_vec)		tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
-    m68kcoff_vec)		tb="$tb coff-m68k.lo cofflink.lo" ;;
-    m68kcoffun_vec)		tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
-    m68klinux_vec)		tb="$tb m68klinux.lo aout32.lo" ;;
-    m68knetbsd_vec)		tb="$tb m68knetbsd.lo aout32.lo" ;;
-    m68ksysvcoff_vec)		tb="$tb coff-svm68k.lo cofflink.lo" ;;
-    m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
-    m88kmach3_vec)		tb="$tb m88kmach3.lo aout32.lo" ;;
-    m88kopenbsd_vec)		tb="$tb m88kopenbsd.lo aout32.lo" ;;
-    mach_o_be_vec)              tb="$tb mach-o.lo" ;;
-    mach_o_le_vec)              tb="$tb mach-o.lo" ;;
-    mach_o_fat_vec)             tb="$tb mach-o.lo" ;;
-    mach_o_i386_vec)            tb="$tb mach-o-i386.lo" ;;
-    mach_o_x86_64_vec)          tb="$tb mach-o-x86-64.lo" ;;
-    mcore_pe_big_vec)		tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
-    mcore_pe_little_vec)	tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
-    mcore_pei_big_vec)		tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
-    mcore_pei_little_vec)	tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
-    mipslpe_vec)		tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;;
-    mipslpei_vec)		tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;;
-    newsos3_vec)		tb="$tb newsos3.lo aout32.lo" ;;
-    nlm32_alpha_vec)		tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"; target_size=64 ;;
-    nlm32_i386_vec)		tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
-    nlm32_powerpc_vec)		tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
-    nlm32_sparc_vec)		tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
-    pc532machaout_vec)		tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
-    pc532netbsd_vec)		tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
-    pef_vec)                    tb="$tb pef.lo" ;;
-    pef_xlib_vec)               tb="$tb pef.lo" ;;
-    pdp11_aout_vec)		tb="$tb pdp11.lo" ;;
-    plugin_vec)                 tb="$tb plugin.lo" ;;
-    pmac_xcoff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
-    ppcboot_vec)		tb="$tb ppcboot.lo" ;;
-    riscix_vec)			tb="$tb aout32.lo riscix.lo" ;;
-    rs6000coff64_vec)		tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
-    rs6000coff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
-    shcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shcoff_vec)			tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlpe_vec)			tb="$tb pe-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
-    shlpei_vec)			tb="$tb pei-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
-    som_vec)			tb="$tb som.lo" ;;
-    sparccoff_vec)		tb="$tb coff-sparc.lo" ;;
-    sparcle_aout_vec)		tb="$tb aout-sparcle.lo aout32.lo" ;;
-    sparclinux_vec)		tb="$tb sparclinux.lo aout32.lo" ;;
-    sparclynx_aout_vec)		tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
-    sparclynx_coff_vec)		tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
-    sparcnetbsd_vec)		tb="$tb sparcnetbsd.lo aout32.lo" ;;
-    sunos_big_vec)		tb="$tb sunos.lo aout32.lo" ;;
-    sym_vec)                    tb="$tb xsym.lo" ;;
-    tic30_aout_vec)		tb="$tb aout-tic30.lo" ;;
-    tic30_coff_vec)		tb="$tb coff-tic30.lo" ;;
-    tic4x_coff0_vec)            tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff0_beh_vec)        tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff1_vec)            tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff1_beh_vec)        tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff2_vec)            tb="$tb coff-tic4x.lo" ;;
-    tic4x_coff2_beh_vec)        tb="$tb coff-tic4x.lo" ;;
-    tic54x_coff0_beh_vec)	tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff0_vec)		tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff1_beh_vec)	tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff1_vec)		tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff2_beh_vec)	tb="$tb coff-tic54x.lo" ;;
-    tic54x_coff2_vec)		tb="$tb coff-tic54x.lo" ;;
-    tic80coff_vec)		tb="$tb coff-tic80.lo cofflink.lo" ;;
-    vaxnetbsd_vec)		tb="$tb vaxnetbsd.lo aout32.lo" ;;
-    vax1knetbsd_vec)		tb="$tb vax1knetbsd.lo aout32.lo" ;;
-    vaxbsd_vec)			tb="$tb vaxbsd.lo aout32.lo" ;;
-    versados_vec)		tb="$tb versados.lo" ;;
-    vms_alpha_vec)		tb="$tb vms-alpha.lo vms-misc.lo vms-lib.lo"; target_size=64 ;;
-    vms_lib_txt_vec)		tb="$tb vms-lib.lo vms-misc.lo" ;;
-    w65_vec)			tb="$tb coff-w65.lo reloc16.lo" ;;
-    we32kcoff_vec)		tb="$tb coff-we32k.lo" ;;
-    z80coff_vec)		tb="$tb coff-z80.lo reloc16.lo" ;;
-    z8kcoff_vec)		tb="$tb coff-z8k.lo reloc16.lo cofflink.lo" ;;
+    sh64_elf32_vec)		 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_le_vec)		 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_linux_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_linux_be_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" target_size=64 ;;
+    sh64_elf32_nbsd_le_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    sh64_elf32_nbsd_vec)	 tb="$tb elf32-sh64.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf cofflink.lo" ;;
+    sh_elf32_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_fdpic_be_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_linux_be_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_fdpic_le_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_le_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_symbian_le_vec)	 tb="$tb elf32-sh-symbian.lo elf32-sh64-com.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_linux_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_nbsd_le_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_vxworks_le_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sh_elf32_nbsd_vec)		 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo cofflink.lo" ;;
+    sh_elf32_vxworks_vec)	 tb="$tb elf32-sh.lo elf-vxworks.lo elf32.lo $elf coff-sh.lo" ;;
+    sparc_elf32_vec)		 tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    sparc_elf32_sol2_vec)	 tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    sparc_elf32_vxworks_vec)	 tb="$tb elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo $elf" ;;
+    spu_elf32_vec)		 tb="$tb elf32-spu.lo elf32.lo $elf" ;;
+    tic6x_elf32_be_vec)		 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_le_vec)		 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_linux_be_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_linux_le_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_c6000_be_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tic6x_elf32_c6000_le_vec)	 tb="$tb elf32-tic6x.lo elf32.lo $elf" ;;
+    tilegx_elf32_be_vec)	 tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    tilegx_elf32_le_vec)	 tb="$tb elf32-tilegx.lo elfxx-tilegx.lo elf32.lo $elf" ; target_size=32 ;;
+    tilepro_elf32_vec)		 tb="$tb elf32-tilepro.lo elf32.lo $elf" ;;
+    mips_elf32_trad_be_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_tradfbsd_be_vec)  tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_trad_le_vec)	 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    mips_elf32_tradfbsd_le_vec)  tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
+    cris_elf32_us_vec)		 tb="$tb elf32-cris.lo elf32.lo $elf" ;;
+    v850_elf32_vec)		 tb="$tb elf32-v850.lo elf32.lo $elf" ;;
+    v800_elf32_vec)		 tb="$tb elf32-v850.lo elf32.lo $elf" ;;
+    vax_elf32_vec)		 tb="$tb elf32-vax.lo elf32.lo $elf" ;;
+    xstormy16_elf32_vec)	 tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;;
+    xc16x_elf32_vec)		 tb="$tb elf32-xc16x.lo elf32.lo $elf" ;;
+    xgate_elf32_vec)		 tb="$tb elf32-xgate.lo elf32.lo $elf" ;;
+    xtensa_elf32_le_vec)	 tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    xtensa_elf32_be_vec)	 tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;;
+    alpha_elf64_fbsd_vec)	 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    alpha_elf64_vec)		 tb="$tb elf64-alpha.lo elf64.lo $elf"; target_size=64 ;;
+    aarch64_elf64_be_vec)	 tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    aarch64_elf32_be_vec)	 tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
+    elf64_be_vec)		 tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    mips_elf64_be_vec)		 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    hppa_elf64_linux_vec)	 tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    hppa_elf64_vec)		 tb="$tb elf64-hppa.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_be_vec)		 tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_hpux_be_vec)	 tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_le_vec)		 tb="$tb elf64-ia64.lo elfxx-ia64.lo elf64.lo $elf"; target_size=64 ;;
+    ia64_elf64_vms_vec)		 tb="$tb elf64-ia64-vms.lo elf64-ia64.lo elfxx-ia64.lo elf64.lo vms-lib.lo vms-misc.lo $elf"; target_size=64 ;;
+    aarch64_elf64_le_vec)	 tb="$tb elf64-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf64.lo $elf"; target_size=64 ;;
+    aarch64_elf32_le_vec)	 tb="$tb elf32-aarch64.lo elfxx-aarch64.lo elf-ifunc.lo elf32.lo $elf"; target_size=64 ;;
+    elf64_le_vec)		 tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    mips_elf64_le_vec)		 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mmix_elf64_vec)		 tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
+    powerpc_elf64_vec)		 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
+    powerpc_elf64_le_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
+    powerpc_elf64_fbsd_vec)	 tb="$tb elf64-ppc.lo elf64-gen.lo elf64.lo $elf" target_size=64 ;;
+    s390_elf64_vec)		 tb="$tb elf64-s390.lo elf64.lo $elf"; target_size=64 ;;
+    sh64_elf64_vec)		 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_le_vec)		 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_linux_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_linux_be_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_nbsd_le_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sh64_elf64_nbsd_vec)	 tb="$tb elf64-sh64.lo elf64.lo $elf" target_size=64 ;;
+    sparc_elf64_vec)		 tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    sparc_elf64_fbsd_vec)	 tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    sparc_elf64_sol2_vec)	 tb="$tb elf64-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf64.lo $elf"; target_size=64 ;;
+    tilegx_elf64_be_vec)	 tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    tilegx_elf64_le_vec)	 tb="$tb elf64-tilegx.lo elfxx-tilegx.lo elf64.lo $elf" ; target_size=64 ;;
+    mips_elf64_trad_be_vec)	 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf64_tradfbsd_be_vec)  tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf64_trad_le_vec)	 tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    mips_elf64_tradfbsd_le_vec)  tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
+    x86_64_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf64_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf64_sol2_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    x86_64_elf32_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
+    x86_64_elf32_nacl_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf32.lo $elf"; target_size=64 ;;
+    l1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    l1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_vec)		 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    k1om_elf64_fbsd_vec)	 tb="$tb elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo $elf"; target_size=64 ;;
+    mmix_mmo_vec)			 tb="$tb mmo.lo" target_size=64 ;;
+    powerpc_pe_vec)		 tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    powerpc_pei_vec)		 tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    powerpc_pe_le_vec)		 tb="$tb pe-ppc.lo peigen.lo cofflink.lo" ;;
+    powerpc_pei_le_vec)		 tb="$tb pei-ppc.lo peigen.lo cofflink.lo" ;;
+    cris_aout_vec)		 tb="$tb aout-cris.lo" ;;
+    aout64_vec)			 tb="$tb demo64.lo aout64.lo"; target_size=64 ;;
+    mips_ecoff_be_vec)		 tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    mips_ecoff_bele_vec)	 tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    mips_ecoff_le_vec)		 tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
+    alpha_ecoff_le_vec)		 tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"; target_size=64 ;;
+    i386_coff_go32_vec)		 tb="$tb coff-go32.lo cofflink.lo" ;;
+    i386_coff_go32stubbed_vec)	 tb="$tb coff-stgo32.lo cofflink.lo" ;;
+    h8300_coff_vec)		 tb="$tb coff-h8300.lo reloc16.lo" ;;
+    h8500_coff_vec)		 tb="$tb coff-h8500.lo reloc16.lo" ;;
+    aout_vec)			 tb="$tb host-aout.lo aout32.lo" ;;
+    m68k_aout_hp300bsd_vec)	 tb="$tb hp300bsd.lo aout32.lo" ;;
+    m68k_aout_hp300hpux_vec)	 tb="$tb hp300hpux.lo aout32.lo" ;;
+    i386_aout_vec)		 tb="$tb i386aout.lo aout32.lo" ;;
+    i386_aout_bsd_vec)		 tb="$tb i386bsd.lo aout32.lo" ;;
+    i386_coff_vec)		 tb="$tb coff-i386.lo cofflink.lo" ;;
+    x86_64_coff_vec)		 tb="$tb coff-x86_64.lo cofflink.lo"; target_size=64 ;;
+    i386_aout_dynix_vec)	 tb="$tb i386dynix.lo aout32.lo" ;;
+    i386_aout_fbsd_vec)		 tb="$tb i386freebsd.lo aout32.lo" ;;
+    i386_aout_linux_vec)	 tb="$tb i386linux.lo aout32.lo" ;;
+    i386_aout_lynx_vec)		 tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
+    i386_coff_lynx_vec)		 tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
+    i386_aout_mach3_vec)	 tb="$tb i386mach3.lo aout32.lo" ;;
+    i386_msdos_vec)		 tb="$tb i386msdos.lo" ;;
+    i386_aout_nbsd_vec)		 tb="$tb i386netbsd.lo aout32.lo" ;;
+    i386_aout_os9k_vec)		 tb="$tb i386os9k.lo aout32.lo" ;;
+    i386_pe_vec)		 tb="$tb pe-i386.lo peigen.lo cofflink.lo" ;;
+    i386_pei_vec)		 tb="$tb pei-i386.lo peigen.lo cofflink.lo" ;;
+    x86_64_pe_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    x86_64_pei_vec)		 tb="$tb pei-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    x86_64_pe_be_vec)		 tb="$tb pe-x86_64.lo pex64igen.lo cofflink.lo"; target_size=64 ;;
+    i860_coff_vec)		 tb="$tb coff-i860.lo cofflink.lo" ;;
+    icoff_be_vec)		 tb="$tb coff-i960.lo cofflink.lo" ;;
+    icoff_le_vec)		 tb="$tb coff-i960.lo cofflink.lo" ;;
+    ieee_vec)			 tb="$tb ieee.lo" ;;
+    m68k_aout_4knbsd_vec)	 tb="$tb m68k4knetbsd.lo aout32.lo" ;;
+    m68k_coff_aux_vec)		 tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
+    m68k_coff_vec)		 tb="$tb coff-m68k.lo cofflink.lo" ;;
+    m68k_coff_un_vec)		 tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
+    m68k_aout_linux_vec)	 tb="$tb m68klinux.lo aout32.lo" ;;
+    m68k_aout_nbsd_vec)		 tb="$tb m68knetbsd.lo aout32.lo" ;;
+    m68k_coff_sysv_vec)		 tb="$tb coff-svm68k.lo cofflink.lo" ;;
+    m88k_coff_bcs_vec)		 tb="$tb coff-m88k.lo" ;;
+    m88k_aout_mach3_vec)	 tb="$tb m88kmach3.lo aout32.lo" ;;
+    m88k_aout_obsd_vec)		 tb="$tb m88kopenbsd.lo aout32.lo" ;;
+    mach_o_be_vec)		 tb="$tb mach-o.lo" ;;
+    mach_o_le_vec)		 tb="$tb mach-o.lo" ;;
+    mach_o_fat_vec)		 tb="$tb mach-o.lo" ;;
+    i386_mach_o_vec)		 tb="$tb mach-o-i386.lo" ;;
+    x86_64_mach_o_vec)		 tb="$tb mach-o-x86-64.lo" ;;
+    mcore_pe_be_vec)		 tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pe_le_vec)		 tb="$tb pe-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_be_vec)		 tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mcore_pei_le_vec)		 tb="$tb pei-mcore.lo peigen.lo cofflink.lo" ;;
+    mips_pe_le_vec)		 tb="$tb pe-mips.lo peigen.lo cofflink.lo" ;;
+    mips_pei_le_vec)		 tb="$tb pei-mips.lo peigen.lo cofflink.lo" ;;
+    m68k_aout_newsos3_vec)	 tb="$tb newsos3.lo aout32.lo" ;;
+    alpha_nlm32_vec)		 tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"; target_size=64 ;;
+    i386_nlm32_vec)		 tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
+    powerpc_nlm32_vec)		 tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
+    sparc_nlm32_vec)		 tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
+    ns32k_aout_pc532mach_vec)	 tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
+    ns32k_aout_pc532nbsd_vec)	 tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
+    pef_vec)			 tb="$tb pef.lo" ;;
+    pef_xlib_vec)		 tb="$tb pef.lo" ;;
+    pdp11_aout_vec)		 tb="$tb pdp11.lo" ;;
+    plugin_vec)			 tb="$tb plugin.lo" ;;
+    powerpc_xcoff_vec)		 tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    powerpc_boot_vec)		 tb="$tb ppcboot.lo" ;;
+    arm_aout_riscix_vec)	 tb="$tb aout32.lo riscix.lo" ;;
+    rs6000_xcoff64_vec)		 tb="$tb coff64-rs6000.lo xcofflink.lo aix5ppc-core.lo"; target_size=64 ;;
+    rs6000_xcoff_vec)		 tb="$tb coff-rs6000.lo xcofflink.lo" ;;
+    sh_coff_small_vec)		 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_coff_vec)		 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_coff_small_le_vec)	 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_coff_le_vec)		 tb="$tb coff-sh.lo cofflink.lo" ;;
+    sh_pe_le_vec)		 tb="$tb pe-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    sh_pei_le_vec)		 tb="$tb pei-sh.lo coff-sh.lo peigen.lo cofflink.lo" ;;
+    hppa_som_vec)		 tb="$tb som.lo" ;;
+    sparc_coff_vec)		 tb="$tb coff-sparc.lo" ;;
+    sparc_aout_le_vec)		 tb="$tb aout-sparcle.lo aout32.lo" ;;
+    sparc_aout_linux_vec)	 tb="$tb sparclinux.lo aout32.lo" ;;
+    sparc_aout_lynx_vec)	 tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
+    sparc_coff_lynx_vec)	 tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
+    sparc_aout_nbsd_vec)	 tb="$tb sparcnetbsd.lo aout32.lo" ;;
+    sparc_aout_sunos_be_vec)	 tb="$tb sunos.lo aout32.lo" ;;
+    sym_vec)			 tb="$tb xsym.lo" ;;
+    tic30_aout_vec)		 tb="$tb aout-tic30.lo" ;;
+    tic30_coff_vec)		 tb="$tb coff-tic30.lo" ;;
+    tic4x_coff0_vec)		 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff0_beh_vec)	 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_vec)		 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff1_beh_vec)	 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_vec)		 tb="$tb coff-tic4x.lo" ;;
+    tic4x_coff2_beh_vec)	 tb="$tb coff-tic4x.lo" ;;
+    tic54x_coff0_beh_vec)	 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff0_vec)		 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_beh_vec)	 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff1_vec)		 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_beh_vec)	 tb="$tb coff-tic54x.lo" ;;
+    tic54x_coff2_vec)		 tb="$tb coff-tic54x.lo" ;;
+    tic80_coff_vec)		 tb="$tb coff-tic80.lo cofflink.lo" ;;
+    vax_aout_nbsd_vec)		 tb="$tb vaxnetbsd.lo aout32.lo" ;;
+    vax_aout_1knbsd_vec)	 tb="$tb vax1knetbsd.lo aout32.lo" ;;
+    vax_aout_bsd_vec)		 tb="$tb vaxbsd.lo aout32.lo" ;;
+    m68k_versados_vec)		 tb="$tb versados.lo" ;;
+    alpha_vms_vec)		 tb="$tb vms-alpha.lo vms-misc.lo vms-lib.lo"; target_size=64 ;;
+    alpha_vms_lib_txt_vec)	 tb="$tb vms-lib.lo vms-misc.lo" ;;
+    w65_coff_vec)		 tb="$tb coff-w65.lo reloc16.lo" ;;
+    we32k_coff_vec)		 tb="$tb coff-we32k.lo" ;;
+    z80_coff_vec)		 tb="$tb coff-z80.lo reloc16.lo" ;;
+    z8k_coff_vec)		 tb="$tb coff-z8k.lo reloc16.lo cofflink.lo" ;;
 
     # These appear out of order in targets.c
-    srec_vec)			tb="$tb srec.lo" ;;
-    symbolsrec_vec)		tb="$tb srec.lo" ;;
-    tekhex_vec)			tb="$tb tekhex.lo" ;;
-    cisco_core_big_vec)		tb="$tb cisco-core.lo" ;;
-    cisco_core_little_vec)	tb="$tb cisco-core.lo" ;;
+    srec_vec)			 tb="$tb srec.lo" ;;
+    symbolsrec_vec)		 tb="$tb srec.lo" ;;
+    tekhex_vec)			 tb="$tb tekhex.lo" ;;
+    core_cisco_be_vec)		 tb="$tb cisco-core.lo" ;;
+    core_cisco_le_vec)		 tb="$tb cisco-core.lo" ;;
 
-    "")			;;
+    "")				 ;;
     *) AC_MSG_ERROR(*** unknown target vector $vec) ;;
     esac
 
diff --git a/bfd/demo64.c b/bfd/demo64.c
index 283ff85..83db63e 100644
--- a/bfd/demo64.c
+++ b/bfd/demo64.c
@@ -24,7 +24,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (demo_64_,OP)
+#define MY(OP) CONCAT2 (aout64_,OP)
 
 #define TARGETNAME  "demo64"
 #include "aoutf1.h"
diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c
index 93131f1..86872b7 100644
--- a/bfd/elf-m10200.c
+++ b/bfd/elf-m10200.c
@@ -1374,7 +1374,7 @@ mn10200_elf_get_relocated_section_contents (bfd *output_bfd,
   return NULL;
 }
 
-#define TARGET_LITTLE_SYM	bfd_elf32_mn10200_vec
+#define TARGET_LITTLE_SYM	mn10200_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-mn10200"
 #define ELF_ARCH		bfd_arch_mn10200
 #define ELF_MACHINE_CODE	EM_MN10200
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 41d6b38..68307de 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -5560,7 +5560,7 @@ mn10300_elf_mkobject (bfd *abfd)
 #define bfd_elf32_mkobject	mn10300_elf_mkobject
 
 #ifndef ELF_ARCH
-#define TARGET_LITTLE_SYM	bfd_elf32_mn10300_vec
+#define TARGET_LITTLE_SYM	mn10300_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-mn10300"
 #define ELF_ARCH		bfd_arch_mn10300
 #define ELF_TARGET_ID		MN10300_ELF_DATA
diff --git a/bfd/elf32-am33lin.c b/bfd/elf32-am33lin.c
index cc3fe0c..c28308d 100644
--- a/bfd/elf32-am33lin.c
+++ b/bfd/elf32-am33lin.c
@@ -25,7 +25,7 @@
 
 #define elf_symbol_leading_char 0
 
-#define TARGET_LITTLE_SYM	bfd_elf32_am33lin_vec
+#define TARGET_LITTLE_SYM	am33_elf32_linux_vec
 #define TARGET_LITTLE_NAME	"elf32-am33lin"
 #define ELF_ARCH		bfd_arch_mn10300
 #define ELF_MACHINE_CODE	EM_MN10300
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
index b0c49ff..e528e66 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
@@ -236,9 +236,9 @@ arc_elf_final_write_processing (bfd *abfd,
   elf_elfheader (abfd)->e_flags |= val;
 }
 
-#define TARGET_LITTLE_SYM   bfd_elf32_littlearc_vec
+#define TARGET_LITTLE_SYM   arc_elf32_le_vec
 #define TARGET_LITTLE_NAME  "elf32-littlearc"
-#define TARGET_BIG_SYM      bfd_elf32_bigarc_vec
+#define TARGET_BIG_SYM      arc_elf32_be_vec
 #define TARGET_BIG_NAME	    "elf32-bigarc"
 #define ELF_ARCH            bfd_arch_arc
 #define ELF_MACHINE_CODE    EM_ARC
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 16467a4..526d4f8 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -2040,9 +2040,9 @@ elf32_arm_nabi_write_core_note (bfd *abfd, char *buf, int *bufsiz,
     }
 }
 
-#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_vec
+#define TARGET_LITTLE_SYM               arm_elf32_le_vec
 #define TARGET_LITTLE_NAME              "elf32-littlearm"
-#define TARGET_BIG_SYM                  bfd_elf32_bigarm_vec
+#define TARGET_BIG_SYM                  arm_elf32_be_vec
 #define TARGET_BIG_NAME                 "elf32-bigarm"
 
 #define elf_backend_grok_prstatus	elf32_arm_nabi_grok_prstatus
@@ -16170,11 +16170,11 @@ elf32_arm_get_synthetic_symtab (bfd *abfd,
 /* Native Client targets.  */
 
 #undef	TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		bfd_elf32_littlearm_nacl_vec
+#define TARGET_LITTLE_SYM		arm_elf32_nacl_le_vec
 #undef	TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		"elf32-littlearm-nacl"
 #undef	TARGET_BIG_SYM
-#define TARGET_BIG_SYM			bfd_elf32_bigarm_nacl_vec
+#define TARGET_BIG_SYM			arm_elf32_nacl_be_vec
 #undef	TARGET_BIG_NAME
 #define TARGET_BIG_NAME			"elf32-bigarm-nacl"
 
@@ -16268,11 +16268,11 @@ elf32_arm_nacl_plt_sym_val (bfd_vma i, const asection *plt,
 /* VxWorks Targets.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_vxworks_vec
+#define TARGET_LITTLE_SYM               arm_elf32_vxworks_le_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME              "elf32-littlearm-vxworks"
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM                  bfd_elf32_bigarm_vxworks_vec
+#define TARGET_BIG_SYM                  arm_elf32_vxworks_be_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME                 "elf32-bigarm-vxworks"
 
@@ -16554,11 +16554,11 @@ elf32_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
 /* Symbian OS Targets.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_symbian_vec
+#define TARGET_LITTLE_SYM               arm_elf32_symbian_le_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME              "elf32-littlearm-symbian"
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM                  bfd_elf32_bigarm_symbian_vec
+#define TARGET_BIG_SYM                  arm_elf32_symbian_be_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME                 "elf32-bigarm-symbian"
 
diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
index 425e2d1..45710a1 100644
--- a/bfd/elf32-avr.c
+++ b/bfd/elf32-avr.c
@@ -3245,7 +3245,7 @@ elf32_avr_build_stubs (struct bfd_link_info *info)
 #define ELF_MACHINE_ALT1	EM_AVR_OLD
 #define ELF_MAXPAGESIZE		1
 
-#define TARGET_LITTLE_SYM       bfd_elf32_avr_vec
+#define TARGET_LITTLE_SYM       avr_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-avr"
 
 #define bfd_elf32_bfd_link_hash_table_create elf32_avr_link_hash_table_create
diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
index a4de709..692875b 100644
--- a/bfd/elf32-bfin.c
+++ b/bfd/elf32-bfin.c
@@ -1732,8 +1732,8 @@ bfin_gc_sweep_hook (bfd * abfd,
   return TRUE;
 }
 
-extern const bfd_target bfd_elf32_bfinfdpic_vec;
-#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_bfinfdpic_vec)
+extern const bfd_target bfin_elf32_fdpic_vec;
+#define IS_FDPIC(bfd) ((bfd)->xvec == &bfin_elf32_fdpic_vec)
 
 /* An extension of the elf hash table data structure,
    containing some additional Blackfin-specific data.  */
@@ -5624,7 +5624,7 @@ struct bfd_elf_special_section const elf32_bfin_special_sections[] =
 };
 
 
-#define TARGET_LITTLE_SYM		bfd_elf32_bfin_vec
+#define TARGET_LITTLE_SYM		bfin_elf32_vec
 #define TARGET_LITTLE_NAME		"elf32-bfin"
 #define ELF_ARCH			bfd_arch_bfin
 #define ELF_TARGET_ID			BFIN_ELF_DATA
@@ -5686,7 +5686,7 @@ struct bfd_elf_special_section const elf32_bfin_special_sections[] =
 #include "elf32-target.h"
 
 #undef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM          bfd_elf32_bfinfdpic_vec
+#define TARGET_LITTLE_SYM          bfin_elf32_fdpic_vec
 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		"elf32-bfinfdpic"
 #undef	elf32_bed
diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
index 5e108c9..f16f1c6 100644
--- a/bfd/elf32-cr16.c
+++ b/bfd/elf32-cr16.c
@@ -2935,7 +2935,7 @@ _bfd_cr16_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSE
 }
 
 /* Definitions for setting CR16 target vector.  */
-#define TARGET_LITTLE_SYM                 bfd_elf32_cr16_vec
+#define TARGET_LITTLE_SYM                 cr16_elf32_vec
 #define TARGET_LITTLE_NAME                "elf32-cr16"
 #define ELF_ARCH                          bfd_arch_cr16
 #define ELF_MACHINE_CODE                  EM_CR16
diff --git a/bfd/elf32-cr16c.c b/bfd/elf32-cr16c.c
index 11343e0..cf4503c 100644
--- a/bfd/elf32-cr16c.c
+++ b/bfd/elf32-cr16c.c
@@ -939,7 +939,7 @@ elf32_cr16c_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED
 }
 
 /* Definitions for setting CR16C target vector.  */
-#define TARGET_LITTLE_SYM		bfd_elf32_cr16c_vec
+#define TARGET_LITTLE_SYM		cr16c_elf32_vec
 #define TARGET_LITTLE_NAME		"elf32-cr16c"
 #define ELF_ARCH			bfd_arch_cr16c
 #define ELF_MACHINE_CODE		EM_CR
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index e3ea978..9b2b956 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -4334,7 +4334,7 @@ elf_cris_got_elt_size (bfd *abfd ATTRIBUTE_UNUSED,
 #define ELF_MACHINE_CODE	EM_CRIS
 #define ELF_MAXPAGESIZE		0x2000
 
-#define TARGET_LITTLE_SYM	bfd_elf32_cris_vec
+#define TARGET_LITTLE_SYM	cris_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-cris"
 #define elf_symbol_leading_char 0
 
@@ -4403,7 +4403,7 @@ elf_cris_got_elt_size (bfd *abfd ATTRIBUTE_UNUSED,
 #undef TARGET_LITTLE_NAME
 #undef elf_symbol_leading_char
 
-#define TARGET_LITTLE_SYM bfd_elf32_us_cris_vec
+#define TARGET_LITTLE_SYM cris_elf32_us_vec
 #define TARGET_LITTLE_NAME "elf32-us-cris"
 #define elf_symbol_leading_char '_'
 #undef elf32_bed
diff --git a/bfd/elf32-crx.c b/bfd/elf32-crx.c
index 1c6cb57..f2925f5 100644
--- a/bfd/elf32-crx.c
+++ b/bfd/elf32-crx.c
@@ -1308,7 +1308,7 @@ elf32_crx_relax_section (bfd *abfd, asection *sec,
 }
 
 /* Definitions for setting CRX target vector.  */
-#define TARGET_LITTLE_SYM		bfd_elf32_crx_vec
+#define TARGET_LITTLE_SYM		crx_elf32_vec
 #define TARGET_LITTLE_NAME		"elf32-crx"
 #define ELF_ARCH			bfd_arch_crx
 #define ELF_MACHINE_CODE		EM_CRX
diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
index 8ba7583..f45e2db 100644
--- a/bfd/elf32-d10v.c
+++ b/bfd/elf32-d10v.c
@@ -541,7 +541,7 @@ elf32_d10v_relocate_section (bfd *output_bfd,
 #define ELF_MACHINE_ALT1	EM_CYGNUS_D10V
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_d10v_vec
+#define TARGET_BIG_SYM          d10v_elf32_vec
 #define TARGET_BIG_NAME		"elf32-d10v"
 
 #define elf_info_to_howto	             0
diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
index 30fbb6d..211a673 100644
--- a/bfd/elf32-d30v.c
+++ b/bfd/elf32-d30v.c
@@ -539,7 +539,7 @@ d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
 #define ELF_MACHINE_ALT1	EM_CYGNUS_D30V
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_d30v_vec
+#define TARGET_BIG_SYM          d30v_elf32_vec
 #define TARGET_BIG_NAME		"elf32-d30v"
 
 #define elf_info_to_howto	d30v_info_to_howto_rela
diff --git a/bfd/elf32-dlx.c b/bfd/elf32-dlx.c
index 8471b28..91441aa 100644
--- a/bfd/elf32-dlx.c
+++ b/bfd/elf32-dlx.c
@@ -571,7 +571,7 @@ elf32_dlx_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
   return;
 }
 
-#define TARGET_BIG_SYM          bfd_elf32_dlx_big_vec
+#define TARGET_BIG_SYM          dlx_elf32_be_vec
 #define TARGET_BIG_NAME         "elf32-dlx"
 #define ELF_ARCH                bfd_arch_dlx
 #define ELF_MACHINE_CODE        EM_DLX
diff --git a/bfd/elf32-epiphany.c b/bfd/elf32-epiphany.c
index 61bb527..8d95cc9 100644
--- a/bfd/elf32-epiphany.c
+++ b/bfd/elf32-epiphany.c
@@ -585,7 +585,7 @@ epiphany_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
 }
 
 /* We only have a little-endian target.  */
-#define TARGET_LITTLE_SYM	 bfd_elf32_epiphany_vec
+#define TARGET_LITTLE_SYM	 epiphany_elf32_vec
 #define TARGET_LITTLE_NAME  "elf32-epiphany"
 
 #define ELF_ARCH	 bfd_arch_epiphany
diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
index 73b2d91..022a0a9 100644
--- a/bfd/elf32-fr30.c
+++ b/bfd/elf32-fr30.c
@@ -703,7 +703,7 @@ fr30_elf_check_relocs (bfd *abfd,
 #define ELF_MACHINE_ALT1	EM_CYGNUS_FR30
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_fr30_vec
+#define TARGET_BIG_SYM          fr30_elf32_vec
 #define TARGET_BIG_NAME		"elf32-fr30"
 
 #define elf_info_to_howto_rel			NULL
diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index 3cbc1b8..46f299b 100644
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -796,8 +796,8 @@ static reloc_howto_type elf32_frv_rel_tlsoff_howto =
 
 
 
-extern const bfd_target bfd_elf32_frvfdpic_vec;
-#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_frvfdpic_vec)
+extern const bfd_target frv_elf32_fdpic_vec;
+#define IS_FDPIC(bfd) ((bfd)->xvec == &frv_elf32_fdpic_vec)
 
 /* An extension of the elf hash table data structure, containing some
    additional FRV-specific data.  */
@@ -6777,7 +6777,7 @@ elf32_frv_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 #define ELF_MACHINE_CODE	EM_CYGNUS_FRV
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_frv_vec
+#define TARGET_BIG_SYM          frv_elf32_vec
 #define TARGET_BIG_NAME		"elf32-frv"
 
 #define elf_info_to_howto			frv_info_to_howto_rela
@@ -6816,7 +6816,7 @@ elf32_frv_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 #define ELF_MAXPAGESIZE		0x4000
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM          bfd_elf32_frvfdpic_vec
+#define TARGET_BIG_SYM          frv_elf32_fdpic_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-frvfdpic"
 #undef	elf32_bed
diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
index dd0c1b7..412fefd 100644
--- a/bfd/elf32-gen.c
+++ b/bfd/elf32-gen.c
@@ -86,9 +86,9 @@ elf32_generic_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
   return bfd_elf_link_add_symbols (abfd, info);
 }
 
-#define TARGET_LITTLE_SYM		bfd_elf32_little_generic_vec
+#define TARGET_LITTLE_SYM		elf32_le_vec
 #define TARGET_LITTLE_NAME		"elf32-little"
-#define TARGET_BIG_SYM			bfd_elf32_big_generic_vec
+#define TARGET_BIG_SYM			elf32_be_vec
 #define TARGET_BIG_NAME			"elf32-big"
 #define ELF_ARCH			bfd_arch_unknown
 #define ELF_MACHINE_CODE		EM_NONE
diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c
index 21dc4ac..e9eae94 100644
--- a/bfd/elf32-h8300.c
+++ b/bfd/elf32-h8300.c
@@ -1705,7 +1705,7 @@ elf32_h8_get_relocated_section_contents (bfd *output_bfd,
 }
 
 
-#define TARGET_BIG_SYM			bfd_elf32_h8300_vec
+#define TARGET_BIG_SYM			h8300_elf32_vec
 #define TARGET_BIG_NAME			"elf32-h8300"
 #define ELF_ARCH			bfd_arch_h8300
 #define ELF_MACHINE_CODE		EM_H8_300
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 95d7955..1cc419c 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -4656,7 +4656,7 @@ elf32_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
 #define elf_backend_got_header_size	     8
 #define elf_backend_rela_normal		     1
 
-#define TARGET_BIG_SYM		bfd_elf32_hppa_vec
+#define TARGET_BIG_SYM		hppa_elf32_vec
 #define TARGET_BIG_NAME		"elf32-hppa"
 #define ELF_ARCH		bfd_arch_hppa
 #define ELF_TARGET_ID		HPPA32_ELF_DATA
@@ -4668,7 +4668,7 @@ elf32_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
 #include "elf32-target.h"
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM		bfd_elf32_hppa_linux_vec
+#define TARGET_BIG_SYM		hppa_elf32_linux_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-hppa-linux"
 #undef ELF_OSABI
@@ -4679,7 +4679,7 @@ elf32_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
 #include "elf32-target.h"
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM		bfd_elf32_hppa_nbsd_vec
+#define TARGET_BIG_SYM		hppa_elf32_nbsd_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-hppa-netbsd"
 #undef ELF_OSABI
diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c
index 2f8de92..0508aeb 100644
--- a/bfd/elf32-i370.c
+++ b/bfd/elf32-i370.c
@@ -1356,7 +1356,7 @@ i370_elf_relocate_section (bfd *output_bfd,
   return ret;
 }
 
-#define TARGET_BIG_SYM		bfd_elf32_i370_vec
+#define TARGET_BIG_SYM		i370_elf32_vec
 #define TARGET_BIG_NAME		"elf32-i370"
 #define ELF_ARCH		bfd_arch_i370
 #define ELF_MACHINE_CODE	EM_S370
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index af2011e..4470c52 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -5018,7 +5018,7 @@ elf_i386_add_symbol_hook (bfd * abfd,
   return TRUE;
 }
 
-#define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
+#define TARGET_LITTLE_SYM		i386_elf32_vec
 #define TARGET_LITTLE_NAME		"elf32-i386"
 #define ELF_ARCH			bfd_arch_i386
 #define ELF_TARGET_ID			I386_ELF_DATA
@@ -5072,7 +5072,7 @@ elf_i386_add_symbol_hook (bfd * abfd,
 /* FreeBSD support.  */
 
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_i386_freebsd_vec
+#define	TARGET_LITTLE_SYM		i386_elf32_fbsd_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-i386-freebsd"
 #undef	ELF_OSABI
@@ -5105,7 +5105,7 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
 /* Solaris 2.  */
 
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_i386_sol2_vec
+#define	TARGET_LITTLE_SYM		i386_elf32_sol2_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-i386-sol2"
 
@@ -5133,7 +5133,7 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
 /* Native Client support.  */
 
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_i386_nacl_vec
+#define	TARGET_LITTLE_SYM		i386_elf32_nacl_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-i386-nacl"
 #undef	elf32_bed
@@ -5322,7 +5322,7 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
 /* VxWorks support.  */
 
 #undef	TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		bfd_elf32_i386_vxworks_vec
+#define TARGET_LITTLE_SYM		i386_elf32_vxworks_vec
 #undef	TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		"elf32-i386-vxworks"
 #undef	ELF_OSABI
diff --git a/bfd/elf32-i860.c b/bfd/elf32-i860.c
index 0ce2bd8..de900c1 100644
--- a/bfd/elf32-i860.c
+++ b/bfd/elf32-i860.c
@@ -1249,9 +1249,9 @@ elf32_i860_is_local_label_name (bfd *abfd, const char *name)
   return _bfd_elf_is_local_label_name (abfd, name);
 }
 
-#define TARGET_BIG_SYM		bfd_elf32_i860_vec
+#define TARGET_BIG_SYM		i860_elf32_vec
 #define TARGET_BIG_NAME		"elf32-i860"
-#define TARGET_LITTLE_SYM	bfd_elf32_i860_little_vec
+#define TARGET_LITTLE_SYM	i860_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-i860-little"
 #define ELF_ARCH		bfd_arch_i860
 #define ELF_MACHINE_CODE	EM_860
diff --git a/bfd/elf32-i960.c b/bfd/elf32-i960.c
index 69d9744..c6fbbb8 100644
--- a/bfd/elf32-i960.c
+++ b/bfd/elf32-i960.c
@@ -158,7 +158,7 @@ elf32_i960_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
   return NULL;
 }
 
-#define TARGET_LITTLE_SYM	bfd_elf32_i960_vec
+#define TARGET_LITTLE_SYM	i960_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-i960"
 #define ELF_ARCH		bfd_arch_i960
 #define ELF_MACHINE_CODE	EM_960
diff --git a/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c
index e2d7659..79e1ecc 100644
--- a/bfd/elf32-ip2k.c
+++ b/bfd/elf32-ip2k.c
@@ -1495,7 +1495,7 @@ ip2k_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
   return TRUE;
 }
 
-#define TARGET_BIG_SYM	 bfd_elf32_ip2k_vec
+#define TARGET_BIG_SYM	 ip2k_elf32_vec
 #define TARGET_BIG_NAME  "elf32-ip2k"
 
 #define ELF_ARCH	 bfd_arch_ip2k
diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c
index 9b6a8c5..a6bf8d2 100644
--- a/bfd/elf32-iq2000.c
+++ b/bfd/elf32-iq2000.c
@@ -893,7 +893,7 @@ iq2000_elf_object_p (bfd *abfd)
 #define ELF_MACHINE_CODE	EM_IQ2000
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM		bfd_elf32_iq2000_vec
+#define TARGET_BIG_SYM		iq2000_elf32_vec
 #define TARGET_BIG_NAME		"elf32-iq2000"
 
 #define elf_info_to_howto_rel			NULL
diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c
index f94c7b9..98db714 100644
--- a/bfd/elf32-lm32.c
+++ b/bfd/elf32-lm32.c
@@ -43,9 +43,9 @@
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
 
-extern const bfd_target bfd_elf32_lm32fdpic_vec;
+extern const bfd_target lm32_elf32_fdpic_vec;
 
-#define IS_FDPIC(bfd) ((bfd)->xvec == &bfd_elf32_lm32fdpic_vec)
+#define IS_FDPIC(bfd) ((bfd)->xvec == &lm32_elf32_fdpic_vec)
 
 static bfd_reloc_status_type lm32_elf_gprel_reloc
   (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
@@ -2674,7 +2674,7 @@ lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
 #define ELF_MACHINE_CODE        EM_LATTICEMICO32
 #define ELF_MAXPAGESIZE         0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_lm32_vec
+#define TARGET_BIG_SYM          lm32_elf32_vec
 #define TARGET_BIG_NAME         "elf32-lm32"
 
 #define bfd_elf32_bfd_reloc_type_lookup         lm32_reloc_type_lookup
@@ -2712,7 +2712,7 @@ lm32_elf_fdpic_copy_private_bfd_data (bfd *ibfd, bfd *obfd)
 
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM          bfd_elf32_lm32fdpic_vec
+#define TARGET_BIG_SYM          lm32_elf32_fdpic_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-lm32fdpic"
 #undef	elf32_bed
diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c
index b0428eb..82152dc 100644
--- a/bfd/elf32-m32c.c
+++ b/bfd/elf32-m32c.c
@@ -2043,10 +2043,10 @@ _bfd_m32c_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED)
 #define ELF_MAXPAGESIZE		0x100
 
 #if 0
-#define TARGET_BIG_SYM		bfd_elf32_m32c_vec
+#define TARGET_BIG_SYM		m32c_elf32_vec
 #define TARGET_BIG_NAME		"elf32-m32c"
 #else
-#define TARGET_LITTLE_SYM		bfd_elf32_m32c_vec
+#define TARGET_LITTLE_SYM		m32c_elf32_vec
 #define TARGET_LITTLE_NAME		"elf32-m32c"
 #endif
 
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index 5f4d05c..0adeb97 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -4004,9 +4004,9 @@ m32r_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
 #define ELF_MACHINE_ALT1	EM_CYGNUS_M32R
 #define ELF_MAXPAGESIZE		0x1 /* Explicitly requested by Mitsubishi.  */
 
-#define TARGET_BIG_SYM          bfd_elf32_m32r_vec
+#define TARGET_BIG_SYM          m32r_elf32_vec
 #define TARGET_BIG_NAME		"elf32-m32r"
-#define TARGET_LITTLE_SYM       bfd_elf32_m32rle_vec
+#define TARGET_LITTLE_SYM       m32r_elf32_le_vec
 #define TARGET_LITTLE_NAME      "elf32-m32rle"
 
 #define elf_info_to_howto			m32r_info_to_howto
@@ -4062,11 +4062,11 @@ m32r_elf_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
 #define ELF_MAXPAGESIZE         0x1000
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM          bfd_elf32_m32rlin_vec
+#define TARGET_BIG_SYM          m32r_elf32_linux_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME         "elf32-m32r-linux"
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM       bfd_elf32_m32rlelin_vec
+#define TARGET_LITTLE_SYM       m32r_elf32_linux_le_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME      "elf32-m32rle-linux"
 #undef  elf32_bed
diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
index e05c646..4b2c16e 100644
--- a/bfd/elf32-m68hc11.c
+++ b/bfd/elf32-m68hc11.c
@@ -1288,7 +1288,7 @@ static const struct bfd_elf_special_section elf32_m68hc11_special_sections[] =
 #define ELF_MACHINE_CODE	EM_68HC11
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_m68hc11_vec
+#define TARGET_BIG_SYM          m68hc11_elf32_vec
 #define TARGET_BIG_NAME		"elf32-m68hc11"
 
 #define elf_info_to_howto	0
diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
index d98fbfd..f643c37 100644
--- a/bfd/elf32-m68hc12.c
+++ b/bfd/elf32-m68hc12.c
@@ -638,7 +638,7 @@ static const struct bfd_elf_special_section elf32_m68hc12_special_sections[] =
 #define ELF_MACHINE_CODE	EM_68HC12
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          bfd_elf32_m68hc12_vec
+#define TARGET_BIG_SYM          m68hc12_elf32_vec
 #define TARGET_BIG_NAME		"elf32-m68hc12"
 
 #define elf_info_to_howto	0
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index a28e74e..44e302a 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -4849,7 +4849,7 @@ elf_m68k_add_symbol_hook (bfd *abfd,
   return TRUE;
 }
 
-#define TARGET_BIG_SYM			bfd_elf32_m68k_vec
+#define TARGET_BIG_SYM			m68k_elf32_vec
 #define TARGET_BIG_NAME			"elf32-m68k"
 #define ELF_MACHINE_CODE		EM_68K
 #define ELF_MAXPAGESIZE			0x2000
diff --git a/bfd/elf32-m88k.c b/bfd/elf32-m88k.c
index 709cbea..487cc0c 100644
--- a/bfd/elf32-m88k.c
+++ b/bfd/elf32-m88k.c
@@ -26,7 +26,7 @@
 /* This does not include any relocations, but should be good enough
    for GDB.  */
 
-#define TARGET_BIG_SYM		bfd_elf32_m88k_vec
+#define TARGET_BIG_SYM		m88k_elf32_vec
 #define TARGET_BIG_NAME		"elf32-m88k"
 #define ELF_ARCH		bfd_arch_m88k
 #define ELF_MACHINE_CODE	EM_88K
diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
index 3981bb8..903d379 100644
--- a/bfd/elf32-mcore.c
+++ b/bfd/elf32-mcore.c
@@ -648,9 +648,9 @@ static const struct bfd_elf_special_section mcore_elf_special_sections[]=
   { NULL,                     0,  0, 0,            0 }
 };
 
-#define TARGET_BIG_SYM		bfd_elf32_mcore_big_vec
+#define TARGET_BIG_SYM		mcore_elf32_be_vec
 #define TARGET_BIG_NAME		"elf32-mcore-big"
-#define TARGET_LITTLE_SYM       bfd_elf32_mcore_little_vec
+#define TARGET_LITTLE_SYM       mcore_elf32_le_vec
 #define TARGET_LITTLE_NAME      "elf32-mcore-little"
 
 #define ELF_ARCH		bfd_arch_mcore
diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c
index 8d76b23..548359f 100644
--- a/bfd/elf32-mep.c
+++ b/bfd/elf32-mep.c
@@ -745,10 +745,10 @@ mep_elf_fake_sections (bfd *               abfd ATTRIBUTE_UNUSED,
 #define ELF_MACHINE_CODE	EM_CYGNUS_MEP
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM		bfd_elf32_mep_vec
+#define TARGET_BIG_SYM		mep_elf32_vec
 #define TARGET_BIG_NAME		"elf32-mep"
 
-#define TARGET_LITTLE_SYM	bfd_elf32_mep_little_vec
+#define TARGET_LITTLE_SYM	mep_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-mep-little"
 
 #define elf_info_to_howto_rel			NULL
diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
index e9c5290..d1d4b41 100644
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
@@ -4284,7 +4284,7 @@ elf_metag_plt_sym_val (bfd_vma i, const asection *plt,
 #define ELF_MAXPAGESIZE	0x4000
 #define ELF_COMMONPAGESIZE	0x1000
 
-#define TARGET_LITTLE_SYM	bfd_elf32_metag_vec
+#define TARGET_LITTLE_SYM	metag_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-metag"
 
 #define elf_symbol_leading_char '_'
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index 537403c..9837b18 100644
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -3466,10 +3466,10 @@ microblaze_elf_add_symbol_hook (bfd *abfd,
   return TRUE;
 }
 
-#define TARGET_LITTLE_SYM      bfd_elf32_microblazeel_vec
+#define TARGET_LITTLE_SYM      microblaze_elf32_le_vec
 #define TARGET_LITTLE_NAME     "elf32-microblazeel"
 
-#define TARGET_BIG_SYM          bfd_elf32_microblaze_vec
+#define TARGET_BIG_SYM          microblaze_elf32_vec
 #define TARGET_BIG_NAME		"elf32-microblaze"
 
 #define ELF_ARCH		bfd_arch_microblaze
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index e0342e0..1de302f 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -82,8 +82,8 @@ static bfd_boolean elf32_mips_grok_psinfo
 static irix_compat_t elf32_mips_irix_compat
   (bfd *);
 
-extern const bfd_target bfd_elf32_bigmips_vec;
-extern const bfd_target bfd_elf32_littlemips_vec;
+extern const bfd_target mips_elf32_be_vec;
+extern const bfd_target mips_elf32_le_vec;
 
 /* Nonzero if ABFD is using the N32 ABI.  */
 #define ABI_N32_P(abfd) \
@@ -2259,8 +2259,8 @@ elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 static irix_compat_t
 elf32_mips_irix_compat (bfd *abfd)
 {
-  if ((abfd->xvec == &bfd_elf32_bigmips_vec)
-      || (abfd->xvec == &bfd_elf32_littlemips_vec))
+  if ((abfd->xvec == &mips_elf32_be_vec)
+      || (abfd->xvec == &mips_elf32_le_vec))
     return ict_irix5;
   else
     return ict_none;
@@ -2395,9 +2395,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #define bfd_elf32_mkobject		_bfd_mips_elf_mkobject
 
 /* Support for SGI-ish mips targets.  */
-#define TARGET_LITTLE_SYM		bfd_elf32_littlemips_vec
+#define TARGET_LITTLE_SYM		mips_elf32_le_vec
 #define TARGET_LITTLE_NAME		"elf32-littlemips"
-#define TARGET_BIG_SYM			bfd_elf32_bigmips_vec
+#define TARGET_BIG_SYM			mips_elf32_be_vec
 #define TARGET_BIG_NAME			"elf32-bigmips"
 
 /* The SVR4 MIPS ABI says that this should be 0x10000, but Irix 5 uses
@@ -2416,9 +2416,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #undef ELF_MAXPAGESIZE
 #undef ELF_COMMONPAGESIZE
 
-#define TARGET_LITTLE_SYM               bfd_elf32_tradlittlemips_vec
+#define TARGET_LITTLE_SYM               mips_elf32_trad_le_vec
 #define TARGET_LITTLE_NAME              "elf32-tradlittlemips"
-#define TARGET_BIG_SYM                  bfd_elf32_tradbigmips_vec
+#define TARGET_BIG_SYM                  mips_elf32_trad_be_vec
 #define TARGET_BIG_NAME                 "elf32-tradbigmips"
 
 /* The MIPS ABI says at Page 5-1:
@@ -2440,9 +2440,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #undef TARGET_BIG_SYM
 #undef TARGET_BIG_NAME
 
-#define	TARGET_LITTLE_SYM		bfd_elf32_tradlittlemips_freebsd_vec
+#define	TARGET_LITTLE_SYM		mips_elf32_tradfbsd_le_vec
 #define	TARGET_LITTLE_NAME		"elf32-tradlittlemips-freebsd"
-#define	TARGET_BIG_SYM			bfd_elf32_tradbigmips_freebsd_vec
+#define	TARGET_BIG_SYM			mips_elf32_tradfbsd_be_vec
 #define	TARGET_BIG_NAME			"elf32-tradbigmips-freebsd"
 
 #undef	ELF_OSABI
@@ -2469,9 +2469,9 @@ mips_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
 #undef ELF_MAXPAGESIZE
 #undef ELF_COMMONPAGESIZE
 
-#define TARGET_LITTLE_SYM               bfd_elf32_littlemips_vxworks_vec
+#define TARGET_LITTLE_SYM               mips_elf32_vxworks_le_vec
 #define TARGET_LITTLE_NAME              "elf32-littlemips-vxworks"
-#define TARGET_BIG_SYM                  bfd_elf32_bigmips_vxworks_vec
+#define TARGET_BIG_SYM                  mips_elf32_vxworks_be_vec
 #define TARGET_BIG_NAME                 "elf32-bigmips-vxworks"
 #undef	ELF_OSABI
 
diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c
index 5a4fd85..1f685b9 100644
--- a/bfd/elf32-moxie.c
+++ b/bfd/elf32-moxie.c
@@ -369,9 +369,9 @@ moxie_elf_check_relocs (bfd *abfd,
 #define ELF_MACHINE_CODE	EM_MOXIE
 #define ELF_MAXPAGESIZE		0x1
 
-#define TARGET_BIG_SYM          bfd_elf32_bigmoxie_vec
+#define TARGET_BIG_SYM          moxie_elf32_be_vec
 #define TARGET_BIG_NAME		"elf32-bigmoxie"
-#define TARGET_LITTLE_SYM       bfd_elf32_littlemoxie_vec
+#define TARGET_LITTLE_SYM       moxie_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-littlemoxie"
 
 #define elf_info_to_howto_rel			NULL
diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index 89c062b..c2d168c 100644
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -549,10 +549,10 @@ static const struct msp430_reloc_map msp430x_reloc_map[] =
 static inline bfd_boolean
 uses_msp430x_relocs (bfd * abfd)
 {
-  extern const bfd_target bfd_elf32_msp430_ti_vec;
+  extern const bfd_target msp430_elf32_ti_vec;
 
   return bfd_get_mach (abfd) == bfd_mach_msp430x
-    || abfd->xvec == & bfd_elf32_msp430_ti_vec;
+    || abfd->xvec == & msp430_elf32_ti_vec;
 }
 
 static reloc_howto_type *
@@ -2436,7 +2436,7 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym)
 #define ELF_MAXPAGESIZE		4
 #define	ELF_OSABI		ELFOSABI_STANDALONE
 
-#define TARGET_LITTLE_SYM       bfd_elf32_msp430_vec
+#define TARGET_LITTLE_SYM       msp430_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-msp430"
 
 #define elf_info_to_howto	             msp430_info_to_howto_rela
@@ -2456,7 +2456,7 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym)
 
 /* The TI compiler sets the OSABI field to ELFOSABI_NONE.  */
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM       bfd_elf32_msp430_ti_vec
+#define TARGET_LITTLE_SYM       msp430_elf32_ti_vec
 
 #undef  elf32_bed
 #define elf32_bed		elf32_msp430_ti_bed
diff --git a/bfd/elf32-mt.c b/bfd/elf32-mt.c
index a0e163c..6df1521 100644
--- a/bfd/elf32-mt.c
+++ b/bfd/elf32-mt.c
@@ -573,7 +573,7 @@ mt_elf_print_private_bfd_data (bfd * abfd, void * ptr)
 }
 
 
-#define TARGET_BIG_SYM	 bfd_elf32_mt_vec
+#define TARGET_BIG_SYM	 mt_elf32_vec
 #define TARGET_BIG_NAME  "elf32-mt"
 
 #define ELF_ARCH	 bfd_arch_mt
diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
index a2e78ed..873a00f 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
@@ -14207,9 +14207,9 @@ nds32_elf_ex9_itb_base (struct bfd_link_info *link_info)
 #define ELF_MACHINE_CODE			EM_NDS32
 #define ELF_MAXPAGESIZE				0x1000
 
-#define TARGET_BIG_SYM				bfd_elf32_nds32be_vec
+#define TARGET_BIG_SYM				nds32_elf32_be_vec
 #define TARGET_BIG_NAME				"elf32-nds32be"
-#define TARGET_LITTLE_SYM			bfd_elf32_nds32le_vec
+#define TARGET_LITTLE_SYM			nds32_elf32_le_vec
 #define TARGET_LITTLE_NAME			"elf32-nds32le"
 
 #define elf_info_to_howto			nds32_info_to_howto
@@ -14258,11 +14258,11 @@ nds32_elf_ex9_itb_base (struct bfd_link_info *link_info)
 #define ELF_MAXPAGESIZE				0x2000
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM				bfd_elf32_nds32belin_vec
+#define TARGET_BIG_SYM				nds32_elf32_linux_be_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME				"elf32-nds32be-linux"
 #undef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM			bfd_elf32_nds32lelin_vec
+#define TARGET_LITTLE_SYM			nds32_elf32_linux_le_vec
 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME			"elf32-nds32le-linux"
 #undef elf32_bed
diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
index 678f2e3..f33b38a 100644
--- a/bfd/elf32-nios2.c
+++ b/bfd/elf32-nios2.c
@@ -68,8 +68,8 @@ static bfd_reloc_status_type nios2_elf32_callr_relocate
   (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
 
 /* Target vector.  */
-extern const bfd_target bfd_elf32_littlenios2_vec;
-extern const bfd_target bfd_elf32_bignios2_vec;
+extern const bfd_target nios2_elf32_le_vec;
+extern const bfd_target nios2_elf32_be_vec;
 
 /* Offset of tp and dtp pointers from start of TLS block.  */
 #define TP_OFFSET	0x7000
@@ -5167,8 +5167,8 @@ nios2_elf32_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
 static bfd_boolean
 is_nios2_elf_target (const struct bfd_target *targ)
 {
-  return (targ == &bfd_elf32_littlenios2_vec
-	  || targ == &bfd_elf32_bignios2_vec);
+  return (targ == &nios2_elf32_le_vec
+	  || targ == &nios2_elf32_be_vec);
 }
 
 /* Implement elf_backend_add_symbol_hook.
@@ -5299,9 +5299,9 @@ const struct bfd_elf_special_section elf32_nios2_special_sections[] =
 
 #define elf_backend_special_sections	  elf32_nios2_special_sections
 
-#define TARGET_LITTLE_SYM		bfd_elf32_littlenios2_vec
+#define TARGET_LITTLE_SYM		nios2_elf32_le_vec
 #define TARGET_LITTLE_NAME		"elf32-littlenios2"
-#define TARGET_BIG_SYM			bfd_elf32_bignios2_vec
+#define TARGET_BIG_SYM			nios2_elf32_be_vec
 #define TARGET_BIG_NAME			"elf32-bignios2"
 
 #define elf_backend_got_header_size	12
diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 9aa5f54..956ec38 100644
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -2826,7 +2826,7 @@ elf32_or1k_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 #define ELF_TARGET_ID                   OR1K_ELF_DATA
 #define ELF_MAXPAGESIZE                 0x2000
 
-#define TARGET_BIG_SYM                  bfd_elf32_or1k_vec
+#define TARGET_BIG_SYM                  or1k_elf32_vec
 #define TARGET_BIG_NAME                 "elf32-or1k"
 
 #define elf_info_to_howto_rel           NULL
diff --git a/bfd/elf32-pj.c b/bfd/elf32-pj.c
index 51a0117..84b61f9 100644
--- a/bfd/elf32-pj.c
+++ b/bfd/elf32-pj.c
@@ -335,9 +335,9 @@ pj_elf_final_write_processing (bfd *abfd,
   elf_elfheader (abfd)->e_flags |= EF_PICOJAVA_GNUCALLS;
 }
 
-#define TARGET_BIG_SYM		bfd_elf32_pj_vec
+#define TARGET_BIG_SYM		pj_elf32_vec
 #define TARGET_BIG_NAME		"elf32-pj"
-#define TARGET_LITTLE_SYM	bfd_elf32_pjl_vec
+#define TARGET_LITTLE_SYM	pj_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-pjl"
 #define ELF_ARCH		bfd_arch_pj
 #define ELF_MACHINE_CODE	EM_PJ
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index ae68b5d..b99db68 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -10282,9 +10282,9 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd,
   return ret;
 }
 
-#define TARGET_LITTLE_SYM	bfd_elf32_powerpcle_vec
+#define TARGET_LITTLE_SYM	powerpc_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-powerpcle"
-#define TARGET_BIG_SYM		bfd_elf32_powerpc_vec
+#define TARGET_BIG_SYM		powerpc_elf32_vec
 #define TARGET_BIG_NAME		"elf32-powerpc"
 #define ELF_ARCH		bfd_arch_powerpc
 #define ELF_TARGET_ID		PPC32_ELF_DATA
@@ -10360,7 +10360,7 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd,
 #undef  TARGET_LITTLE_NAME
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM  bfd_elf32_powerpc_freebsd_vec
+#define TARGET_BIG_SYM  powerpc_elf32_fbsd_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME "elf32-powerpc-freebsd"
 
@@ -10378,7 +10378,7 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd,
 #undef TARGET_LITTLE_NAME
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM		bfd_elf32_powerpc_vxworks_vec
+#define TARGET_BIG_SYM		powerpc_elf32_vxworks_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-powerpc-vxworks"
 
diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 533f493..7b66971 100644
--- a/bfd/elf32-rl78.c
+++ b/bfd/elf32-rl78.c
@@ -2417,7 +2417,7 @@ rl78_elf_relax_section
 #define ELF_MACHINE_CODE	EM_RL78
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_LITTLE_SYM	bfd_elf32_rl78_vec
+#define TARGET_LITTLE_SYM	rl78_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-rl78"
 
 #define elf_info_to_howto_rel			NULL
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index d7c427e..2045cb7 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -30,8 +30,8 @@
 /* This is a meta-target that's used only with objcopy, to avoid the
    endian-swap we would otherwise get.  We check for this in
    rx_elf_object_p().  */
-const bfd_target bfd_elf32_rx_be_ns_vec;
-const bfd_target bfd_elf32_rx_be_vec;
+const bfd_target rx_elf32_be_ns_vec;
+const bfd_target rx_elf32_be_vec;
 
 #ifdef DEBUG
 char * rx_get_reloc (long);
@@ -3071,17 +3071,17 @@ rx_elf_object_p (bfd * abfd)
   /* We never want to automatically choose the non-swapping big-endian
      target.  The user can only get that explicitly, such as with -I
      and objcopy.  */
-  if (abfd->xvec == &bfd_elf32_rx_be_ns_vec
+  if (abfd->xvec == &rx_elf32_be_ns_vec
       && abfd->target_defaulted)
     return FALSE;
 
   /* BFD->target_defaulted is not set to TRUE when a target is chosen
      as a fallback, so we check for "scanning" to know when to stop
      using the non-swapping target.  */
-  if (abfd->xvec == &bfd_elf32_rx_be_ns_vec
+  if (abfd->xvec == &rx_elf32_be_ns_vec
       && saw_be)
     return FALSE;
-  if (abfd->xvec == &bfd_elf32_rx_be_vec)
+  if (abfd->xvec == &rx_elf32_be_vec)
     saw_be = TRUE;
 
   bfd_default_set_arch_mach (abfd, bfd_arch_rx,
@@ -3548,10 +3548,10 @@ static const struct bfd_elf_special_section elf32_rx_special_sections[] =
 #define ELF_MACHINE_CODE	EM_RX
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM		bfd_elf32_rx_be_vec
+#define TARGET_BIG_SYM		rx_elf32_be_vec
 #define TARGET_BIG_NAME		"elf32-rx-be"
 
-#define TARGET_LITTLE_SYM	bfd_elf32_rx_le_vec
+#define TARGET_LITTLE_SYM	rx_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-rx-le"
 
 #define elf_info_to_howto_rel			NULL
@@ -3580,7 +3580,7 @@ static const struct bfd_elf_special_section elf32_rx_special_sections[] =
    pre-swapped .text sections (like objcopy).  */
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM		bfd_elf32_rx_be_ns_vec
+#define TARGET_BIG_SYM		rx_elf32_be_ns_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME		"elf32-rx-be-ns"
 #undef  TARGET_LITTLE_SYM
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 68b1d9e..09b1fca 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -3982,7 +3982,7 @@ elf32_s390_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 }
 
 
-#define TARGET_BIG_SYM	bfd_elf32_s390_vec
+#define TARGET_BIG_SYM	s390_elf32_vec
 #define TARGET_BIG_NAME	"elf32-s390"
 #define ELF_ARCH	bfd_arch_s390
 #define ELF_TARGET_ID	S390_ELF_DATA
diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c
index 23dad0c..677f000 100644
--- a/bfd/elf32-score.c
+++ b/bfd/elf32-score.c
@@ -4446,9 +4446,9 @@ _bfd_score_elf_common_definition (Elf_Internal_Sym *sym)
 
 
 #define USE_REL                         1
-#define TARGET_LITTLE_SYM               bfd_elf32_littlescore_vec
+#define TARGET_LITTLE_SYM               score_elf32_le_vec
 #define TARGET_LITTLE_NAME              "elf32-littlescore"
-#define TARGET_BIG_SYM                  bfd_elf32_bigscore_vec
+#define TARGET_BIG_SYM                  score_elf32_be_vec
 #define TARGET_BIG_NAME                 "elf32-bigscore"
 #define ELF_ARCH                        bfd_arch_score
 #define ELF_MACHINE_CODE                EM_SCORE
diff --git a/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c
index b8f7d93..5239de3 100644
--- a/bfd/elf32-sh-symbian.c
+++ b/bfd/elf32-sh-symbian.c
@@ -601,7 +601,7 @@ sh_symbian_relocate_section (bfd *                  output_bfd,
 				  contents, relocs, local_syms, local_sections);
 }
 
-#define TARGET_LITTLE_SYM	bfd_elf32_shl_symbian_vec
+#define TARGET_LITTLE_SYM	sh_elf32_symbian_le_vec
 #define TARGET_LITTLE_NAME      "elf32-shl-symbian"
 
 #undef  elf_backend_relocate_section
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 8adc9a4..259ddf0 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -88,11 +88,11 @@ static bfd_boolean
 vxworks_object_p (bfd *abfd ATTRIBUTE_UNUSED)
 {
 #if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
-  extern const bfd_target bfd_elf32_shlvxworks_vec;
-  extern const bfd_target bfd_elf32_shvxworks_vec;
+  extern const bfd_target sh_elf32_vxworks_le_vec;
+  extern const bfd_target sh_elf32_vxworks_vec;
 
-  return (abfd->xvec == &bfd_elf32_shlvxworks_vec
-	  || abfd->xvec == &bfd_elf32_shvxworks_vec);
+  return (abfd->xvec == &sh_elf32_vxworks_le_vec
+	  || abfd->xvec == &sh_elf32_vxworks_vec);
 #else
   return FALSE;
 #endif
@@ -104,11 +104,11 @@ static bfd_boolean
 fdpic_object_p (bfd *abfd ATTRIBUTE_UNUSED)
 {
 #if !defined INCLUDE_SHMEDIA && !defined SH_TARGET_ALREADY_DEFINED
-  extern const bfd_target bfd_elf32_shfd_vec;
-  extern const bfd_target bfd_elf32_shbfd_vec;
+  extern const bfd_target sh_elf32_fdpic_le_vec;
+  extern const bfd_target sh_elf32_fdpic_be_vec;
 
-  return (abfd->xvec == &bfd_elf32_shfd_vec
-	  || abfd->xvec == &bfd_elf32_shbfd_vec);
+  return (abfd->xvec == &sh_elf32_fdpic_le_vec
+	  || abfd->xvec == &sh_elf32_fdpic_be_vec);
 #else
   return FALSE;
 #endif
@@ -7403,9 +7403,9 @@ sh_elf_encode_eh_address (bfd *abfd,
 }
 
 #if !defined SH_TARGET_ALREADY_DEFINED
-#define TARGET_BIG_SYM		bfd_elf32_sh_vec
+#define TARGET_BIG_SYM		sh_elf32_vec
 #define TARGET_BIG_NAME		"elf32-sh"
-#define TARGET_LITTLE_SYM	bfd_elf32_shl_vec
+#define TARGET_LITTLE_SYM	sh_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-shl"
 #endif
 
@@ -7478,11 +7478,11 @@ sh_elf_encode_eh_address (bfd *abfd,
 
 /* NetBSD support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM			bfd_elf32_shnbsd_vec
+#define	TARGET_BIG_SYM			sh_elf32_nbsd_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf32-sh-nbsd"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_shlnbsd_vec
+#define	TARGET_LITTLE_SYM		sh_elf32_nbsd_le_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-shl-nbsd"
 #undef	ELF_MAXPAGESIZE
@@ -7498,11 +7498,11 @@ sh_elf_encode_eh_address (bfd *abfd,
 
 /* Linux support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM			bfd_elf32_shblin_vec
+#define	TARGET_BIG_SYM			sh_elf32_linux_be_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf32-shbig-linux"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_shlin_vec
+#define	TARGET_LITTLE_SYM		sh_elf32_linux_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-sh-linux"
 #undef	ELF_COMMONPAGESIZE
@@ -7520,11 +7520,11 @@ sh_elf_encode_eh_address (bfd *abfd,
 
 /* FDPIC support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM			bfd_elf32_shbfd_vec
+#define	TARGET_BIG_SYM			sh_elf32_fdpic_be_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf32-shbig-fdpic"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_shfd_vec
+#define	TARGET_LITTLE_SYM		sh_elf32_fdpic_le_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-sh-fdpic"
 
@@ -7537,11 +7537,11 @@ sh_elf_encode_eh_address (bfd *abfd,
 
 /* VxWorks support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM			bfd_elf32_shvxworks_vec
+#define	TARGET_BIG_SYM			sh_elf32_vxworks_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf32-sh-vxworks"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_shlvxworks_vec
+#define	TARGET_LITTLE_SYM		sh_elf32_vxworks_le_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-shl-vxworks"
 #undef	elf32_bed
diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 227cd5f..9042081 100644
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -766,11 +766,11 @@ static const struct bfd_elf_special_section sh64_elf_special_sections[] =
 };
 
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM		bfd_elf32_sh64_vec
+#define	TARGET_BIG_SYM		sh64_elf32_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME		"elf32-sh64"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM	bfd_elf32_sh64l_vec
+#define	TARGET_LITTLE_SYM	sh64_elf32_le_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME	"elf32-sh64l"
 
@@ -778,11 +778,11 @@ static const struct bfd_elf_special_section sh64_elf_special_sections[] =
 
 /* NetBSD support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM		bfd_elf32_sh64nbsd_vec
+#define	TARGET_BIG_SYM		sh64_elf32_nbsd_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME		"elf32-sh64-nbsd"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM	bfd_elf32_sh64lnbsd_vec
+#define	TARGET_LITTLE_SYM	sh64_elf32_nbsd_le_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME	"elf32-sh64l-nbsd"
 #undef	ELF_MAXPAGESIZE
@@ -797,11 +797,11 @@ static const struct bfd_elf_special_section sh64_elf_special_sections[] =
 
 /* Linux support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM		bfd_elf32_sh64blin_vec
+#define	TARGET_BIG_SYM		sh64_elf32_linux_be_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME		"elf32-sh64big-linux"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM	bfd_elf32_sh64lin_vec
+#define	TARGET_LITTLE_SYM	sh64_elf32_linux_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME	"elf32-sh64-linux"
 #undef	elf32_bed
diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
index 1e4127a..f714a5e 100644
--- a/bfd/elf32-sparc.c
+++ b/bfd/elf32-sparc.c
@@ -187,7 +187,7 @@ elf32_sparc_add_symbol_hook (bfd * abfd,
   return TRUE;
 }
 
-#define TARGET_BIG_SYM	bfd_elf32_sparc_vec
+#define TARGET_BIG_SYM	sparc_elf32_vec
 #define TARGET_BIG_NAME	"elf32-sparc"
 #define ELF_ARCH	bfd_arch_sparc
 #define ELF_TARGET_ID	SPARC_ELF_DATA
@@ -250,7 +250,7 @@ elf32_sparc_add_symbol_hook (bfd * abfd,
 /* Solaris 2.  */
 
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM				bfd_elf32_sparc_sol2_vec
+#define	TARGET_BIG_SYM				sparc_elf32_sol2_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME				"elf32-sparc-sol2"
 
@@ -294,7 +294,7 @@ elf32_sparc_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker)
 }
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM	bfd_elf32_sparc_vxworks_vec
+#define TARGET_BIG_SYM	sparc_elf32_vxworks_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME	"elf32-sparc-vxworks"
 
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index 9a71db1..d111277 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -1522,12 +1522,12 @@ process_stubs (struct bfd_link_info *info, bfd_boolean build)
 
   for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      extern const bfd_target bfd_elf32_spu_vec;
+      extern const bfd_target spu_elf32_vec;
       Elf_Internal_Shdr *symtab_hdr;
       asection *isec;
       Elf_Internal_Sym *local_syms = NULL;
 
-      if (ibfd->xvec != &bfd_elf32_spu_vec)
+      if (ibfd->xvec != &spu_elf32_vec)
 	continue;
 
       /* We'll need the symbol table in a second.  */
@@ -2950,14 +2950,14 @@ discover_functions (struct bfd_link_info *info)
        ibfd != NULL;
        ibfd = ibfd->link_next, bfd_idx++)
     {
-      extern const bfd_target bfd_elf32_spu_vec;
+      extern const bfd_target spu_elf32_vec;
       Elf_Internal_Shdr *symtab_hdr;
       asection *sec;
       size_t symcount;
       Elf_Internal_Sym *syms, *sy, **psyms, **psy;
       asection **psecs, **p;
 
-      if (ibfd->xvec != &bfd_elf32_spu_vec)
+      if (ibfd->xvec != &spu_elf32_vec)
 	continue;
 
       /* Read all the symbols.  */
@@ -3111,10 +3111,10 @@ discover_functions (struct bfd_link_info *info)
 
       for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
 	{
-	  extern const bfd_target bfd_elf32_spu_vec;
+	  extern const bfd_target spu_elf32_vec;
 	  asection *sec;
 
-	  if (ibfd->xvec != &bfd_elf32_spu_vec)
+	  if (ibfd->xvec != &spu_elf32_vec)
 	    continue;
 
 	  /* Some of the symbols we've installed as marking the
@@ -3183,10 +3183,10 @@ for_each_node (bfd_boolean (*doit) (struct function_info *,
 
   for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      extern const bfd_target bfd_elf32_spu_vec;
+      extern const bfd_target spu_elf32_vec;
       asection *sec;
 
-      if (ibfd->xvec != &bfd_elf32_spu_vec)
+      if (ibfd->xvec != &spu_elf32_vec)
 	continue;
 
       for (sec = ibfd->sections; sec != NULL; sec = sec->next)
@@ -3332,10 +3332,10 @@ build_call_tree (struct bfd_link_info *info)
 
   for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      extern const bfd_target bfd_elf32_spu_vec;
+      extern const bfd_target spu_elf32_vec;
       asection *sec;
 
-      if (ibfd->xvec != &bfd_elf32_spu_vec)
+      if (ibfd->xvec != &spu_elf32_vec)
 	continue;
 
       for (sec = ibfd->sections; sec != NULL; sec = sec->next)
@@ -3709,10 +3709,10 @@ auto_ovl_lib_functions (struct bfd_link_info *info, unsigned int lib_size)
   lib_count = 0;
   for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      extern const bfd_target bfd_elf32_spu_vec;
+      extern const bfd_target spu_elf32_vec;
       asection *sec;
 
-      if (ibfd->xvec != &bfd_elf32_spu_vec)
+      if (ibfd->xvec != &spu_elf32_vec)
 	continue;
 
       for (sec = ibfd->sections; sec != NULL; sec = sec->next)
@@ -4264,11 +4264,11 @@ spu_elf_auto_overlay (struct bfd_link_info *info)
   total_overlay_size = 0;
   for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
     {
-      extern const bfd_target bfd_elf32_spu_vec;
+      extern const bfd_target spu_elf32_vec;
       asection *sec;
       unsigned int old_count;
 
-      if (ibfd->xvec != &bfd_elf32_spu_vec)
+      if (ibfd->xvec != &spu_elf32_vec)
 	continue;
 
       old_count = count;
@@ -5446,7 +5446,7 @@ spu_elf_size_sections (bfd * output_bfd, struct bfd_link_info *info)
   return TRUE;
 }
 
-#define TARGET_BIG_SYM		bfd_elf32_spu_vec
+#define TARGET_BIG_SYM		spu_elf32_vec
 #define TARGET_BIG_NAME		"elf32-spu"
 #define ELF_ARCH		bfd_arch_spu
 #define ELF_TARGET_ID		SPU_ELF_DATA
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 529c591..e3e897c 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -4345,9 +4345,9 @@ elf32_tic6x_write_section (bfd *output_bfd,
   return TRUE;
 }
 
-#define TARGET_LITTLE_SYM	bfd_elf32_tic6x_le_vec
+#define TARGET_LITTLE_SYM	tic6x_elf32_le_vec
 #define TARGET_LITTLE_NAME	"elf32-tic6x-le"
-#define TARGET_BIG_SYM		bfd_elf32_tic6x_be_vec
+#define TARGET_BIG_SYM		tic6x_elf32_be_vec
 #define TARGET_BIG_NAME		"elf32-tic6x-be"
 #define ELF_ARCH		bfd_arch_tic6x
 #define ELF_TARGET_ID		TIC6X_ELF_DATA
@@ -4416,11 +4416,11 @@ elf32_tic6x_write_section (bfd *output_bfd,
 #define	elf32_bed		elf32_tic6x_linux_bed
 
 #undef TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_tic6x_linux_le_vec
+#define	TARGET_LITTLE_SYM		tic6x_elf32_linux_le_vec
 #undef TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-tic6x-linux-le"
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM			bfd_elf32_tic6x_linux_be_vec
+#define TARGET_BIG_SYM			tic6x_elf32_linux_be_vec
 #undef TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf32-tic6x-linux-be"
 #undef ELF_OSABI
@@ -4432,11 +4432,11 @@ elf32_tic6x_write_section (bfd *output_bfd,
 #define	elf32_bed		elf32_tic6x_elf_bed
 
 #undef TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf32_tic6x_elf_le_vec
+#define	TARGET_LITTLE_SYM		tic6x_elf32_c6000_le_vec
 #undef TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf32-tic6x-elf-le"
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM			bfd_elf32_tic6x_elf_be_vec
+#define TARGET_BIG_SYM			tic6x_elf32_c6000_be_vec
 #undef TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf32-tic6x-elf-be"
 #undef ELF_OSABI
diff --git a/bfd/elf32-tilegx.c b/bfd/elf32-tilegx.c
index ca6161a..bc5752c 100644
--- a/bfd/elf32-tilegx.c
+++ b/bfd/elf32-tilegx.c
@@ -87,9 +87,9 @@ tilegx_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 #define ELF_MAXPAGESIZE		0x10000
 #define ELF_COMMONPAGESIZE	0x10000
 
-#define TARGET_BIG_SYM          bfd_elf32_tilegx_be_vec
+#define TARGET_BIG_SYM          tilegx_elf32_be_vec
 #define TARGET_BIG_NAME         "elf32-tilegx-be"
-#define TARGET_LITTLE_SYM       bfd_elf32_tilegx_le_vec
+#define TARGET_LITTLE_SYM       tilegx_elf32_le_vec
 #define TARGET_LITTLE_NAME      "elf32-tilegx-le"
 
 #define elf_backend_reloc_type_class	     tilegx_reloc_type_class
diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index 7c72d54..4e6561d 100644
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -4021,7 +4021,7 @@ tilepro_additional_program_headers (bfd *abfd,
 #define ELF_MAXPAGESIZE		0x10000
 #define ELF_COMMONPAGESIZE	0x10000
 
-#define TARGET_LITTLE_SYM	bfd_elf32_tilepro_vec
+#define TARGET_LITTLE_SYM	tilepro_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-tilepro"
 
 #define elf_backend_reloc_type_class	     tilepro_reloc_type_class
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 23567ad..2589a25 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -3770,7 +3770,7 @@ static const struct bfd_elf_special_section v850_elf_special_sections[] =
   { NULL,                     0,           0, 0,                0 }
 };
 
-#define TARGET_LITTLE_SYM			bfd_elf32_v850_vec
+#define TARGET_LITTLE_SYM			v850_elf32_vec
 #define TARGET_LITTLE_NAME			"elf32-v850"
 #define ELF_ARCH				bfd_arch_v850
 #define ELF_MACHINE_CODE			EM_V850
@@ -3905,7 +3905,7 @@ v800_elf_info_to_howto (bfd *               abfd,
 
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM			bfd_elf32_v850_rh850_vec
+#define TARGET_LITTLE_SYM			v800_elf32_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME			"elf32-v850-rh850"
 #undef  ELF_ARCH
diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index cb8e83b..c28caca 100644
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -2018,7 +2018,7 @@ elf_vax_plt_sym_val (bfd_vma i, const asection *plt,
   return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
 }
 
-#define TARGET_LITTLE_SYM		bfd_elf32_vax_vec
+#define TARGET_LITTLE_SYM		vax_elf32_vec
 #define TARGET_LITTLE_NAME		"elf32-vax"
 #define ELF_MACHINE_CODE		EM_VAX
 #define ELF_MAXPAGESIZE			0x1000
diff --git a/bfd/elf32-xc16x.c b/bfd/elf32-xc16x.c
index e0f789f..9e7deca 100644
--- a/bfd/elf32-xc16x.c
+++ b/bfd/elf32-xc16x.c
@@ -462,7 +462,7 @@ elf32_xc16x_object_p (bfd *abfd)
 #define ELF_MACHINE_CODE	EM_XC16X
 #define ELF_MAXPAGESIZE		0x100
 
-#define TARGET_LITTLE_SYM       bfd_elf32_xc16x_vec
+#define TARGET_LITTLE_SYM       xc16x_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-xc16x"
 #define elf_backend_final_write_processing	elf32_xc16x_final_write_processing
 #define elf_backend_object_p   		elf32_xc16x_object_p
diff --git a/bfd/elf32-xgate.c b/bfd/elf32-xgate.c
index d89c25a..87d06c8 100644
--- a/bfd/elf32-xgate.c
+++ b/bfd/elf32-xgate.c
@@ -702,7 +702,7 @@ elf32_xgate_post_process_headers (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_in
 
 #define ELF_MAXPAGESIZE                      0x1000
 
-#define TARGET_BIG_SYM                       bfd_elf32_xgate_vec
+#define TARGET_BIG_SYM                       xgate_elf32_vec
 #define TARGET_BIG_NAME                      "elf32-xgate"
 
 #define elf_info_to_howto                    0
diff --git a/bfd/elf32-xstormy16.c b/bfd/elf32-xstormy16.c
index 6133645..74adf64 100644
--- a/bfd/elf32-xstormy16.c
+++ b/bfd/elf32-xstormy16.c
@@ -1014,7 +1014,7 @@ xstormy16_elf_gc_mark_hook (asection *sec,
 #define ELF_MACHINE_CODE	EM_XSTORMY16
 #define ELF_MAXPAGESIZE		0x100
 
-#define TARGET_LITTLE_SYM       bfd_elf32_xstormy16_vec
+#define TARGET_LITTLE_SYM       xstormy16_elf32_vec
 #define TARGET_LITTLE_NAME	"elf32-xstormy16"
 
 #define elf_info_to_howto_rel			NULL
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index edb04b4..902b998 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -10758,9 +10758,9 @@ static const struct bfd_elf_special_section elf_xtensa_special_sections[] =
 
 #define ELF_TARGET_ID			XTENSA_ELF_DATA
 #ifndef ELF_ARCH
-#define TARGET_LITTLE_SYM		bfd_elf32_xtensa_le_vec
+#define TARGET_LITTLE_SYM		xtensa_elf32_le_vec
 #define TARGET_LITTLE_NAME		"elf32-xtensa-le"
-#define TARGET_BIG_SYM			bfd_elf32_xtensa_be_vec
+#define TARGET_BIG_SYM			xtensa_elf32_be_vec
 #define TARGET_BIG_NAME			"elf32-xtensa-be"
 #define ELF_ARCH			bfd_arch_xtensa
 
diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 073e578..403e436 100644
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -5468,7 +5468,7 @@ static const struct elf_size_info alpha_elf_size_info =
   bfd_elf64_swap_reloca_out
 };
 
-#define TARGET_LITTLE_SYM	bfd_elf64_alpha_vec
+#define TARGET_LITTLE_SYM	alpha_elf64_vec
 #define TARGET_LITTLE_NAME	"elf64-alpha"
 #define ELF_ARCH		bfd_arch_alpha
 #define ELF_TARGET_ID		ALPHA_ELF_DATA
@@ -5560,7 +5560,7 @@ static const struct elf_size_info alpha_elf_size_info =
 /* FreeBSD support.  */
 
 #undef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM	bfd_elf64_alpha_freebsd_vec
+#define TARGET_LITTLE_SYM	alpha_elf64_fbsd_vec
 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME	"elf64-alpha-freebsd"
 #undef	ELF_OSABI
diff --git a/bfd/elf64-gen.c b/bfd/elf64-gen.c
index 83cbdc9..d8afcfa 100644
--- a/bfd/elf64-gen.c
+++ b/bfd/elf64-gen.c
@@ -86,9 +86,9 @@ elf64_generic_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
   return bfd_elf_link_add_symbols (abfd, info);
 }
 
-#define TARGET_LITTLE_SYM		bfd_elf64_little_generic_vec
+#define TARGET_LITTLE_SYM		elf64_le_vec
 #define TARGET_LITTLE_NAME		"elf64-little"
-#define TARGET_BIG_SYM			bfd_elf64_big_generic_vec
+#define TARGET_BIG_SYM			elf64_be_vec
 #define TARGET_BIG_NAME			"elf64-big"
 #define ELF_ARCH			bfd_arch_unknown
 #define ELF_MACHINE_CODE		EM_NONE
diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c
index 92bf121..49473e7 100644
--- a/bfd/elf64-hppa.c
+++ b/bfd/elf64-hppa.c
@@ -4014,7 +4014,7 @@ const struct elf_size_info hppa64_elf_size_info =
   bfd_elf64_swap_reloca_out
 };
 
-#define TARGET_BIG_SYM			bfd_elf64_hppa_vec
+#define TARGET_BIG_SYM			hppa_elf64_vec
 #define TARGET_BIG_NAME			"elf64-hppa"
 #define ELF_ARCH			bfd_arch_hppa
 #define ELF_TARGET_ID			HPPA64_ELF_DATA
@@ -4096,7 +4096,7 @@ const struct elf_size_info hppa64_elf_size_info =
 #include "elf64-target.h"
 
 #undef TARGET_BIG_SYM
-#define TARGET_BIG_SYM			bfd_elf64_hppa_linux_vec
+#define TARGET_BIG_SYM			hppa_elf64_linux_vec
 #undef TARGET_BIG_NAME
 #define TARGET_BIG_NAME			"elf64-hppa-linux"
 #undef ELF_OSABI
diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 11ab817..069340a 100644
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -5512,7 +5512,7 @@ static const struct elf_size_info elf64_ia64_vms_size_info = {
 /* VMS-specific vectors.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		bfd_elf64_ia64_vms_vec
+#define TARGET_LITTLE_SYM		ia64_elf64_vms_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		"elf64-ia64-vms"
 #undef  TARGET_BIG_SYM
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index d1b52b1..9d50a79 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -128,8 +128,8 @@ static bfd_boolean elf64_mips_grok_prstatus
 static bfd_boolean elf64_mips_grok_psinfo
   (bfd *, Elf_Internal_Note *);
 
-extern const bfd_target bfd_elf64_bigmips_vec;
-extern const bfd_target bfd_elf64_littlemips_vec;
+extern const bfd_target mips_elf64_be_vec;
+extern const bfd_target mips_elf64_le_vec;
 
 /* In case we're on a 32-bit machine, construct a 64-bit "-1" value
    from smaller values.  Start with zero, widen, *then* decrement.  */
@@ -4031,8 +4031,8 @@ mips_elf64_object_p (bfd *abfd)
 static irix_compat_t
 elf64_mips_irix_compat (bfd *abfd)
 {
-  if ((abfd->xvec == &bfd_elf64_bigmips_vec)
-      || (abfd->xvec == &bfd_elf64_littlemips_vec))
+  if ((abfd->xvec == &mips_elf64_be_vec)
+      || (abfd->xvec == &mips_elf64_le_vec))
     return ict_irix6;
   else
     return ict_none;
@@ -4300,9 +4300,9 @@ extern bfd_boolean bfd_elf64_archive_write_armap
 			_bfd_archive_coff_update_armap_timestamp
 
 /* The SGI style (n)64 NewABI.  */
-#define TARGET_LITTLE_SYM		bfd_elf64_littlemips_vec
+#define TARGET_LITTLE_SYM		mips_elf64_le_vec
 #define TARGET_LITTLE_NAME		"elf64-littlemips"
-#define TARGET_BIG_SYM			bfd_elf64_bigmips_vec
+#define TARGET_BIG_SYM			mips_elf64_be_vec
 #define TARGET_BIG_NAME			"elf64-bigmips"
 
 #define ELF_MAXPAGESIZE			0x10000
@@ -4319,9 +4319,9 @@ extern bfd_boolean bfd_elf64_archive_write_armap
 #undef ELF_MAXPAGESIZE
 #undef ELF_COMMONPAGESIZE
 
-#define TARGET_LITTLE_SYM		bfd_elf64_tradlittlemips_vec
+#define TARGET_LITTLE_SYM		mips_elf64_trad_le_vec
 #define TARGET_LITTLE_NAME		"elf64-tradlittlemips"
-#define TARGET_BIG_SYM			bfd_elf64_tradbigmips_vec
+#define TARGET_BIG_SYM			mips_elf64_trad_be_vec
 #define TARGET_BIG_NAME			"elf64-tradbigmips"
 
 #define ELF_MAXPAGESIZE			0x10000
@@ -4339,9 +4339,9 @@ extern bfd_boolean bfd_elf64_archive_write_armap
 #undef TARGET_BIG_SYM
 #undef TARGET_BIG_NAME
 
-#define	TARGET_LITTLE_SYM		bfd_elf64_tradlittlemips_freebsd_vec
+#define	TARGET_LITTLE_SYM		mips_elf64_tradfbsd_le_vec
 #define	TARGET_LITTLE_NAME		"elf64-tradlittlemips-freebsd"
-#define	TARGET_BIG_SYM			bfd_elf64_tradbigmips_freebsd_vec
+#define	TARGET_BIG_SYM			mips_elf64_tradfbsd_be_vec
 #define	TARGET_BIG_NAME			"elf64-tradbigmips-freebsd"
 
 #undef	ELF_OSABI
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c
index 8459f4f..ad6757f 100644
--- a/bfd/elf64-mmix.c
+++ b/bfd/elf64-mmix.c
@@ -2902,7 +2902,7 @@ mmix_elf_relax_section (bfd *abfd,
    alignment.  */
 #define ELF_MAXPAGESIZE 0x100
 
-#define TARGET_BIG_SYM		bfd_elf64_mmix_vec
+#define TARGET_BIG_SYM		mmix_elf64_vec
 #define TARGET_BIG_NAME		"elf64-mmix"
 
 #define elf_info_to_howto_rel		NULL
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 8d965f0..fdca0c6 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -56,9 +56,9 @@ static bfd_reloc_status_type ppc64_elf_unhandled_reloc
 static bfd_vma opd_entry_value
   (asection *, bfd_vma, asection **, bfd_vma *, bfd_boolean);
 
-#define TARGET_LITTLE_SYM	bfd_elf64_powerpcle_vec
+#define TARGET_LITTLE_SYM	powerpc_elf64_le_vec
 #define TARGET_LITTLE_NAME	"elf64-powerpcle"
-#define TARGET_BIG_SYM		bfd_elf64_powerpc_vec
+#define TARGET_BIG_SYM		powerpc_elf64_vec
 #define TARGET_BIG_NAME		"elf64-powerpc"
 #define ELF_ARCH		bfd_arch_powerpc
 #define ELF_TARGET_ID		PPC64_ELF_DATA
@@ -15090,7 +15090,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
 #undef  TARGET_LITTLE_NAME
 
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM	bfd_elf64_powerpc_freebsd_vec
+#define TARGET_BIG_SYM	powerpc_elf64_fbsd_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME "elf64-powerpc-freebsd"
 
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index 19cbe2f..831c4a2 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -3795,7 +3795,7 @@ const struct elf_size_info s390_elf64_size_info =
   bfd_elf64_swap_reloca_out
 };
 
-#define TARGET_BIG_SYM	bfd_elf64_s390_vec
+#define TARGET_BIG_SYM	s390_elf64_vec
 #define TARGET_BIG_NAME	"elf64-s390"
 #define ELF_ARCH	bfd_arch_s390
 #define ELF_TARGET_ID	S390_ELF_DATA
diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 5f68b92..311d7c3 100644
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -3957,9 +3957,9 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
   { NULL,                       0, 0, 0,            0 }
 };
 
-#define TARGET_BIG_SYM		bfd_elf64_sh64_vec
+#define TARGET_BIG_SYM		sh64_elf64_vec
 #define TARGET_BIG_NAME		"elf64-sh64"
-#define TARGET_LITTLE_SYM	bfd_elf64_sh64l_vec
+#define TARGET_LITTLE_SYM	sh64_elf64_le_vec
 #define TARGET_LITTLE_NAME	"elf64-sh64l"
 #define ELF_ARCH		bfd_arch_sh
 #define ELF_MACHINE_CODE	EM_SH
@@ -4029,11 +4029,11 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
 
 /* NetBSD support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM			bfd_elf64_sh64nbsd_vec
+#define	TARGET_BIG_SYM			sh64_elf64_nbsd_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf64-sh64-nbsd"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf64_sh64lnbsd_vec
+#define	TARGET_LITTLE_SYM		sh64_elf64_nbsd_le_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf64-sh64l-nbsd"
 #undef	ELF_MAXPAGESIZE
@@ -4047,11 +4047,11 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
 
 /* Linux support.  */
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM			bfd_elf64_sh64blin_vec
+#define	TARGET_BIG_SYM			sh64_elf64_linux_be_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME			"elf64-sh64big-linux"
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf64_sh64lin_vec
+#define	TARGET_LITTLE_SYM		sh64_elf64_linux_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf64-sh64-linux"
 #undef elf64_bed
diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index ce4d14d..6f995c5 100644
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -821,7 +821,7 @@ const struct elf_size_info elf64_sparc_size_info =
   bfd_elf64_swap_reloca_out
 };
 
-#define TARGET_BIG_SYM	bfd_elf64_sparc_vec
+#define TARGET_BIG_SYM	sparc_elf64_vec
 #define TARGET_BIG_NAME	"elf64-sparc"
 #define ELF_ARCH	bfd_arch_sparc
 #define ELF_MAXPAGESIZE 0x100000
@@ -924,7 +924,7 @@ const struct elf_size_info elf64_sparc_size_info =
 
 /* FreeBSD support */
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM bfd_elf64_sparc_freebsd_vec
+#define TARGET_BIG_SYM sparc_elf64_fbsd_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME "elf64-sparc-freebsd"
 #undef	ELF_OSABI
@@ -938,7 +938,7 @@ const struct elf_size_info elf64_sparc_size_info =
 /* Solaris 2.  */
 
 #undef	TARGET_BIG_SYM
-#define	TARGET_BIG_SYM				bfd_elf64_sparc_sol2_vec
+#define	TARGET_BIG_SYM				sparc_elf64_sol2_vec
 #undef	TARGET_BIG_NAME
 #define	TARGET_BIG_NAME				"elf64-sparc-sol2"
 
diff --git a/bfd/elf64-tilegx.c b/bfd/elf64-tilegx.c
index e3c54c2..f388e72 100644
--- a/bfd/elf64-tilegx.c
+++ b/bfd/elf64-tilegx.c
@@ -88,9 +88,9 @@ tilegx_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 #define ELF_COMMONPAGESIZE	0x10000
 
 
-#define TARGET_BIG_SYM          bfd_elf64_tilegx_be_vec
+#define TARGET_BIG_SYM          tilegx_elf64_be_vec
 #define TARGET_BIG_NAME         "elf64-tilegx-be"
-#define TARGET_LITTLE_SYM       bfd_elf64_tilegx_le_vec
+#define TARGET_LITTLE_SYM       tilegx_elf64_le_vec
 #define TARGET_LITTLE_NAME      "elf64-tilegx-le"
 
 #define elf_backend_reloc_type_class	     tilegx_reloc_type_class
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 55c8721..f735e31 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -5618,7 +5618,7 @@ static const struct bfd_elf_special_section
   { NULL,	                0,          0, 0,            0 }
 };
 
-#define TARGET_LITTLE_SYM		    bfd_elf64_x86_64_vec
+#define TARGET_LITTLE_SYM		    x86_64_elf64_vec
 #define TARGET_LITTLE_NAME		    "elf64-x86-64"
 #define ELF_ARCH			    bfd_arch_i386
 #define ELF_TARGET_ID			    X86_64_ELF_DATA
@@ -5699,7 +5699,7 @@ static const struct bfd_elf_special_section
 /* FreeBSD support.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf64_x86_64_freebsd_vec
+#define TARGET_LITTLE_SYM		    x86_64_elf64_fbsd_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf64-x86-64-freebsd"
 
@@ -5714,7 +5714,7 @@ static const struct bfd_elf_special_section
 /* Solaris 2 support.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf64_x86_64_sol2_vec
+#define TARGET_LITTLE_SYM		    x86_64_elf64_sol2_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf64-x86-64-sol2"
 
@@ -5752,7 +5752,7 @@ elf64_x86_64_nacl_elf_object_p (bfd *abfd)
 }
 
 #undef	TARGET_LITTLE_SYM
-#define	TARGET_LITTLE_SYM		bfd_elf64_x86_64_nacl_vec
+#define	TARGET_LITTLE_SYM		x86_64_elf64_nacl_vec
 #undef	TARGET_LITTLE_NAME
 #define	TARGET_LITTLE_NAME		"elf64-x86-64-nacl"
 #undef	elf64_bed
@@ -5905,7 +5905,7 @@ elf32_x86_64_nacl_elf_object_p (bfd *abfd)
 }
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		bfd_elf32_x86_64_nacl_vec
+#define TARGET_LITTLE_SYM		x86_64_elf32_nacl_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		"elf32-x86-64-nacl"
 #undef	elf32_bed
@@ -5956,7 +5956,7 @@ elf64_l1om_elf_object_p (bfd *abfd)
 }
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf64_l1om_vec
+#define TARGET_LITTLE_SYM		    l1om_elf64_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf64-l1om"
 #undef ELF_ARCH
@@ -5990,7 +5990,7 @@ elf64_l1om_elf_object_p (bfd *abfd)
 /* FreeBSD L1OM support.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf64_l1om_freebsd_vec
+#define TARGET_LITTLE_SYM		    l1om_elf64_fbsd_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf64-l1om-freebsd"
 
@@ -6013,7 +6013,7 @@ elf64_k1om_elf_object_p (bfd *abfd)
 }
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf64_k1om_vec
+#define TARGET_LITTLE_SYM		    k1om_elf64_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf64-k1om"
 #undef ELF_ARCH
@@ -6040,7 +6040,7 @@ elf64_k1om_elf_object_p (bfd *abfd)
 /* FreeBSD K1OM support.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf64_k1om_freebsd_vec
+#define TARGET_LITTLE_SYM		    k1om_elf64_fbsd_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf64-k1om-freebsd"
 
@@ -6055,7 +6055,7 @@ elf64_k1om_elf_object_p (bfd *abfd)
 /* 32bit x86-64 support.  */
 
 #undef  TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM		    bfd_elf32_x86_64_vec
+#define TARGET_LITTLE_SYM		    x86_64_elf32_vec
 #undef  TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME		    "elf32-x86-64"
 #undef	elf32_bed
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index 0cbbb81..c37ff9d 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -83,8 +83,8 @@ static bfd_boolean elf32_mips_grok_psinfo
 static irix_compat_t elf_n32_mips_irix_compat
   (bfd *);
 
-extern const bfd_target bfd_elf32_nbigmips_vec;
-extern const bfd_target bfd_elf32_nlittlemips_vec;
+extern const bfd_target mips_elf32_n_be_vec;
+extern const bfd_target mips_elf32_n_le_vec;
 
 /* Nonzero if ABFD is using the N32 ABI.  */
 #define ABI_N32_P(abfd) \
@@ -3354,8 +3354,8 @@ elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 static irix_compat_t
 elf_n32_mips_irix_compat (bfd *abfd)
 {
-  if ((abfd->xvec == &bfd_elf32_nbigmips_vec)
-      || (abfd->xvec == &bfd_elf32_nlittlemips_vec))
+  if ((abfd->xvec == &mips_elf32_n_be_vec)
+      || (abfd->xvec == &mips_elf32_n_le_vec))
     return ict_irix6;
   else
     return ict_none;
@@ -3493,9 +3493,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 
 /* Support for SGI-ish mips targets using n32 ABI.  */
 
-#define TARGET_LITTLE_SYM               bfd_elf32_nlittlemips_vec
+#define TARGET_LITTLE_SYM               mips_elf32_n_le_vec
 #define TARGET_LITTLE_NAME              "elf32-nlittlemips"
-#define TARGET_BIG_SYM                  bfd_elf32_nbigmips_vec
+#define TARGET_BIG_SYM                  mips_elf32_n_be_vec
 #define TARGET_BIG_NAME                 "elf32-nbigmips"
 
 #define ELF_MAXPAGESIZE			0x10000
@@ -3512,9 +3512,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #undef ELF_MAXPAGESIZE
 #undef ELF_COMMONPAGESIZE
 
-#define TARGET_LITTLE_SYM               bfd_elf32_ntradlittlemips_vec
+#define TARGET_LITTLE_SYM               mips_elf32_ntrad_le_vec
 #define TARGET_LITTLE_NAME              "elf32-ntradlittlemips"
-#define TARGET_BIG_SYM                  bfd_elf32_ntradbigmips_vec
+#define TARGET_BIG_SYM                  mips_elf32_ntrad_be_vec
 #define TARGET_BIG_NAME                 "elf32-ntradbigmips"
 
 #define ELF_MAXPAGESIZE			0x10000
@@ -3532,9 +3532,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
 #undef TARGET_BIG_SYM
 #undef TARGET_BIG_NAME
 
-#define	TARGET_LITTLE_SYM		bfd_elf32_ntradlittlemips_freebsd_vec
+#define	TARGET_LITTLE_SYM		mips_elf32_ntradfbsd_le_vec
 #define	TARGET_LITTLE_NAME		"elf32-ntradlittlemips-freebsd"
-#define	TARGET_BIG_SYM			bfd_elf32_ntradbigmips_freebsd_vec
+#define	TARGET_BIG_SYM			mips_elf32_ntradfbsd_be_vec
 #define	TARGET_BIG_NAME			"elf32-ntradbigmips-freebsd"
 
 #undef	ELF_OSABI
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index d5b0dd1..498b7bd 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1548,9 +1548,9 @@ elfNN_aarch64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
   return NULL;
 }
 
-#define TARGET_LITTLE_SYM               bfd_elfNN_littleaarch64_vec
+#define TARGET_LITTLE_SYM               aarch64_elfNN_le_vec
 #define TARGET_LITTLE_NAME              "elfNN-littleaarch64"
-#define TARGET_BIG_SYM                  bfd_elfNN_bigaarch64_vec
+#define TARGET_BIG_SYM                  aarch64_elfNN_be_vec
 #define TARGET_BIG_NAME                 "elfNN-bigaarch64"
 
 /* The linker script knows the section names for placement.
diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
index e359e14..d941cdd 100644
--- a/bfd/elfnn-ia64.c
+++ b/bfd/elfnn-ia64.c
@@ -4936,8 +4936,8 @@ elfNN_ia64_object_p (bfd *abfd)
 static bfd_boolean
 elfNN_ia64_hpux_vec (const bfd_target *vec)
 {
-  extern const bfd_target bfd_elfNN_ia64_hpux_big_vec;
-  return (vec == & bfd_elfNN_ia64_hpux_big_vec);
+  extern const bfd_target ia64_elfNN_hpux_be_vec;
+  return (vec == &ia64_elfNN_hpux_be_vec);
 }
 
 static void
@@ -4978,9 +4978,9 @@ elfNN_hpux_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED,
     }
 }
 
-#define TARGET_LITTLE_SYM		bfd_elfNN_ia64_little_vec
+#define TARGET_LITTLE_SYM		ia64_elfNN_le_vec
 #define TARGET_LITTLE_NAME		"elfNN-ia64-little"
-#define TARGET_BIG_SYM			bfd_elfNN_ia64_big_vec
+#define TARGET_BIG_SYM			ia64_elfNN_be_vec
 #define TARGET_BIG_NAME			"elfNN-ia64-big"
 #define ELF_ARCH			bfd_arch_ia64
 #define ELF_TARGET_ID			IA64_ELF_DATA
@@ -5083,7 +5083,7 @@ elfNN_hpux_backend_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED,
 #undef  TARGET_LITTLE_SYM
 #undef  TARGET_LITTLE_NAME
 #undef  TARGET_BIG_SYM
-#define TARGET_BIG_SYM                  bfd_elfNN_ia64_hpux_big_vec
+#define TARGET_BIG_SYM                  ia64_elfNN_hpux_be_vec
 #undef  TARGET_BIG_NAME
 #define TARGET_BIG_NAME                 "elfNN-ia64-hpux-big"
 
diff --git a/bfd/epoc-pe-arm.c b/bfd/epoc-pe-arm.c
index 96513de..71a7bf7 100644
--- a/bfd/epoc-pe-arm.c
+++ b/bfd/epoc-pe-arm.c
@@ -21,9 +21,9 @@
 #define TARGET_UNDERSCORE    0
 #define USER_LABEL_PREFIX    ""
 
-#define TARGET_LITTLE_SYM    arm_epoc_pe_little_vec
+#define TARGET_LITTLE_SYM    arm_pe_epoc_le_vec
 #define TARGET_LITTLE_NAME   "epoc-pe-arm-little"
-#define TARGET_BIG_SYM       arm_epoc_pe_big_vec
+#define TARGET_BIG_SYM       arm_pe_epoc_be_vec
 #define TARGET_BIG_NAME      "epoc-pe-arm-big"
 
 #define bfd_arm_allocate_interworking_sections \
diff --git a/bfd/epoc-pei-arm.c b/bfd/epoc-pei-arm.c
index 89de987..716775c 100644
--- a/bfd/epoc-pei-arm.c
+++ b/bfd/epoc-pei-arm.c
@@ -21,9 +21,9 @@
 #define TARGET_UNDERSCORE    0
 #define USER_LABEL_PREFIX    ""
 
-#define TARGET_LITTLE_SYM    arm_epoc_pei_little_vec
+#define TARGET_LITTLE_SYM    arm_pei_epoc_le_vec
 #define TARGET_LITTLE_NAME   "epoc-pei-arm-little"
-#define TARGET_BIG_SYM       arm_epoc_pei_big_vec
+#define TARGET_BIG_SYM       arm_pei_epoc_be_vec
 #define TARGET_BIG_NAME      "epoc-pei-arm-big"
 
 #define EXTRA_S_FLAGS (SEC_CODE | SEC_READONLY | SEC_DATA)
diff --git a/bfd/hp300bsd.c b/bfd/hp300bsd.c
index 314b984..9cca44a 100644
--- a/bfd/hp300bsd.c
+++ b/bfd/hp300bsd.c
@@ -29,7 +29,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (hp300bsd_,OP)
+#define MY(OP) CONCAT2 (m68k_aout_hp300bsd_,OP)
 #define TARGETNAME "a.out-hp300bsd"
 
 #include "sysdep.h"
diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c
index 0d2db15..fa21a77 100644
--- a/bfd/hp300hpux.c
+++ b/bfd/hp300hpux.c
@@ -104,7 +104,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (hp300hpux_,OP)
+#define MY(OP) CONCAT2 (m68k_aout_hp300hpux_,OP)
 
 #define external_exec hp300hpux_exec_bytes
 #define external_nlist hp300hpux_nlist_bytes
@@ -129,10 +129,10 @@
 /* these don't use MY because that causes problems within JUMP_TABLE
    (CONCAT2 winds up being expanded recursively, which ANSI C compilers
    will not do).  */
-#define MY_canonicalize_symtab hp300hpux_canonicalize_symtab
-#define MY_get_symtab_upper_bound hp300hpux_get_symtab_upper_bound
-#define MY_canonicalize_reloc hp300hpux_canonicalize_reloc
-#define MY_write_object_contents hp300hpux_write_object_contents
+#define MY_canonicalize_symtab m68k_aout_hp300hpux_canonicalize_symtab
+#define MY_get_symtab_upper_bound m68k_aout_hp300hpux_get_symtab_upper_bound
+#define MY_canonicalize_reloc m68k_aout_hp300hpux_canonicalize_reloc
+#define MY_write_object_contents m68k_aout_hp300hpux_write_object_contents
 
 #define MY_read_minisymbols _bfd_generic_read_minisymbols
 #define MY_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
@@ -148,7 +148,7 @@
    were allocated using malloc.  */
 #define MY_bfd_free_cached_info bfd_true
 
-#define hp300hpux_write_syms aout_32_write_syms
+#define m68k_aout_hp300hpux_write_syms aout_32_write_syms
 
 #define MY_callback MY(callback)
 
diff --git a/bfd/hppabsd-core.c b/bfd/hppabsd-core.c
index e07be13..3b1215b 100644
--- a/bfd/hppabsd-core.c
+++ b/bfd/hppabsd-core.c
@@ -217,7 +217,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target hppabsd_core_vec =
+const bfd_target core_hppabsd_vec =
   {
     "hppabsd-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
index 51e17fb..c667465 100644
--- a/bfd/hpux-core.c
+++ b/bfd/hpux-core.c
@@ -376,7 +376,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target hpux_core_vec =
+const bfd_target core_hpux_vec =
   {
     "hpux-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index 4cde583..4b5a83d 100644
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -36,7 +36,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386aout_,OP)
+#define MY(OP) CONCAT2 (i386_aout_,OP)
 #define TARGETNAME "a.out-i386"
 #define NO_WRITE_HEADER_KLUDGE 1
 
diff --git a/bfd/i386bsd.c b/bfd/i386bsd.c
index d6f36a5..d1ed35b 100644
--- a/bfd/i386bsd.c
+++ b/bfd/i386bsd.c
@@ -39,7 +39,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386bsd_,OP)
+#define MY(OP) CONCAT2 (i386_aout_bsd_,OP)
 #define TARGETNAME "a.out-i386-bsd"
 
 #include "sysdep.h"
diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
index 9ca2ffe..d9a4182 100644
--- a/bfd/i386dynix.c
+++ b/bfd/i386dynix.c
@@ -34,7 +34,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386dynix_,OP)
+#define MY(OP) CONCAT2 (i386_aout_dynix_,OP)
 #define TARGETNAME "a.out-i386-dynix"
 #define NAME(x,y) CONCAT3 (i386dynix,_32_,y)
 #define ARCH_SIZE 32
diff --git a/bfd/i386freebsd.c b/bfd/i386freebsd.c
index 0d6523e..7c5ed90 100644
--- a/bfd/i386freebsd.c
+++ b/bfd/i386freebsd.c
@@ -30,7 +30,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386freebsd_,OP)
+#define MY(OP) CONCAT2 (i386_aout_fbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-i386-freebsd"
diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index f3e6ee9..461a7a5 100644
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -38,7 +38,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386linux_,OP)
+#define MY(OP) CONCAT2 (i386_aout_linux_,OP)
 #define TARGETNAME "a.out-i386-linux"
 
 extern const bfd_target MY(vec);
diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c
index 73fd5db..9c1b9f2 100644
--- a/bfd/i386lynx.c
+++ b/bfd/i386lynx.c
@@ -26,7 +26,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386lynx_aout_,OP)
+#define MY(OP) CONCAT2 (i386_aout_lynx_,OP)
 #define TARGETNAME "a.out-i386-lynx"
 
 #include "sysdep.h"
diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
index 32c423c..233041a 100644
--- a/bfd/i386mach3.c
+++ b/bfd/i386mach3.c
@@ -47,7 +47,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386mach3_,OP)
+#define MY(OP) CONCAT2 (i386_aout_mach3_,OP)
 #define TARGETNAME "a.out-mach3"
 
 static bfd_boolean MY (set_sizes) (bfd *);
diff --git a/bfd/i386msdos.c b/bfd/i386msdos.c
index fdba24d..7ec9298 100644
--- a/bfd/i386msdos.c
+++ b/bfd/i386msdos.c
@@ -176,7 +176,7 @@ msdos_set_section_contents (bfd *abfd,
 #define msdos_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
 #define msdos_32_bfd_link_split_section  _bfd_generic_link_split_section
 
-const bfd_target i386msdos_vec =
+const bfd_target i386_msdos_vec =
   {
     "msdos",			/* name */
     bfd_target_msdos_flavour,
diff --git a/bfd/i386netbsd.c b/bfd/i386netbsd.c
index 69e39cd..5e4d130 100644
--- a/bfd/i386netbsd.c
+++ b/bfd/i386netbsd.c
@@ -30,7 +30,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386netbsd_,OP)
+#define MY(OP) CONCAT2 (i386_aout_nbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-i386-netbsd"
diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c
index 7df7b00..65ea0bc 100644
--- a/bfd/i386os9k.c
+++ b/bfd/i386os9k.c
@@ -182,7 +182,7 @@ os9k_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define os9k_bfd_final_link _bfd_generic_final_link
 #define os9k_bfd_link_split_section  _bfd_generic_link_split_section
 
-const bfd_target i386os9k_vec =
+const bfd_target i386_aout_os9k_vec =
   {
     "i386os9k",			/* name */
     bfd_target_os9k_flavour,
diff --git a/bfd/irix-core.c b/bfd/irix-core.c
index dd7214c..9dcc465 100644
--- a/bfd/irix-core.c
+++ b/bfd/irix-core.c
@@ -279,7 +279,7 @@ swap_abort(void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target irix_core_vec =
+const bfd_target core_irix_vec =
   {
     "irix-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/m68k4knetbsd.c b/bfd/m68k4knetbsd.c
index 199a19b..254f9ef 100644
--- a/bfd/m68k4knetbsd.c
+++ b/bfd/m68k4knetbsd.c
@@ -28,7 +28,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (m68k4knetbsd_,OP)
+#define MY(OP) CONCAT2 (m68k_aout_4knbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-m68k4k-netbsd"
diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
index 36d1405..036870f 100644
--- a/bfd/m68klinux.c
+++ b/bfd/m68klinux.c
@@ -39,7 +39,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (m68klinux_,OP)
+#define MY(OP) CONCAT2 (m68k_aout_linux_,OP)
 #define TARGETNAME "a.out-m68k-linux"
 
 extern const bfd_target MY(vec);
diff --git a/bfd/m68knetbsd.c b/bfd/m68knetbsd.c
index edecbd5..53a2563 100644
--- a/bfd/m68knetbsd.c
+++ b/bfd/m68knetbsd.c
@@ -30,7 +30,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (m68knetbsd_,OP)
+#define MY(OP) CONCAT2 (m68k_aout_nbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-m68k-netbsd"
diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c
index 4e74dd9..b6c87fb 100644
--- a/bfd/m88kmach3.c
+++ b/bfd/m88kmach3.c
@@ -35,7 +35,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (m88kmach3_,OP)
+#define MY(OP) CONCAT2 (m88k_aout_mach3_,OP)
 #define TARGETNAME "a.out-m88k-mach3"
 
 #include "aout-target.h"
diff --git a/bfd/m88kopenbsd.c b/bfd/m88kopenbsd.c
index 4fa8f9c..d970d94 100644
--- a/bfd/m88kopenbsd.c
+++ b/bfd/m88kopenbsd.c
@@ -28,7 +28,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (m88kopenbsd_,OP)
+#define MY(OP) CONCAT2 (m88k_aout_obsd_,OP)
 #define TARGETNAME "a.out-m88k-openbsd"
 
 #include "netbsd.h"
diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c
index 6b59ed2..a7d3a11 100644
--- a/bfd/mach-o-i386.c
+++ b/bfd/mach-o-i386.c
@@ -394,7 +394,7 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] =
 #define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_i386_bfd_reloc_type_lookup
 #define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_i386_bfd_reloc_name_lookup
 
-#define TARGET_NAME 		mach_o_i386_vec
+#define TARGET_NAME 		i386_mach_o_vec
 #define TARGET_STRING 		"mach-o-i386"
 #define TARGET_ARCHITECTURE	bfd_arch_i386
 #define TARGET_PAGESIZE		4096
diff --git a/bfd/mach-o-x86-64.c b/bfd/mach-o-x86-64.c
index 14a7067..c0042cb 100644
--- a/bfd/mach-o-x86-64.c
+++ b/bfd/mach-o-x86-64.c
@@ -353,7 +353,7 @@ const mach_o_segment_name_xlat mach_o_x86_64_segsec_names_xlat[] =
 #define bfd_mach_o_tgt_seg_table mach_o_x86_64_segsec_names_xlat
 #define bfd_mach_o_section_type_valid_for_tgt bfd_mach_o_section_type_valid_for_x86_64
 
-#define TARGET_NAME 		mach_o_x86_64_vec
+#define TARGET_NAME 		x86_64_mach_o_vec
 #define TARGET_STRING 		"mach-o-x86-64"
 #define TARGET_ARCHITECTURE	bfd_arch_i386
 #define TARGET_PAGESIZE		4096
diff --git a/bfd/makefile.vms b/bfd/makefile.vms
index 980ac63..9ef4019 100644
--- a/bfd/makefile.vms
+++ b/bfd/makefile.vms
@@ -27,13 +27,13 @@ HOSTFILE=alphavms.h
 OBJS:=cpu-ia64.obj,elfxx-ia64.obj,elf64-ia64-vms.obj,\
   vms-misc.obj,vms-lib.obj,elf-strtab.obj,corefile.obj,stabs.obj,\
   merge.obj,elf-eh-frame.obj,elflink.obj,elf-attrs.obj,dwarf1.obj,elf64.obj
-DEFS=SELECT_VECS="&bfd_elf64_ia64_vms_vec",\
- SELECT_ARCHITECTURES="&bfd_ia64_arch","HAVE_bfd_elf64_ia64_vms_vec"=1
+DEFS=SELECT_VECS="&ia64_elf64_vms_vec",\
+ SELECT_ARCHITECTURES="&bfd_ia64_arch","HAVE_ia64_elf64_vms_vec"=1
 endif
 ifeq ($(ARCH),ALPHA)
 HOSTFILE=alphavms.h
 OBJS:=vms-alpha.obj,vms-lib.obj,vms-misc.obj,cpu-alpha.obj
-DEFS=SELECT_VECS="&vms_alpha_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch"
+DEFS=SELECT_VECS="&alpha_vms_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch"
 endif
 
 OBJS:=$(OBJS),archive.obj,archive64.obj,archures.obj,bfd.obj,bfdio.obj,\
diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c
index fa5dddf..d124cfd 100644
--- a/bfd/mipsbsd.c
+++ b/bfd/mipsbsd.c
@@ -398,9 +398,9 @@ static const struct aout_backend_data MY(backend_data) =
   0				/* finish_dynamic_link */
 };
 
-extern const bfd_target aout_mips_big_vec;
+extern const bfd_target mips_aout_be_vec;
 
-const bfd_target aout_mips_little_vec =
+const bfd_target mips_aout_le_vec =
 {
     "a.out-mips-little",		/* name */
     bfd_target_aout_flavour,
@@ -437,12 +437,12 @@ const bfd_target aout_mips_little_vec =
     BFD_JUMP_TABLE_LINK (MY),
     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-    & aout_mips_big_vec,
+    & mips_aout_be_vec,
 
     MY_backend_data
   };
 
-const bfd_target aout_mips_big_vec =
+const bfd_target mips_aout_be_vec =
   {
     "a.out-mips-big",		/* name */
     bfd_target_aout_flavour,
@@ -479,7 +479,7 @@ const bfd_target aout_mips_big_vec =
     BFD_JUMP_TABLE_LINK (MY),
     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-    & aout_mips_little_vec,
+    & mips_aout_le_vec,
 
     MY_backend_data
   };
diff --git a/bfd/mmo.c b/bfd/mmo.c
index f52448c..6b74a04 100644
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -3251,7 +3251,7 @@ mmo_write_object_contents (bfd *abfd)
 #define mmo_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
 #define mmo_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
 
-const bfd_target bfd_mmo_vec =
+const bfd_target mmix_mmo_vec =
 {
   "mmo",			/* name */
   bfd_target_mmo_flavour,
diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
index f40b27a..a048f13 100644
--- a/bfd/netbsd-core.c
+++ b/bfd/netbsd-core.c
@@ -265,7 +265,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target netbsd_core_vec =
+const bfd_target core_netbsd_vec =
   {
     "netbsd-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/newsos3.c b/bfd/newsos3.c
index 6ed2809..4eb4bee 100644
--- a/bfd/newsos3.c
+++ b/bfd/newsos3.c
@@ -25,7 +25,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (newsos3_,OP)
+#define MY(OP) CONCAT2 (m68k_aout_newsos3_,OP)
 #define TARGETNAME "a.out-newsos3"
 #define ENTRY_CAN_BE_ZERO
 #define DEFAULT_ARCH bfd_arch_m68k
diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
index 5ef7efc..1e403a1 100644
--- a/bfd/nlm32-alpha.c
+++ b/bfd/nlm32-alpha.c
@@ -853,7 +853,7 @@ static const struct nlm_backend_data nlm32_alpha_backend =
 };
 
 #define TARGET_LITTLE_NAME		"nlm32-alpha"
-#define TARGET_LITTLE_SYM		nlmNAME (alpha_vec)
+#define TARGET_LITTLE_SYM		alpha_nlm32_vec
 #define TARGET_BACKEND_DATA		& nlm32_alpha_backend
 
 #include "nlm-target.h"
diff --git a/bfd/nlm32-i386.c b/bfd/nlm32-i386.c
index 28a094ce..797e667 100644
--- a/bfd/nlm32-i386.c
+++ b/bfd/nlm32-i386.c
@@ -423,7 +423,7 @@ static const struct nlm_backend_data nlm32_i386_backend =
 };
 
 #define TARGET_LITTLE_NAME		"nlm32-i386"
-#define TARGET_LITTLE_SYM		nlmNAME (i386_vec)
+#define TARGET_LITTLE_SYM		i386_nlm32_vec
 #define TARGET_BACKEND_DATA		& nlm32_i386_backend
 
 #include "nlm-target.h"
diff --git a/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c
index 26d733b..5ff11f0 100644
--- a/bfd/nlm32-ppc.c
+++ b/bfd/nlm32-ppc.c
@@ -980,7 +980,7 @@ static const struct nlm_backend_data nlm32_powerpc_backend =
 };
 
 #define TARGET_BIG_NAME			"nlm32-powerpc"
-#define TARGET_BIG_SYM			nlmNAME (powerpc_vec)
+#define TARGET_BIG_SYM			powerpc_nlm32_vec
 #define TARGET_BACKEND_DATA		& nlm32_powerpc_backend
 
 #include "nlm-target.h"
diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
index a4d2468..4a68fa2 100644
--- a/bfd/nlm32-sparc.c
+++ b/bfd/nlm32-sparc.c
@@ -372,7 +372,7 @@ static const struct nlm_backend_data nlm32_sparc_backend =
 };
 
 #define TARGET_BIG_NAME		"nlm32-sparc"
-#define TARGET_BIG_SYM		nlmNAME (sparc_vec)
+#define TARGET_BIG_SYM		sparc_nlm32_vec
 #define TARGET_BACKEND_DATA	& nlm32_sparc_backend
 
 #include "nlm-target.h"
diff --git a/bfd/ns32knetbsd.c b/bfd/ns32knetbsd.c
index 3fbb834..4af3aea 100644
--- a/bfd/ns32knetbsd.c
+++ b/bfd/ns32knetbsd.c
@@ -30,7 +30,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (pc532netbsd_,OP)
+#define MY(OP) CONCAT2 (ns32k_aout_pc532nbsd_,OP)
 
 #define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
 
@@ -43,7 +43,7 @@
 
 /* We can`t use the MYNS macro here for cpp reasons too subtle
    for me -- IWD.  */
-#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup ns32k_aout_bfd_reloc_type_lookup
 
 #include "sysdep.h"
 #include "bfd.h"		/* To ensure following declaration is OK.  */
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
index 39e0b14..e4e2adb 100644
--- a/bfd/osf-core.c
+++ b/bfd/osf-core.c
@@ -173,7 +173,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target osf_core_vec =
+const bfd_target core_osf_vec =
   {
     "osf-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
index 67ae62f..c9dcc66 100644
--- a/bfd/pc532-mach.c
+++ b/bfd/pc532-mach.c
@@ -51,7 +51,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (pc532machaout_,OP)
+#define MY(OP) CONCAT2 (ns32k_aout_pc532mach_,OP)
 
 /* Must be the same as aout-ns32k.c */
 #define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
@@ -64,7 +64,7 @@
 #include "libbfd.h"
 #include "aout/aout64.h"
 
-#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
+#define MY_bfd_reloc_type_lookup ns32k_aout_bfd_reloc_type_lookup
 
 /* libaout doesn't use NAME for these ...  */
 
@@ -74,7 +74,7 @@
 
 #define MY_exec_header_not_counted 1
 
-reloc_howto_type *ns32kaout_bfd_reloc_type_lookup
+reloc_howto_type *MY_bfd_reloc_type_lookup
   (bfd *abfd, bfd_reloc_code_real_type code);
 
 static bfd_boolean
diff --git a/bfd/pe-arm-wince.c b/bfd/pe-arm-wince.c
index 8da4e0c..dcfccb3 100644
--- a/bfd/pe-arm-wince.c
+++ b/bfd/pe-arm-wince.c
@@ -21,9 +21,9 @@
 #define TARGET_UNDERSCORE    0
 #define USER_LABEL_PREFIX    ""
 
-#define TARGET_LITTLE_SYM    arm_wince_pe_little_vec
+#define TARGET_LITTLE_SYM    arm_pe_wince_le_vec
 #define TARGET_LITTLE_NAME   "pe-arm-wince-little"
-#define TARGET_BIG_SYM       arm_wince_pe_big_vec
+#define TARGET_BIG_SYM       arm_pe_wince_be_vec
 #define TARGET_BIG_NAME      "pe-arm-wince-big"
 
 #define bfd_arm_allocate_interworking_sections \
diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c
index f73c1b4..136fbf5 100644
--- a/bfd/pe-arm.c
+++ b/bfd/pe-arm.c
@@ -34,9 +34,9 @@
 #include "bfd.h"
 
 #ifndef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM    armpe_little_vec
+#define TARGET_LITTLE_SYM    arm_pe_le_vec
 #define TARGET_LITTLE_NAME   "pe-arm-little"
-#define TARGET_BIG_SYM       armpe_big_vec
+#define TARGET_BIG_SYM       arm_pe_be_vec
 #define TARGET_BIG_NAME      "pe-arm-big"
 #endif
 
diff --git a/bfd/pe-i386.c b/bfd/pe-i386.c
index 8bbdfe6..5f3789c 100644
--- a/bfd/pe-i386.c
+++ b/bfd/pe-i386.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM 		i386pe_vec
+#define TARGET_SYM 		i386_pe_vec
 #define TARGET_NAME 		"pe-i386"
 #define COFF_WITH_PE
 #define PCRELOFFSET 		TRUE
diff --git a/bfd/pe-mcore.c b/bfd/pe-mcore.c
index 1d641f7..f9b9d34 100644
--- a/bfd/pe-mcore.c
+++ b/bfd/pe-mcore.c
@@ -22,9 +22,9 @@
 #include "bfd.h"
 
 #ifndef TARGET_BIG_SYM
-#define TARGET_BIG_SYM       mcore_pe_big_vec
+#define TARGET_BIG_SYM       mcore_pe_be_vec
 #define TARGET_BIG_NAME      "pe-mcore-big"
-#define TARGET_LITTLE_SYM    mcore_pe_little_vec
+#define TARGET_LITTLE_SYM    mcore_pe_le_vec
 #define TARGET_LITTLE_NAME   "pe-mcore-little"
 #endif
 
diff --git a/bfd/pe-mips.c b/bfd/pe-mips.c
index 32308a0..ec7afc4 100644
--- a/bfd/pe-mips.c
+++ b/bfd/pe-mips.c
@@ -856,7 +856,7 @@ const bfd_target
 #ifdef TARGET_SYM
   TARGET_SYM =
 #else
-  mipslpe_vec =
+  mips_pe_le_vec =
 #endif
 {
 #ifdef TARGET_NAME
diff --git a/bfd/pe-ppc.c b/bfd/pe-ppc.c
index b83d69b..ea082b9 100644
--- a/bfd/pe-ppc.c
+++ b/bfd/pe-ppc.c
@@ -25,10 +25,10 @@
 
 #define PPC_PE
 
-#define TARGET_LITTLE_SYM   bfd_powerpcle_pe_vec
+#define TARGET_LITTLE_SYM   powerpc_pe_le_vec
 #define TARGET_LITTLE_NAME "pe-powerpcle"
 
-#define TARGET_BIG_SYM      bfd_powerpc_pe_vec
+#define TARGET_BIG_SYM      powerpc_pe_vec
 #define TARGET_BIG_NAME    "pe-powerpc"
 
 #define COFF_WITH_PE
diff --git a/bfd/pe-sh.c b/bfd/pe-sh.c
index f6c7c9e..9516a85 100644
--- a/bfd/pe-sh.c
+++ b/bfd/pe-sh.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SHL_SYM shlpe_vec
+#define TARGET_SHL_SYM sh_pe_le_vec
 #define TARGET_SHL_NAME "pe-shl"
 #define COFF_WITH_PE
 #define PCRELOFFSET TRUE
diff --git a/bfd/pe-x86_64.c b/bfd/pe-x86_64.c
index 16b13ec..673a544 100644
--- a/bfd/pe-x86_64.c
+++ b/bfd/pe-x86_64.c
@@ -23,7 +23,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM 		x86_64pe_vec
+#define TARGET_SYM 		x86_64_pe_vec
 #define TARGET_NAME 		"pe-x86-64"
 #define COFF_WITH_PE
 #define COFF_WITH_pex64
@@ -63,7 +63,7 @@
 /* Entry for big object files.  */
 
 const bfd_target
-x86_64pe_bigobj_vec =
+x86_64_pe_be_vec =
 {
   "pe-bigobj-x86-64",			/* Name.  */
   bfd_target_coff_flavour,
diff --git a/bfd/pei-arm-wince.c b/bfd/pei-arm-wince.c
index 335d568..6ef9aa9 100644
--- a/bfd/pei-arm-wince.c
+++ b/bfd/pei-arm-wince.c
@@ -21,9 +21,9 @@
 #define TARGET_UNDERSCORE    0
 #define USER_LABEL_PREFIX    ""
 
-#define TARGET_LITTLE_SYM    arm_wince_pei_little_vec
+#define TARGET_LITTLE_SYM    arm_pei_wince_le_vec
 #define TARGET_LITTLE_NAME   "pei-arm-wince-little"
-#define TARGET_BIG_SYM       arm_wince_pei_big_vec
+#define TARGET_BIG_SYM       arm_pei_wince_be_vec
 #define TARGET_BIG_NAME      "pei-arm-wince-big"
 
 #define LOCAL_LABEL_PREFIX "."
diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c
index 9c83237..84318f2 100644
--- a/bfd/pei-arm.c
+++ b/bfd/pei-arm.c
@@ -22,9 +22,9 @@
 #include "bfd.h"
 
 #ifndef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM  armpei_little_vec
+#define TARGET_LITTLE_SYM  arm_pei_le_vec
 #define TARGET_LITTLE_NAME "pei-arm-little"
-#define TARGET_BIG_SYM     armpei_big_vec
+#define TARGET_BIG_SYM     arm_pei_be_vec
 #define TARGET_BIG_NAME    "pei-arm-big"
 #endif
 
diff --git a/bfd/pei-i386.c b/bfd/pei-i386.c
index f57c620..080ed1a 100644
--- a/bfd/pei-i386.c
+++ b/bfd/pei-i386.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM 		i386pei_vec
+#define TARGET_SYM 		i386_pei_vec
 #define TARGET_NAME 		"pei-i386"
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
diff --git a/bfd/pei-ia64.c b/bfd/pei-ia64.c
index 13d79fb..a3cf735 100644
--- a/bfd/pei-ia64.c
+++ b/bfd/pei-ia64.c
@@ -25,7 +25,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM bfd_pei_ia64_vec
+#define TARGET_SYM ia64_pei_vec
 #define TARGET_NAME "pei-ia64"
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
diff --git a/bfd/pei-mcore.c b/bfd/pei-mcore.c
index 75759fb..cb0652d 100644
--- a/bfd/pei-mcore.c
+++ b/bfd/pei-mcore.c
@@ -22,9 +22,9 @@
 #include "bfd.h"
 
 #ifndef TARGET_BIG_SYM
-#define TARGET_BIG_SYM       mcore_pei_big_vec
+#define TARGET_BIG_SYM       mcore_pei_be_vec
 #define TARGET_BIG_NAME      "pei-mcore-big"
-#define TARGET_LITTLE_SYM    mcore_pei_little_vec
+#define TARGET_LITTLE_SYM    mcore_pei_le_vec
 #define TARGET_LITTLE_NAME   "pei-mcore-little"
 #endif
 
diff --git a/bfd/pei-mips.c b/bfd/pei-mips.c
index 2d55e49..5885390 100644
--- a/bfd/pei-mips.c
+++ b/bfd/pei-mips.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM mipslpei_vec
+#define TARGET_SYM mips_pei_le_vec
 #define TARGET_NAME "pei-mips"
 #define COFF_IMAGE_WITH_PE
 #define PCRELOFFSET TRUE
diff --git a/bfd/pei-ppc.c b/bfd/pei-ppc.c
index 6fd5961..6a5bb29 100644
--- a/bfd/pei-ppc.c
+++ b/bfd/pei-ppc.c
@@ -26,10 +26,10 @@
 
 #define PPC_PE
 
-#define TARGET_LITTLE_SYM   bfd_powerpcle_pei_vec
+#define TARGET_LITTLE_SYM   powerpc_pei_le_vec
 #define TARGET_LITTLE_NAME "pei-powerpcle"
 
-#define TARGET_BIG_SYM      bfd_powerpc_pei_vec
+#define TARGET_BIG_SYM      powerpc_pei_vec
 #define TARGET_BIG_NAME    "pei-powerpc"
 
 #define COFF_IMAGE_WITH_PE
diff --git a/bfd/pei-sh.c b/bfd/pei-sh.c
index 49074fa..50d677b 100644
--- a/bfd/pei-sh.c
+++ b/bfd/pei-sh.c
@@ -21,7 +21,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SHL_SYM shlpei_vec
+#define TARGET_SHL_SYM sh_pei_le_vec
 #define TARGET_SHL_NAME "pei-shl"
 #define IMAGE_BASE NT_IMAGE_BASE
 #define COFF_IMAGE_WITH_PE
diff --git a/bfd/pei-x86_64.c b/bfd/pei-x86_64.c
index f022ad0..48554d3 100644
--- a/bfd/pei-x86_64.c
+++ b/bfd/pei-x86_64.c
@@ -23,7 +23,7 @@
 #include "sysdep.h"
 #include "bfd.h"
 
-#define TARGET_SYM 		x86_64pei_vec
+#define TARGET_SYM 		x86_64_pei_vec
 #define TARGET_NAME 		"pei-x86-64"
 #define COFF_IMAGE_WITH_PE
 #define COFF_WITH_PE
diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c
index a05c368..7b99079 100644
--- a/bfd/ppcboot.c
+++ b/bfd/ppcboot.c
@@ -472,7 +472,7 @@ ppcboot_bfd_print_private_bfd_data (bfd *abfd, void * farg)
 #define ppcboot_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
 #define ppcboot_bfd_print_private_bfd_dat ppcboot_bfd_print_private_bfd_data
 
-const bfd_target ppcboot_vec =
+const bfd_target powerpc_boot_vec =
 {
   "ppcboot",			/* name */
   bfd_target_unknown_flavour,	/* flavour */
diff --git a/bfd/ptrace-core.c b/bfd/ptrace-core.c
index 15c1ad4..723f4a4 100644
--- a/bfd/ptrace-core.c
+++ b/bfd/ptrace-core.c
@@ -164,7 +164,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target ptrace_core_vec =
+const bfd_target core_ptrace_vec =
   {
     "trad-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/riscix.c b/bfd/riscix.c
index 9010fcf..ddf5c3a 100644
--- a/bfd/riscix.c
+++ b/bfd/riscix.c
@@ -97,7 +97,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (riscix_,OP)
+#define MY(OP) CONCAT2 (arm_aout_riscix_,OP)
 #define TARGETNAME "a.out-riscix"
 #define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) \
                   && (((x).a_info & ~006000) != OMAGIC) \
@@ -170,7 +170,7 @@ riscix_fix_pcrel_26_done (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 static bfd_reloc_status_type riscix_fix_pcrel_26 (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
-static const bfd_target *riscix_callback (bfd *);
+static const bfd_target *arm_aout_riscix_callback (bfd *);
 
 static reloc_howto_type riscix_std_reloc_howto[] =
 {
@@ -297,9 +297,9 @@ riscix_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 #define MY_bfd_final_link              _bfd_generic_final_link
 
 #define MY_bfd_reloc_type_lookup       riscix_reloc_type_lookup
-#define MY_bfd_reloc_name_lookup riscix_reloc_name_lookup
-#define MY_canonicalize_reloc          riscix_canonicalize_reloc
-#define MY_object_p                    riscix_object_p
+#define MY_bfd_reloc_name_lookup       riscix_reloc_name_lookup
+#define MY_canonicalize_reloc          arm_aout_riscix_canonicalize_reloc
+#define MY_object_p                    arm_aout_riscix_object_p
 
 static void
 riscix_swap_std_reloc_out (bfd *abfd,
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
index d8fa931..7067176 100644
--- a/bfd/sco5-core.c
+++ b/bfd/sco5-core.c
@@ -344,7 +344,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target sco5_core_vec =
+const bfd_target core_sco5_vec =
   {
     "sco5-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/som.c b/bfd/som.c
index 4fddf32..b6143ae 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -5349,7 +5349,7 @@ som_canonicalize_reloc (bfd *abfd,
   return section->reloc_count;
 }
 
-extern const bfd_target som_vec;
+extern const bfd_target hppa_som_vec;
 
 /* A hook to set up object file dependent section information.  */
 
@@ -6750,7 +6750,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
 #define som_bfd_set_private_flags		_bfd_generic_bfd_set_private_flags
 #define som_find_inliner_info			_bfd_nosymbols_find_inliner_info
 
-const bfd_target som_vec =
+const bfd_target hppa_som_vec =
 {
   "som",			/* Name.  */
   bfd_target_som_flavour,
diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c
index bb3cec9..dac3624 100644
--- a/bfd/sparclinux.c
+++ b/bfd/sparclinux.c
@@ -37,7 +37,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (sparclinux_,OP)
+#define MY(OP) CONCAT2 (sparc_aout_linux_,OP)
 #define TARGETNAME "a.out-sparc-linux"
 
 extern const bfd_target MY(vec);
diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c
index 7ffbcb7..2a62c77 100644
--- a/bfd/sparclynx.c
+++ b/bfd/sparclynx.c
@@ -22,7 +22,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (sparclynx_aout_,OP)
+#define MY(OP) CONCAT2 (sparc_aout_lynx_,OP)
 #define TARGETNAME "a.out-sparc-lynx"
 
 #include "sysdep.h"
diff --git a/bfd/sparcnetbsd.c b/bfd/sparcnetbsd.c
index b549ddd..42d94e7 100644
--- a/bfd/sparcnetbsd.c
+++ b/bfd/sparcnetbsd.c
@@ -31,7 +31,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (sparcnetbsd_,OP)
+#define MY(OP) CONCAT2 (sparc_aout_nbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-sparc-netbsd"
diff --git a/bfd/sunos.c b/bfd/sunos.c
index 9036cdf..99bed8d 100644
--- a/bfd/sunos.c
+++ b/bfd/sunos.c
@@ -24,7 +24,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (sunos_big_,OP)
+#define MY(OP) CONCAT2 (sparc_aout_sunos_be_,OP)
 
 #include "sysdep.h"
 #include "bfd.h"
diff --git a/bfd/targets.c b/bfd/targets.c
index d3b585b..0419920 100644
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -567,307 +567,307 @@ to find an alternative output format that is suitable.
    Alphabetized for easy reference.
    They are listed a second time below, since
    we can't intermix extern's and initializers.  */
-extern const bfd_target a_out_adobe_vec;
-extern const bfd_target aix5coff64_vec;
-extern const bfd_target aout0_big_vec;
-extern const bfd_target aout_arm_big_vec;
-extern const bfd_target aout_arm_little_vec;
-extern const bfd_target aout_mips_big_vec;
-extern const bfd_target aout_mips_little_vec;
-extern const bfd_target apollocoff_vec;
-extern const bfd_target arm_epoc_pe_big_vec;
-extern const bfd_target arm_epoc_pe_little_vec;
-extern const bfd_target arm_epoc_pei_big_vec;
-extern const bfd_target arm_epoc_pei_little_vec;
-extern const bfd_target arm_wince_pe_big_vec;
-extern const bfd_target arm_wince_pe_little_vec;
-extern const bfd_target arm_wince_pei_big_vec;
-extern const bfd_target arm_wince_pei_little_vec;
-extern const bfd_target armcoff_big_vec;
-extern const bfd_target armcoff_little_vec;
-extern const bfd_target armnetbsd_vec;
-extern const bfd_target armpe_big_vec;
-extern const bfd_target armpe_little_vec;
-extern const bfd_target armpei_big_vec;
-extern const bfd_target armpei_little_vec;
-extern const bfd_target b_out_vec_big_host;
-extern const bfd_target b_out_vec_little_host;
-extern const bfd_target bfd_pei_ia64_vec;
-extern const bfd_target bfd_elf32_avr_vec;
-extern const bfd_target bfd_elf32_bfin_vec;
-extern const bfd_target bfd_elf32_bfinfdpic_vec;
-extern const bfd_target bfd_elf32_big_generic_vec;
-extern const bfd_target bfd_elf32_bigarc_vec;
-extern const bfd_target bfd_elf32_bigarm_vec;
-extern const bfd_target bfd_elf32_bigarm_nacl_vec;
-extern const bfd_target bfd_elf32_bigarm_symbian_vec;
-extern const bfd_target bfd_elf32_bigarm_vxworks_vec;
-extern const bfd_target bfd_elf32_bigmips_vec;
-extern const bfd_target bfd_elf32_bigmips_vxworks_vec;
-extern const bfd_target bfd_elf32_bigmoxie_vec;
-extern const bfd_target bfd_elf32_bignios2_vec;
-extern const bfd_target bfd_elf32_cr16_vec;
-extern const bfd_target bfd_elf32_cr16c_vec;
-extern const bfd_target bfd_elf32_cris_vec;
-extern const bfd_target bfd_elf32_crx_vec;
-extern const bfd_target bfd_elf32_d10v_vec;
-extern const bfd_target bfd_elf32_d30v_vec;
-extern const bfd_target bfd_elf32_dlx_big_vec;
-extern const bfd_target bfd_elf32_epiphany_vec;
-extern const bfd_target bfd_elf32_fr30_vec;
-extern const bfd_target bfd_elf32_frv_vec;
-extern const bfd_target bfd_elf32_frvfdpic_vec;
-extern const bfd_target bfd_elf32_h8300_vec;
-extern const bfd_target bfd_elf32_hppa_linux_vec;
-extern const bfd_target bfd_elf32_hppa_nbsd_vec;
-extern const bfd_target bfd_elf32_hppa_vec;
-extern const bfd_target bfd_elf32_i370_vec;
-extern const bfd_target bfd_elf32_i386_freebsd_vec;
-extern const bfd_target bfd_elf32_i386_nacl_vec;
-extern const bfd_target bfd_elf32_i386_sol2_vec;
-extern const bfd_target bfd_elf32_i386_vxworks_vec;
-extern const bfd_target bfd_elf32_i386_vec;
-extern const bfd_target bfd_elf32_i860_little_vec;
-extern const bfd_target bfd_elf32_i860_vec;
-extern const bfd_target bfd_elf32_i960_vec;
-extern const bfd_target bfd_elf32_ia64_big_vec;
-extern const bfd_target bfd_elf32_ia64_hpux_big_vec;
-extern const bfd_target bfd_elf32_ip2k_vec;
-extern const bfd_target bfd_elf32_iq2000_vec;
-extern const bfd_target bfd_elf32_lm32_vec;
-extern const bfd_target bfd_elf32_lm32fdpic_vec;
-extern const bfd_target bfd_elf32_little_generic_vec;
-extern const bfd_target bfd_elf32_littlearc_vec;
-extern const bfd_target bfd_elf32_littlearm_vec;
-extern const bfd_target bfd_elf32_littlearm_nacl_vec;
-extern const bfd_target bfd_elf32_littlearm_symbian_vec;
-extern const bfd_target bfd_elf32_littlearm_vxworks_vec;
-extern const bfd_target bfd_elf32_littlemips_vec;
-extern const bfd_target bfd_elf32_littlemips_vxworks_vec;
-extern const bfd_target bfd_elf32_littlemoxie_vec;
-extern const bfd_target bfd_elf32_littlenios2_vec;
-extern const bfd_target bfd_elf32_m32c_vec;
-extern const bfd_target bfd_elf32_m32r_vec;
-extern const bfd_target bfd_elf32_m32rle_vec;
-extern const bfd_target bfd_elf32_m32rlin_vec;
-extern const bfd_target bfd_elf32_m32rlelin_vec;
-extern const bfd_target bfd_elf32_m68hc11_vec;
-extern const bfd_target bfd_elf32_m68hc12_vec;
-extern const bfd_target bfd_elf32_m68k_vec;
-extern const bfd_target bfd_elf32_m88k_vec;
-extern const bfd_target bfd_elf32_mcore_big_vec;
-extern const bfd_target bfd_elf32_mcore_little_vec;
-extern const bfd_target bfd_elf32_mep_vec;
-extern const bfd_target bfd_elf32_mep_little_vec;
-extern const bfd_target bfd_elf32_metag_vec;
-extern const bfd_target bfd_elf32_microblazeel_vec;
-extern const bfd_target bfd_elf32_microblaze_vec;
-extern const bfd_target bfd_elf32_mn10200_vec;
-extern const bfd_target bfd_elf32_mn10300_vec;
-extern const bfd_target bfd_elf32_mt_vec;
-extern const bfd_target bfd_elf32_msp430_vec;
-extern const bfd_target bfd_elf32_msp430_ti_vec;
-extern const bfd_target bfd_elf32_nbigmips_vec;
-extern const bfd_target bfd_elf32_nlittlemips_vec;
-extern const bfd_target bfd_elf32_ntradbigmips_vec;
-extern const bfd_target bfd_elf32_ntradlittlemips_vec;
-extern const bfd_target bfd_elf32_ntradbigmips_freebsd_vec;
-extern const bfd_target bfd_elf32_ntradlittlemips_freebsd_vec;
-extern const bfd_target bfd_elf32_nds32be_vec;
-extern const bfd_target bfd_elf32_nds32le_vec;
-extern const bfd_target bfd_elf32_nds32belin_vec;
-extern const bfd_target bfd_elf32_nds32lelin_vec;
-extern const bfd_target bfd_elf32_or1k_vec;
-extern const bfd_target bfd_elf32_pj_vec;
-extern const bfd_target bfd_elf32_pjl_vec;
-extern const bfd_target bfd_elf32_powerpc_vec;
-extern const bfd_target bfd_elf32_powerpcle_vec;
-extern const bfd_target bfd_elf32_powerpc_freebsd_vec;
-extern const bfd_target bfd_elf32_powerpc_vxworks_vec;
-extern const bfd_target bfd_elf32_rl78_vec;
-extern const bfd_target bfd_elf32_rx_le_vec;
-extern const bfd_target bfd_elf32_rx_be_vec;
-extern const bfd_target bfd_elf32_rx_be_ns_vec;
-extern const bfd_target bfd_elf32_s390_vec;
-extern const bfd_target bfd_elf32_bigscore_vec;
-extern const bfd_target bfd_elf32_littlescore_vec;
-extern const bfd_target bfd_elf32_sh64_vec;
-extern const bfd_target bfd_elf32_sh64l_vec;
-extern const bfd_target bfd_elf32_sh64lin_vec;
-extern const bfd_target bfd_elf32_sh64blin_vec;
-extern const bfd_target bfd_elf32_sh64lnbsd_vec;
-extern const bfd_target bfd_elf32_sh64nbsd_vec;
-extern const bfd_target bfd_elf32_sh_vec;
-extern const bfd_target bfd_elf32_shbfd_vec;
-extern const bfd_target bfd_elf32_shblin_vec;
-extern const bfd_target bfd_elf32_shfd_vec;
-extern const bfd_target bfd_elf32_shl_vec;
-extern const bfd_target bfd_elf32_shl_symbian_vec;
-extern const bfd_target bfd_elf32_shlin_vec;
-extern const bfd_target bfd_elf32_shlnbsd_vec;
-extern const bfd_target bfd_elf32_shlvxworks_vec;
-extern const bfd_target bfd_elf32_shnbsd_vec;
-extern const bfd_target bfd_elf32_shvxworks_vec;
-extern const bfd_target bfd_elf32_sparc_vec;
-extern const bfd_target bfd_elf32_sparc_sol2_vec;
-extern const bfd_target bfd_elf32_sparc_vxworks_vec;
-extern const bfd_target bfd_elf32_spu_vec;
-extern const bfd_target bfd_elf32_tic6x_be_vec;
-extern const bfd_target bfd_elf32_tic6x_le_vec;
-extern const bfd_target bfd_elf32_tic6x_elf_be_vec;
-extern const bfd_target bfd_elf32_tic6x_elf_le_vec;
-extern const bfd_target bfd_elf32_tic6x_linux_be_vec;
-extern const bfd_target bfd_elf32_tic6x_linux_le_vec;
-extern const bfd_target bfd_elf32_tilegx_be_vec;
-extern const bfd_target bfd_elf32_tilegx_le_vec;
-extern const bfd_target bfd_elf32_tilepro_vec;
-extern const bfd_target bfd_elf32_tradbigmips_vec;
-extern const bfd_target bfd_elf32_tradlittlemips_vec;
-extern const bfd_target bfd_elf32_tradbigmips_freebsd_vec;
-extern const bfd_target bfd_elf32_tradlittlemips_freebsd_vec;
-extern const bfd_target bfd_elf32_us_cris_vec;
-extern const bfd_target bfd_elf32_v850_vec;
-extern const bfd_target bfd_elf32_v850_rh850_vec;
-extern const bfd_target bfd_elf32_vax_vec;
-extern const bfd_target bfd_elf32_xc16x_vec;
-extern const bfd_target bfd_elf32_xgate_vec;
-extern const bfd_target bfd_elf32_xstormy16_vec;
-extern const bfd_target bfd_elf32_xtensa_be_vec;
-extern const bfd_target bfd_elf32_xtensa_le_vec;
-extern const bfd_target bfd_elf64_alpha_freebsd_vec;
-extern const bfd_target bfd_elf64_alpha_vec;
-extern const bfd_target bfd_elf64_big_generic_vec;
-extern const bfd_target bfd_elf64_bigmips_vec;
-extern const bfd_target bfd_elf64_bigaarch64_vec;
-extern const bfd_target bfd_elf32_bigaarch64_vec;
-extern const bfd_target bfd_elf64_hppa_linux_vec;
-extern const bfd_target bfd_elf64_hppa_vec;
-extern const bfd_target bfd_elf64_ia64_big_vec;
-extern const bfd_target bfd_elf64_ia64_hpux_big_vec;
-extern const bfd_target bfd_elf64_ia64_little_vec;
-extern const bfd_target bfd_elf64_ia64_vms_vec;
-extern const bfd_target bfd_elf64_little_generic_vec;
-extern const bfd_target bfd_elf64_littlemips_vec;
-extern const bfd_target bfd_elf64_littleaarch64_vec;
-extern const bfd_target bfd_elf32_littleaarch64_vec;
-extern const bfd_target bfd_elf64_mmix_vec;
-extern const bfd_target bfd_elf64_powerpc_vec;
-extern const bfd_target bfd_elf64_powerpcle_vec;
-extern const bfd_target bfd_elf64_powerpc_freebsd_vec;
-extern const bfd_target bfd_elf64_s390_vec;
-extern const bfd_target bfd_elf64_sh64_vec;
-extern const bfd_target bfd_elf64_sh64l_vec;
-extern const bfd_target bfd_elf64_sh64lin_vec;
-extern const bfd_target bfd_elf64_sh64blin_vec;
-extern const bfd_target bfd_elf64_sh64lnbsd_vec;
-extern const bfd_target bfd_elf64_sh64nbsd_vec;
-extern const bfd_target bfd_elf64_sparc_vec;
-extern const bfd_target bfd_elf64_sparc_freebsd_vec;
-extern const bfd_target bfd_elf64_sparc_sol2_vec;
-extern const bfd_target bfd_elf64_tilegx_be_vec;
-extern const bfd_target bfd_elf64_tilegx_le_vec;
-extern const bfd_target bfd_elf64_tradbigmips_vec;
-extern const bfd_target bfd_elf64_tradlittlemips_vec;
-extern const bfd_target bfd_elf64_tradbigmips_freebsd_vec;
-extern const bfd_target bfd_elf64_tradlittlemips_freebsd_vec;
-extern const bfd_target bfd_elf64_x86_64_freebsd_vec;
-extern const bfd_target bfd_elf64_x86_64_nacl_vec;
-extern const bfd_target bfd_elf64_x86_64_sol2_vec;
-extern const bfd_target bfd_elf64_x86_64_vec;
-extern const bfd_target bfd_elf32_x86_64_nacl_vec;
-extern const bfd_target bfd_elf32_x86_64_vec;
-extern const bfd_target bfd_elf64_l1om_freebsd_vec;
-extern const bfd_target bfd_elf64_l1om_vec;
-extern const bfd_target bfd_elf64_k1om_freebsd_vec;
-extern const bfd_target bfd_elf64_k1om_vec;
-extern const bfd_target bfd_mmo_vec;
-extern const bfd_target bfd_powerpc_pe_vec;
-extern const bfd_target bfd_powerpc_pei_vec;
-extern const bfd_target bfd_powerpcle_pe_vec;
-extern const bfd_target bfd_powerpcle_pei_vec;
+extern const bfd_target aout_adobe_vec;
+extern const bfd_target rs6000_xcoff64_aix_vec;
+extern const bfd_target aout0_be_vec;
+extern const bfd_target arm_aout_be_vec;
+extern const bfd_target arm_aout_le_vec;
+extern const bfd_target mips_aout_be_vec;
+extern const bfd_target mips_aout_le_vec;
+extern const bfd_target m68k_coff_apollo_vec;
+extern const bfd_target arm_pe_epoc_be_vec;
+extern const bfd_target arm_pe_epoc_le_vec;
+extern const bfd_target arm_pei_epoc_be_vec;
+extern const bfd_target arm_pei_epoc_le_vec;
+extern const bfd_target arm_pe_wince_be_vec;
+extern const bfd_target arm_pe_wince_le_vec;
+extern const bfd_target arm_pei_wince_be_vec;
+extern const bfd_target arm_pei_wince_le_vec;
+extern const bfd_target arm_coff_be_vec;
+extern const bfd_target arm_coff_le_vec;
+extern const bfd_target arm_aout_nbsd_vec;
+extern const bfd_target arm_pe_be_vec;
+extern const bfd_target arm_pe_le_vec;
+extern const bfd_target arm_pei_be_vec;
+extern const bfd_target arm_pei_le_vec;
+extern const bfd_target bout_be_vec;
+extern const bfd_target bout_le_vec;
+extern const bfd_target ia64_pei_vec;
+extern const bfd_target avr_elf32_vec;
+extern const bfd_target bfin_elf32_vec;
+extern const bfd_target bfin_elf32_fdpic_vec;
+extern const bfd_target elf32_be_vec;
+extern const bfd_target arc_elf32_be_vec;
+extern const bfd_target arm_elf32_be_vec;
+extern const bfd_target arm_elf32_nacl_be_vec;
+extern const bfd_target arm_elf32_symbian_be_vec;
+extern const bfd_target arm_elf32_vxworks_be_vec;
+extern const bfd_target mips_elf32_be_vec;
+extern const bfd_target mips_elf32_vxworks_be_vec;
+extern const bfd_target moxie_elf32_be_vec;
+extern const bfd_target nios2_elf32_be_vec;
+extern const bfd_target cr16_elf32_vec;
+extern const bfd_target cr16c_elf32_vec;
+extern const bfd_target cris_elf32_vec;
+extern const bfd_target crx_elf32_vec;
+extern const bfd_target d10v_elf32_vec;
+extern const bfd_target d30v_elf32_vec;
+extern const bfd_target dlx_elf32_be_vec;
+extern const bfd_target epiphany_elf32_vec;
+extern const bfd_target fr30_elf32_vec;
+extern const bfd_target frv_elf32_vec;
+extern const bfd_target frv_elf32_fdpic_vec;
+extern const bfd_target h8300_elf32_vec;
+extern const bfd_target hppa_elf32_linux_vec;
+extern const bfd_target hppa_elf32_nbsd_vec;
+extern const bfd_target hppa_elf32_vec;
+extern const bfd_target i370_elf32_vec;
+extern const bfd_target i386_elf32_fbsd_vec;
+extern const bfd_target i386_elf32_nacl_vec;
+extern const bfd_target i386_elf32_sol2_vec;
+extern const bfd_target i386_elf32_vxworks_vec;
+extern const bfd_target i386_elf32_vec;
+extern const bfd_target i860_elf32_le_vec;
+extern const bfd_target i860_elf32_vec;
+extern const bfd_target i960_elf32_vec;
+extern const bfd_target ia64_elf32_be_vec;
+extern const bfd_target ia64_elf32_hpux_be_vec;
+extern const bfd_target ip2k_elf32_vec;
+extern const bfd_target iq2000_elf32_vec;
+extern const bfd_target lm32_elf32_vec;
+extern const bfd_target lm32_elf32_fdpic_vec;
+extern const bfd_target elf32_le_vec;
+extern const bfd_target arc_elf32_le_vec;
+extern const bfd_target arm_elf32_le_vec;
+extern const bfd_target arm_elf32_nacl_le_vec;
+extern const bfd_target arm_elf32_symbian_le_vec;
+extern const bfd_target arm_elf32_vxworks_le_vec;
+extern const bfd_target mips_elf32_le_vec;
+extern const bfd_target mips_elf32_vxworks_le_vec;
+extern const bfd_target moxie_elf32_le_vec;
+extern const bfd_target nios2_elf32_le_vec;
+extern const bfd_target m32c_elf32_vec;
+extern const bfd_target m32r_elf32_vec;
+extern const bfd_target m32r_elf32_le_vec;
+extern const bfd_target m32r_elf32_linux_vec;
+extern const bfd_target m32r_elf32_linux_le_vec;
+extern const bfd_target m68hc11_elf32_vec;
+extern const bfd_target m68hc12_elf32_vec;
+extern const bfd_target m68k_elf32_vec;
+extern const bfd_target m88k_elf32_vec;
+extern const bfd_target mcore_elf32_be_vec;
+extern const bfd_target mcore_elf32_le_vec;
+extern const bfd_target mep_elf32_vec;
+extern const bfd_target mep_elf32_le_vec;
+extern const bfd_target metag_elf32_vec;
+extern const bfd_target microblaze_elf32_le_vec;
+extern const bfd_target microblaze_elf32_vec;
+extern const bfd_target mn10200_elf32_vec;
+extern const bfd_target mn10300_elf32_vec;
+extern const bfd_target mt_elf32_vec;
+extern const bfd_target msp430_elf32_vec;
+extern const bfd_target msp430_elf32_ti_vec;
+extern const bfd_target mips_elf32_n_be_vec;
+extern const bfd_target mips_elf32_n_le_vec;
+extern const bfd_target mips_elf32_ntrad_be_vec;
+extern const bfd_target mips_elf32_ntrad_le_vec;
+extern const bfd_target mips_elf32_ntradfbsd_be_vec;
+extern const bfd_target mips_elf32_ntradfbsd_le_vec;
+extern const bfd_target nds32_elf32_be_vec;
+extern const bfd_target nds32_elf32_le_vec;
+extern const bfd_target nds32_elf32_linux_be_vec;
+extern const bfd_target nds32_elf32_linux_le_vec;
+extern const bfd_target or1k_elf32_vec;
+extern const bfd_target pj_elf32_vec;
+extern const bfd_target pj_elf32_le_vec;
+extern const bfd_target powerpc_elf32_vec;
+extern const bfd_target powerpc_elf32_le_vec;
+extern const bfd_target powerpc_elf32_fbsd_vec;
+extern const bfd_target powerpc_elf32_vxworks_vec;
+extern const bfd_target rl78_elf32_vec;
+extern const bfd_target rx_elf32_le_vec;
+extern const bfd_target rx_elf32_be_vec;
+extern const bfd_target rx_elf32_be_ns_vec;
+extern const bfd_target s390_elf32_vec;
+extern const bfd_target score_elf32_be_vec;
+extern const bfd_target score_elf32_le_vec;
+extern const bfd_target sh64_elf32_vec;
+extern const bfd_target sh64_elf32_le_vec;
+extern const bfd_target sh64_elf32_linux_vec;
+extern const bfd_target sh64_elf32_linux_be_vec;
+extern const bfd_target sh64_elf32_nbsd_le_vec;
+extern const bfd_target sh64_elf32_nbsd_vec;
+extern const bfd_target sh_elf32_vec;
+extern const bfd_target sh_elf32_fdpic_be_vec;
+extern const bfd_target sh_elf32_linux_be_vec;
+extern const bfd_target sh_elf32_fdpic_le_vec;
+extern const bfd_target sh_elf32_le_vec;
+extern const bfd_target sh_elf32_symbian_le_vec;
+extern const bfd_target sh_elf32_linux_vec;
+extern const bfd_target sh_elf32_nbsd_le_vec;
+extern const bfd_target sh_elf32_vxworks_le_vec;
+extern const bfd_target sh_elf32_nbsd_vec;
+extern const bfd_target sh_elf32_vxworks_vec;
+extern const bfd_target sparc_elf32_vec;
+extern const bfd_target sparc_elf32_sol2_vec;
+extern const bfd_target sparc_elf32_vxworks_vec;
+extern const bfd_target spu_elf32_vec;
+extern const bfd_target tic6x_elf32_be_vec;
+extern const bfd_target tic6x_elf32_le_vec;
+extern const bfd_target tic6x_elf32_c6000_be_vec;
+extern const bfd_target tic6x_elf32_c6000_le_vec;
+extern const bfd_target tic6x_elf32_linux_be_vec;
+extern const bfd_target tic6x_elf32_linux_le_vec;
+extern const bfd_target tilegx_elf32_be_vec;
+extern const bfd_target tilegx_elf32_le_vec;
+extern const bfd_target tilepro_elf32_vec;
+extern const bfd_target mips_elf32_trad_be_vec;
+extern const bfd_target mips_elf32_trad_le_vec;
+extern const bfd_target mips_elf32_tradfbsd_be_vec;
+extern const bfd_target mips_elf32_tradfbsd_le_vec;
+extern const bfd_target cris_elf32_us_vec;
+extern const bfd_target v850_elf32_vec;
+extern const bfd_target v800_elf32_vec;
+extern const bfd_target vax_elf32_vec;
+extern const bfd_target xc16x_elf32_vec;
+extern const bfd_target xgate_elf32_vec;
+extern const bfd_target xstormy16_elf32_vec;
+extern const bfd_target xtensa_elf32_be_vec;
+extern const bfd_target xtensa_elf32_le_vec;
+extern const bfd_target alpha_elf64_fbsd_vec;
+extern const bfd_target alpha_elf64_vec;
+extern const bfd_target elf64_be_vec;
+extern const bfd_target mips_elf64_be_vec;
+extern const bfd_target aarch64_elf64_be_vec;
+extern const bfd_target aarch64_elf32_be_vec;
+extern const bfd_target hppa_elf64_linux_vec;
+extern const bfd_target hppa_elf64_vec;
+extern const bfd_target ia64_elf64_be_vec;
+extern const bfd_target ia64_elf64_hpux_be_vec;
+extern const bfd_target ia64_elf64_le_vec;
+extern const bfd_target ia64_elf64_vms_vec;
+extern const bfd_target elf64_le_vec;
+extern const bfd_target mips_elf64_le_vec;
+extern const bfd_target aarch64_elf64_le_vec;
+extern const bfd_target aarch64_elf32_le_vec;
+extern const bfd_target mmix_elf64_vec;
+extern const bfd_target powerpc_elf64_vec;
+extern const bfd_target powerpc_elf64_le_vec;
+extern const bfd_target powerpc_elf64_fbsd_vec;
+extern const bfd_target s390_elf64_vec;
+extern const bfd_target sh64_elf64_vec;
+extern const bfd_target sh64_elf64_le_vec;
+extern const bfd_target sh64_elf64_linux_vec;
+extern const bfd_target sh64_elf64_linux_be_vec;
+extern const bfd_target sh64_elf64_nbsd_le_vec;
+extern const bfd_target sh64_elf64_nbsd_vec;
+extern const bfd_target sparc_elf64_vec;
+extern const bfd_target sparc_elf64_fbsd_vec;
+extern const bfd_target sparc_elf64_sol2_vec;
+extern const bfd_target tilegx_elf64_be_vec;
+extern const bfd_target tilegx_elf64_le_vec;
+extern const bfd_target mips_elf64_trad_be_vec;
+extern const bfd_target mips_elf64_trad_le_vec;
+extern const bfd_target mips_elf64_tradfbsd_be_vec;
+extern const bfd_target mips_elf64_tradfbsd_le_vec;
+extern const bfd_target x86_64_elf64_fbsd_vec;
+extern const bfd_target x86_64_elf64_nacl_vec;
+extern const bfd_target x86_64_elf64_sol2_vec;
+extern const bfd_target x86_64_elf64_vec;
+extern const bfd_target x86_64_elf32_nacl_vec;
+extern const bfd_target x86_64_elf32_vec;
+extern const bfd_target l1om_elf64_fbsd_vec;
+extern const bfd_target l1om_elf64_vec;
+extern const bfd_target k1om_elf64_fbsd_vec;
+extern const bfd_target k1om_elf64_vec;
+extern const bfd_target mmix_mmo_vec;
+extern const bfd_target powerpc_pe_vec;
+extern const bfd_target powerpc_pei_vec;
+extern const bfd_target powerpc_pe_le_vec;
+extern const bfd_target powerpc_pei_le_vec;
 extern const bfd_target cris_aout_vec;
-extern const bfd_target demo_64_vec;
-extern const bfd_target ecoff_big_vec;
-extern const bfd_target ecoff_biglittle_vec;
-extern const bfd_target ecoff_little_vec;
-extern const bfd_target ecoffalpha_little_vec;
-extern const bfd_target go32coff_vec;
-extern const bfd_target go32stubbedcoff_vec;
-extern const bfd_target h8300coff_vec;
-extern const bfd_target h8500coff_vec;
-extern const bfd_target host_aout_vec;
-extern const bfd_target hp300bsd_vec;
-extern const bfd_target hp300hpux_vec;
-extern const bfd_target i386aout_vec;
-extern const bfd_target i386bsd_vec;
-extern const bfd_target i386coff_vec;
-extern const bfd_target i386dynix_vec;
-extern const bfd_target i386freebsd_vec;
-extern const bfd_target i386linux_vec;
-extern const bfd_target i386lynx_aout_vec;
-extern const bfd_target i386lynx_coff_vec;
-extern const bfd_target i386mach3_vec;
-extern const bfd_target i386msdos_vec;
-extern const bfd_target i386netbsd_vec;
-extern const bfd_target i386os9k_vec;
-extern const bfd_target i386pe_vec;
-extern const bfd_target i386pei_vec;
-extern const bfd_target i860coff_vec;
-extern const bfd_target icoff_big_vec;
-extern const bfd_target icoff_little_vec;
+extern const bfd_target aout64_vec;
+extern const bfd_target mips_ecoff_be_vec;
+extern const bfd_target mips_ecoff_bele_vec;
+extern const bfd_target mips_ecoff_le_vec;
+extern const bfd_target alpha_ecoff_le_vec;
+extern const bfd_target i386_coff_go32_vec;
+extern const bfd_target i386_coff_go32stubbed_vec;
+extern const bfd_target h8300_coff_vec;
+extern const bfd_target h8500_coff_vec;
+extern const bfd_target aout_vec;
+extern const bfd_target m68k_aout_hp300bsd_vec;
+extern const bfd_target m68k_aout_hp300hpux_vec;
+extern const bfd_target i386_aout_vec;
+extern const bfd_target i386_aout_bsd_vec;
+extern const bfd_target i386_coff_vec;
+extern const bfd_target i386_aout_dynix_vec;
+extern const bfd_target i386_aout_fbsd_vec;
+extern const bfd_target i386_aout_linux_vec;
+extern const bfd_target i386_aout_lynx_vec;
+extern const bfd_target i386_coff_lynx_vec;
+extern const bfd_target i386_aout_mach3_vec;
+extern const bfd_target i386_msdos_vec;
+extern const bfd_target i386_aout_nbsd_vec;
+extern const bfd_target i386_aout_os9k_vec;
+extern const bfd_target i386_pe_vec;
+extern const bfd_target i386_pei_vec;
+extern const bfd_target i860_coff_vec;
+extern const bfd_target icoff_be_vec;
+extern const bfd_target icoff_le_vec;
 extern const bfd_target ieee_vec;
-extern const bfd_target m68k4knetbsd_vec;
-extern const bfd_target m68kaux_coff_vec;
-extern const bfd_target m68kcoff_vec;
-extern const bfd_target m68kcoffun_vec;
-extern const bfd_target m68klinux_vec;
-extern const bfd_target m68knetbsd_vec;
-extern const bfd_target m68ksysvcoff_vec;
-extern const bfd_target m88kbcs_vec;
-extern const bfd_target m88kmach3_vec;
-extern const bfd_target m88kopenbsd_vec;
+extern const bfd_target m68k_aout_4knbsd_vec;
+extern const bfd_target m68k_coff_aux_vec;
+extern const bfd_target m68k_coff_vec;
+extern const bfd_target m68k_coff_un_vec;
+extern const bfd_target m68k_aout_linux_vec;
+extern const bfd_target m68k_aout_nbsd_vec;
+extern const bfd_target m68k_coff_sysv_vec;
+extern const bfd_target m88k_coff_bcs_vec;
+extern const bfd_target m88k_aout_mach3_vec;
+extern const bfd_target m88k_aout_obsd_vec;
 extern const bfd_target mach_o_be_vec;
 extern const bfd_target mach_o_le_vec;
 extern const bfd_target mach_o_fat_vec;
-extern const bfd_target mach_o_i386_vec;
-extern const bfd_target mach_o_x86_64_vec;
-extern const bfd_target mcore_pe_big_vec;
-extern const bfd_target mcore_pe_little_vec;
-extern const bfd_target mcore_pei_big_vec;
-extern const bfd_target mcore_pei_little_vec;
-extern const bfd_target mipslpe_vec;
-extern const bfd_target mipslpei_vec;
-extern const bfd_target newsos3_vec;
-extern const bfd_target nlm32_alpha_vec;
-extern const bfd_target nlm32_i386_vec;
-extern const bfd_target nlm32_powerpc_vec;
-extern const bfd_target nlm32_sparc_vec;
+extern const bfd_target i386_mach_o_vec;
+extern const bfd_target x86_64_mach_o_vec;
+extern const bfd_target mcore_pe_be_vec;
+extern const bfd_target mcore_pe_le_vec;
+extern const bfd_target mcore_pei_be_vec;
+extern const bfd_target mcore_pei_le_vec;
+extern const bfd_target mips_pe_le_vec;
+extern const bfd_target mips_pei_le_vec;
+extern const bfd_target m68k_aout_newsos3_vec;
+extern const bfd_target alpha_nlm32_vec;
+extern const bfd_target i386_nlm32_vec;
+extern const bfd_target powerpc_nlm32_vec;
+extern const bfd_target sparc_nlm32_vec;
 extern const bfd_target oasys_vec;
-extern const bfd_target pc532machaout_vec;
-extern const bfd_target pc532netbsd_vec;
+extern const bfd_target ns32k_aout_pc532mach_vec;
+extern const bfd_target ns32k_aout_pc532nbsd_vec;
 extern const bfd_target pdp11_aout_vec;
 extern const bfd_target pef_vec;
 extern const bfd_target pef_xlib_vec;
 extern const bfd_target plugin_vec;
-extern const bfd_target pmac_xcoff_vec;
-extern const bfd_target ppcboot_vec;
-extern const bfd_target riscix_vec;
-extern const bfd_target rs6000coff64_vec;
-extern const bfd_target rs6000coff_vec;
-extern const bfd_target shcoff_small_vec;
-extern const bfd_target shcoff_vec;
-extern const bfd_target shlcoff_small_vec;
-extern const bfd_target shlcoff_vec;
-extern const bfd_target shlpe_vec;
-extern const bfd_target shlpei_vec;
-extern const bfd_target som_vec;
-extern const bfd_target sparccoff_vec;
-extern const bfd_target sparcle_aout_vec;
-extern const bfd_target sparclinux_vec;
-extern const bfd_target sparclynx_aout_vec;
-extern const bfd_target sparclynx_coff_vec;
-extern const bfd_target sparcnetbsd_vec;
-extern const bfd_target sunos_big_vec;
+extern const bfd_target powerpc_xcoff_vec;
+extern const bfd_target powerpc_boot_vec;
+extern const bfd_target arm_aout_riscix_vec;
+extern const bfd_target rs6000_xcoff64_vec;
+extern const bfd_target rs6000_xcoff_vec;
+extern const bfd_target sh_coff_small_vec;
+extern const bfd_target sh_coff_vec;
+extern const bfd_target sh_coff_small_le_vec;
+extern const bfd_target sh_coff_le_vec;
+extern const bfd_target sh_pe_le_vec;
+extern const bfd_target sh_pei_le_vec;
+extern const bfd_target hppa_som_vec;
+extern const bfd_target sparc_coff_vec;
+extern const bfd_target sparc_aout_le_vec;
+extern const bfd_target sparc_aout_linux_vec;
+extern const bfd_target sparc_aout_lynx_vec;
+extern const bfd_target sparc_coff_lynx_vec;
+extern const bfd_target sparc_aout_nbsd_vec;
+extern const bfd_target sparc_aout_sunos_be_vec;
 extern const bfd_target sym_vec;
 extern const bfd_target tic30_aout_vec;
 extern const bfd_target tic30_coff_vec;
@@ -883,21 +883,21 @@ extern const bfd_target tic54x_coff1_beh_vec;
 extern const bfd_target tic54x_coff1_vec;
 extern const bfd_target tic54x_coff2_beh_vec;
 extern const bfd_target tic54x_coff2_vec;
-extern const bfd_target tic80coff_vec;
-extern const bfd_target vaxbsd_vec;
-extern const bfd_target vaxnetbsd_vec;
-extern const bfd_target vax1knetbsd_vec;
-extern const bfd_target versados_vec;
-extern const bfd_target vms_alpha_vec;
-extern const bfd_target vms_lib_txt_vec;
-extern const bfd_target w65_vec;
-extern const bfd_target we32kcoff_vec;
-extern const bfd_target x86_64pe_vec;
-extern const bfd_target x86_64pei_vec;
-extern const bfd_target x86_64pe_bigobj_vec;
-extern const bfd_target x86_64coff_vec;
-extern const bfd_target z80coff_vec;
-extern const bfd_target z8kcoff_vec;
+extern const bfd_target tic80_coff_vec;
+extern const bfd_target vax_aout_bsd_vec;
+extern const bfd_target vax_aout_nbsd_vec;
+extern const bfd_target vax_aout_1knbsd_vec;
+extern const bfd_target m68k_versados_vec;
+extern const bfd_target alpha_vms_vec;
+extern const bfd_target alpha_vms_lib_txt_vec;
+extern const bfd_target w65_coff_vec;
+extern const bfd_target we32k_coff_vec;
+extern const bfd_target x86_64_pe_vec;
+extern const bfd_target x86_64_pei_vec;
+extern const bfd_target x86_64_pe_be_vec;
+extern const bfd_target x86_64_coff_vec;
+extern const bfd_target z80_coff_vec;
+extern const bfd_target z8k_coff_vec;
 
 /* These are always included.  */
 extern const bfd_target srec_vec;
@@ -908,19 +908,19 @@ extern const bfd_target binary_vec;
 extern const bfd_target ihex_vec;
 
 /* All of the xvecs for core files.  */
-extern const bfd_target aix386_core_vec;
-extern const bfd_target cisco_core_big_vec;
-extern const bfd_target cisco_core_little_vec;
-extern const bfd_target hppabsd_core_vec;
-extern const bfd_target hpux_core_vec;
-extern const bfd_target irix_core_vec;
-extern const bfd_target netbsd_core_vec;
-extern const bfd_target osf_core_vec;
-extern const bfd_target ptrace_core_vec;
-extern const bfd_target sco5_core_vec;
-extern const bfd_target trad_core_vec;
-
-extern const bfd_target bfd_elf32_am33lin_vec;
+extern const bfd_target core_aix386_vec;
+extern const bfd_target core_cisco_be_vec;
+extern const bfd_target core_cisco_le_vec;
+extern const bfd_target core_hppabsd_vec;
+extern const bfd_target core_hpux_vec;
+extern const bfd_target core_irix_vec;
+extern const bfd_target core_netbsd_vec;
+extern const bfd_target core_osf_vec;
+extern const bfd_target core_ptrace_vec;
+extern const bfd_target core_sco5_vec;
+extern const bfd_target core_trad_vec;
+
+extern const bfd_target am33_elf32_linux_vec;
 static const bfd_target * const _bfd_target_vector[] =
 {
 #ifdef SELECT_VECS
@@ -938,339 +938,339 @@ static const bfd_target * const _bfd_target_vector[] =
 	   Vectors that don't compile on all systems, or aren't finished,
 	   should have an entry here with #if 0 around it, to show that
 	   it wasn't omitted by mistake.  */
-	&a_out_adobe_vec,
+	&aout_adobe_vec,
 #ifdef BFD64
-	&aix5coff64_vec,
+	&rs6000_xcoff64_aix_vec,
 #endif
-	&aout0_big_vec,
+	&aout0_be_vec,
 #if 0
 	/* We have no way of distinguishing these from other a.out variants.  */
-	&aout_arm_big_vec,
-	&aout_arm_little_vec,
+	&arm_aout_be_vec,
+	&arm_aout_le_vec,
 	/* No one seems to use this.  */
-	&aout_mips_big_vec,
+	&mips_aout_be_vec,
 #endif
-	&aout_mips_little_vec,
+	&mips_aout_le_vec,
 #if 0
-	&apollocoff_vec,
+	&m68k_coff_apollo_vec,
 #endif
-	&arm_epoc_pe_big_vec,
-	&arm_epoc_pe_little_vec,
-	&arm_epoc_pei_big_vec,
-	&arm_epoc_pei_little_vec,
-	&arm_wince_pe_big_vec,
-	&arm_wince_pe_little_vec,
-	&arm_wince_pei_big_vec,
-	&arm_wince_pei_little_vec,
-	&armcoff_big_vec,
-	&armcoff_little_vec,
-	&armnetbsd_vec,
-	&armpe_big_vec,
-	&armpe_little_vec,
-	&armpei_big_vec,
-	&armpei_little_vec,
-	&b_out_vec_big_host,
-	&b_out_vec_little_host,
+	&arm_pe_epoc_be_vec,
+	&arm_pe_epoc_le_vec,
+	&arm_pei_epoc_be_vec,
+	&arm_pei_epoc_le_vec,
+	&arm_pe_wince_be_vec,
+	&arm_pe_wince_le_vec,
+	&arm_pei_wince_be_vec,
+	&arm_pei_wince_le_vec,
+	&arm_coff_be_vec,
+	&arm_coff_le_vec,
+	&arm_aout_nbsd_vec,
+	&arm_pe_be_vec,
+	&arm_pe_le_vec,
+	&arm_pei_be_vec,
+	&arm_pei_le_vec,
+	&bout_be_vec,
+	&bout_le_vec,
 #ifdef BFD64
-	&bfd_pei_ia64_vec,
+	&ia64_pei_vec,
 #endif
-	&bfd_elf32_avr_vec,
-	&bfd_elf32_bfin_vec,
-	&bfd_elf32_bfinfdpic_vec,
+	&avr_elf32_vec,
+	&bfin_elf32_vec,
+	&bfin_elf32_fdpic_vec,
 
 	/* This, and other vectors, may not be used in any *.mt configuration.
 	   But that does not mean they are unnecessary.  If configured with
 	   --enable-targets=all, objdump or gdb should be able to examine
 	   the file even if we don't recognize the machine type.  */
-	&bfd_elf32_big_generic_vec,
-	&bfd_elf32_bigarc_vec,
-	&bfd_elf32_bigarm_vec,
-	&bfd_elf32_bigarm_symbian_vec,
-	&bfd_elf32_bigarm_vxworks_vec,
+	&elf32_be_vec,
+	&arc_elf32_be_vec,
+	&arm_elf32_be_vec,
+	&arm_elf32_symbian_be_vec,
+	&arm_elf32_vxworks_be_vec,
 #ifdef BFD64
-	&bfd_elf32_bigmips_vec,
-	&bfd_elf32_bigmips_vxworks_vec,
+	&mips_elf32_be_vec,
+	&mips_elf32_vxworks_be_vec,
 #endif
- 	&bfd_elf32_bigmoxie_vec,
- 	&bfd_elf32_bignios2_vec,
-	&bfd_elf32_cr16_vec,
-	&bfd_elf32_cr16c_vec,
-	&bfd_elf32_cris_vec,
-	&bfd_elf32_crx_vec,
-	&bfd_elf32_d10v_vec,
-	&bfd_elf32_d30v_vec,
-	&bfd_elf32_dlx_big_vec,
-	&bfd_elf32_epiphany_vec,
-	&bfd_elf32_fr30_vec,
-	&bfd_elf32_frv_vec,
-	&bfd_elf32_frvfdpic_vec,
-	&bfd_elf32_h8300_vec,
-	&bfd_elf32_hppa_linux_vec,
-	&bfd_elf32_hppa_nbsd_vec,
-	&bfd_elf32_hppa_vec,
-	&bfd_elf32_i370_vec,
-	&bfd_elf32_i386_freebsd_vec,
-	&bfd_elf32_i386_nacl_vec,
-	&bfd_elf32_i386_sol2_vec,
-	&bfd_elf32_i386_vxworks_vec,
-	&bfd_elf32_i386_vec,
-	&bfd_elf32_i860_little_vec,
-	&bfd_elf32_i860_vec,
-	&bfd_elf32_i960_vec,
+	&moxie_elf32_be_vec,
+	&nios2_elf32_be_vec,
+	&cr16_elf32_vec,
+	&cr16c_elf32_vec,
+	&cris_elf32_vec,
+	&crx_elf32_vec,
+	&d10v_elf32_vec,
+	&d30v_elf32_vec,
+	&dlx_elf32_be_vec,
+	&epiphany_elf32_vec,
+	&fr30_elf32_vec,
+	&frv_elf32_vec,
+	&frv_elf32_fdpic_vec,
+	&h8300_elf32_vec,
+	&hppa_elf32_linux_vec,
+	&hppa_elf32_nbsd_vec,
+	&hppa_elf32_vec,
+	&i370_elf32_vec,
+	&i386_elf32_fbsd_vec,
+	&i386_elf32_nacl_vec,
+	&i386_elf32_sol2_vec,
+	&i386_elf32_vxworks_vec,
+	&i386_elf32_vec,
+	&i860_elf32_le_vec,
+	&i860_elf32_vec,
+	&i960_elf32_vec,
 #if 0
-	&bfd_elf32_ia64_big_vec,
+	&ia64_elf32_be_vec,
 #endif
 #ifdef BFD64
-	&bfd_elf32_ia64_hpux_big_vec,
+	&ia64_elf32_hpux_be_vec,
 #endif
-	&bfd_elf32_ip2k_vec,
-	&bfd_elf32_iq2000_vec,
-	&bfd_elf32_lm32_vec,
-	&bfd_elf32_little_generic_vec,
-	&bfd_elf32_littlearc_vec,
-	&bfd_elf32_littlearm_vec,
-	&bfd_elf32_littlearm_symbian_vec,
-	&bfd_elf32_littlearm_vxworks_vec,
+	&ip2k_elf32_vec,
+	&iq2000_elf32_vec,
+	&lm32_elf32_vec,
+	&elf32_le_vec,
+	&arc_elf32_le_vec,
+	&arm_elf32_le_vec,
+	&arm_elf32_symbian_le_vec,
+	&arm_elf32_vxworks_le_vec,
 #ifdef BFD64
-	&bfd_elf32_littlemips_vec,
-	&bfd_elf32_littlemips_vxworks_vec,
+	&mips_elf32_le_vec,
+	&mips_elf32_vxworks_le_vec,
 #endif
- 	&bfd_elf32_littlemoxie_vec,
- 	&bfd_elf32_littlenios2_vec,
-	&bfd_elf32_m32c_vec,
-	&bfd_elf32_m32r_vec,
-        &bfd_elf32_m32rle_vec,
-        &bfd_elf32_m32rlin_vec,
-        &bfd_elf32_m32rlelin_vec,
-	&bfd_elf32_m68hc11_vec,
-	&bfd_elf32_m68hc12_vec,
-	&bfd_elf32_m68k_vec,
-	&bfd_elf32_m88k_vec,
-	&bfd_elf32_mcore_big_vec,
-	&bfd_elf32_mcore_little_vec,
-	&bfd_elf32_mep_vec,
-	&bfd_elf32_metag_vec,
-	&bfd_elf32_microblaze_vec,
-	&bfd_elf32_mn10200_vec,
-	&bfd_elf32_mn10300_vec,
-	&bfd_elf32_mt_vec,
-	&bfd_elf32_msp430_vec,
-	&bfd_elf32_msp430_ti_vec,
+	&moxie_elf32_le_vec,
+	&nios2_elf32_le_vec,
+	&m32c_elf32_vec,
+	&m32r_elf32_vec,
+        &m32r_elf32_le_vec,
+        &m32r_elf32_linux_vec,
+        &m32r_elf32_linux_le_vec,
+	&m68hc11_elf32_vec,
+	&m68hc12_elf32_vec,
+	&m68k_elf32_vec,
+	&m88k_elf32_vec,
+	&mcore_elf32_be_vec,
+	&mcore_elf32_le_vec,
+	&mep_elf32_vec,
+	&metag_elf32_vec,
+	&microblaze_elf32_vec,
+	&mn10200_elf32_vec,
+	&mn10300_elf32_vec,
+	&mt_elf32_vec,
+	&msp430_elf32_vec,
+	&msp430_elf32_ti_vec,
 #ifdef BFD64
-	&bfd_elf32_nbigmips_vec,
-	&bfd_elf32_nlittlemips_vec,
-	&bfd_elf32_ntradbigmips_vec,
-	&bfd_elf32_ntradlittlemips_vec,
-	&bfd_elf32_ntradbigmips_freebsd_vec,
-	&bfd_elf32_ntradlittlemips_freebsd_vec,
+	&mips_elf32_n_be_vec,
+	&mips_elf32_n_le_vec,
+	&mips_elf32_ntrad_be_vec,
+	&mips_elf32_ntrad_le_vec,
+	&mips_elf32_ntradfbsd_be_vec,
+	&mips_elf32_ntradfbsd_le_vec,
 #endif
-	&bfd_elf32_nds32be_vec,
-	&bfd_elf32_nds32le_vec,
-	&bfd_elf32_nds32belin_vec,
-	&bfd_elf32_nds32lelin_vec,
-	&bfd_elf32_or1k_vec,
-	&bfd_elf32_pj_vec,
-	&bfd_elf32_pjl_vec,
-	&bfd_elf32_powerpc_vec,
-	&bfd_elf32_powerpc_vxworks_vec,
-	&bfd_elf32_powerpcle_vec,
-	&bfd_elf32_powerpc_freebsd_vec,
-	&bfd_elf32_rl78_vec,
-	&bfd_elf32_rx_be_vec,
-	&bfd_elf32_rx_be_ns_vec,
-	&bfd_elf32_rx_le_vec,
-	&bfd_elf32_s390_vec,
+	&nds32_elf32_be_vec,
+	&nds32_elf32_le_vec,
+	&nds32_elf32_linux_be_vec,
+	&nds32_elf32_linux_le_vec,
+	&or1k_elf32_vec,
+	&pj_elf32_vec,
+	&pj_elf32_le_vec,
+	&powerpc_elf32_vec,
+	&powerpc_elf32_vxworks_vec,
+	&powerpc_elf32_le_vec,
+	&powerpc_elf32_fbsd_vec,
+	&rl78_elf32_vec,
+	&rx_elf32_be_vec,
+	&rx_elf32_be_ns_vec,
+	&rx_elf32_le_vec,
+	&s390_elf32_vec,
 #ifdef BFD64
-	&bfd_elf32_bigscore_vec,
-	&bfd_elf32_littlescore_vec,
+	&score_elf32_be_vec,
+	&score_elf32_le_vec,
 #endif
-        &bfd_elf32_sh_vec,
-        &bfd_elf32_shbfd_vec,
-        &bfd_elf32_shblin_vec,
-        &bfd_elf32_shfd_vec,
-        &bfd_elf32_shl_vec,
-        &bfd_elf32_shl_symbian_vec,
-        &bfd_elf32_shlin_vec,
-	&bfd_elf32_shlnbsd_vec,
-	&bfd_elf32_shlvxworks_vec,
-	&bfd_elf32_shnbsd_vec,
-	&bfd_elf32_shvxworks_vec,
+        &sh_elf32_vec,
+        &sh_elf32_fdpic_be_vec,
+        &sh_elf32_linux_be_vec,
+        &sh_elf32_fdpic_le_vec,
+        &sh_elf32_le_vec,
+        &sh_elf32_symbian_le_vec,
+        &sh_elf32_linux_vec,
+	&sh_elf32_nbsd_le_vec,
+	&sh_elf32_vxworks_le_vec,
+	&sh_elf32_nbsd_vec,
+	&sh_elf32_vxworks_vec,
 #ifdef BFD64
-	&bfd_elf32_sh64_vec,
-	&bfd_elf32_sh64l_vec,
-	&bfd_elf32_sh64lnbsd_vec,
-	&bfd_elf32_sh64nbsd_vec,
-	&bfd_elf32_sh64lin_vec,
-	&bfd_elf32_sh64blin_vec,
+	&sh64_elf32_vec,
+	&sh64_elf32_le_vec,
+	&sh64_elf32_nbsd_le_vec,
+	&sh64_elf32_nbsd_vec,
+	&sh64_elf32_linux_vec,
+	&sh64_elf32_linux_be_vec,
 #endif
-	&bfd_elf32_sparc_vec,
-	&bfd_elf32_sparc_sol2_vec,
-	&bfd_elf32_sparc_vxworks_vec,
-	&bfd_elf32_spu_vec,
-	&bfd_elf32_tic6x_be_vec,
-	&bfd_elf32_tic6x_le_vec,
-	&bfd_elf32_tilegx_be_vec,
-	&bfd_elf32_tilegx_le_vec,
-	&bfd_elf32_tilepro_vec,
+	&sparc_elf32_vec,
+	&sparc_elf32_sol2_vec,
+	&sparc_elf32_vxworks_vec,
+	&spu_elf32_vec,
+	&tic6x_elf32_be_vec,
+	&tic6x_elf32_le_vec,
+	&tilegx_elf32_be_vec,
+	&tilegx_elf32_le_vec,
+	&tilepro_elf32_vec,
 #ifdef BFD64
-	&bfd_elf32_tradbigmips_vec,
-	&bfd_elf32_tradlittlemips_vec,
-	&bfd_elf32_tradbigmips_freebsd_vec,
-	&bfd_elf32_tradlittlemips_freebsd_vec,
+	&mips_elf32_trad_be_vec,
+	&mips_elf32_trad_le_vec,
+	&mips_elf32_tradfbsd_be_vec,
+	&mips_elf32_tradfbsd_le_vec,
 #endif
-	&bfd_elf32_us_cris_vec,
-	&bfd_elf32_v850_vec,
-	&bfd_elf32_v850_rh850_vec,
-	&bfd_elf32_vax_vec,
-	&bfd_elf32_xc16x_vec,
-	&bfd_elf32_xgate_vec,
-	&bfd_elf32_xstormy16_vec,
-	&bfd_elf32_xtensa_be_vec,
-	&bfd_elf32_xtensa_le_vec,
+	&cris_elf32_us_vec,
+	&v850_elf32_vec,
+	&v800_elf32_vec,
+	&vax_elf32_vec,
+	&xc16x_elf32_vec,
+	&xgate_elf32_vec,
+	&xstormy16_elf32_vec,
+	&xtensa_elf32_be_vec,
+	&xtensa_elf32_le_vec,
 #ifdef BFD64
-	&bfd_elf64_alpha_freebsd_vec,
-	&bfd_elf64_alpha_vec,
-	&bfd_elf64_big_generic_vec,
-	&bfd_elf64_bigmips_vec,
-	&bfd_elf64_bigaarch64_vec,
-	&bfd_elf32_bigaarch64_vec,
-	&bfd_elf64_hppa_linux_vec,
-	&bfd_elf64_hppa_vec,
-	&bfd_elf64_ia64_big_vec,
-	&bfd_elf64_ia64_hpux_big_vec,
-	&bfd_elf64_ia64_little_vec,
-	&bfd_elf64_ia64_vms_vec,
-	&bfd_elf64_little_generic_vec,
-	&bfd_elf64_littlemips_vec,
-	&bfd_elf64_littleaarch64_vec,
-	&bfd_elf32_littleaarch64_vec,
-	&bfd_elf64_mmix_vec,
-	&bfd_elf64_powerpc_vec,
-	&bfd_elf64_powerpcle_vec,
-	&bfd_elf64_powerpc_freebsd_vec,
-	&bfd_elf64_s390_vec,
-	&bfd_elf64_sh64_vec,
-	&bfd_elf64_sh64l_vec,
-	&bfd_elf64_sh64lnbsd_vec,
-	&bfd_elf64_sh64nbsd_vec,
-	&bfd_elf64_sh64lin_vec,
-	&bfd_elf64_sh64blin_vec,
-	&bfd_elf64_sparc_vec,
-	&bfd_elf64_sparc_freebsd_vec,
-	&bfd_elf64_sparc_sol2_vec,
-	&bfd_elf64_tilegx_be_vec,
-	&bfd_elf64_tilegx_le_vec,
-	&bfd_elf64_tradbigmips_vec,
-	&bfd_elf64_tradlittlemips_vec,
-	&bfd_elf64_tradbigmips_freebsd_vec,
-	&bfd_elf64_tradlittlemips_freebsd_vec,
-	&bfd_elf64_x86_64_freebsd_vec,
-	&bfd_elf64_x86_64_nacl_vec,
-	&bfd_elf64_x86_64_sol2_vec,
-	&bfd_elf64_x86_64_vec,
-	&bfd_elf32_x86_64_nacl_vec,
-	&bfd_elf32_x86_64_vec,
-	&bfd_elf64_l1om_freebsd_vec,
-	&bfd_elf64_l1om_vec,
-	&bfd_elf64_k1om_freebsd_vec,
-	&bfd_elf64_k1om_vec,
-	&bfd_mmo_vec,
+	&alpha_elf64_fbsd_vec,
+	&alpha_elf64_vec,
+	&elf64_be_vec,
+	&mips_elf64_be_vec,
+	&aarch64_elf64_be_vec,
+	&aarch64_elf32_be_vec,
+	&hppa_elf64_linux_vec,
+	&hppa_elf64_vec,
+	&ia64_elf64_be_vec,
+	&ia64_elf64_hpux_be_vec,
+	&ia64_elf64_le_vec,
+	&ia64_elf64_vms_vec,
+	&elf64_le_vec,
+	&mips_elf64_le_vec,
+	&aarch64_elf64_le_vec,
+	&aarch64_elf32_le_vec,
+	&mmix_elf64_vec,
+	&powerpc_elf64_vec,
+	&powerpc_elf64_le_vec,
+	&powerpc_elf64_fbsd_vec,
+	&s390_elf64_vec,
+	&sh64_elf64_vec,
+	&sh64_elf64_le_vec,
+	&sh64_elf64_nbsd_le_vec,
+	&sh64_elf64_nbsd_vec,
+	&sh64_elf64_linux_vec,
+	&sh64_elf64_linux_be_vec,
+	&sparc_elf64_vec,
+	&sparc_elf64_fbsd_vec,
+	&sparc_elf64_sol2_vec,
+	&tilegx_elf64_be_vec,
+	&tilegx_elf64_le_vec,
+	&mips_elf64_trad_be_vec,
+	&mips_elf64_trad_le_vec,
+	&mips_elf64_tradfbsd_be_vec,
+	&mips_elf64_tradfbsd_le_vec,
+	&x86_64_elf64_fbsd_vec,
+	&x86_64_elf64_nacl_vec,
+	&x86_64_elf64_sol2_vec,
+	&x86_64_elf64_vec,
+	&x86_64_elf32_nacl_vec,
+	&x86_64_elf32_vec,
+	&l1om_elf64_fbsd_vec,
+	&l1om_elf64_vec,
+	&k1om_elf64_fbsd_vec,
+	&k1om_elf64_vec,
+	&mmix_mmo_vec,
 #endif
-	&bfd_powerpc_pe_vec,
-	&bfd_powerpc_pei_vec,
-	&bfd_powerpcle_pe_vec,
-	&bfd_powerpcle_pei_vec,
+	&powerpc_pe_vec,
+	&powerpc_pei_vec,
+	&powerpc_pe_le_vec,
+	&powerpc_pei_le_vec,
 	&cris_aout_vec,
 #ifdef BFD64
-	&demo_64_vec,	/* Only compiled if host has long-long support.  */
+	&aout64_vec,	/* Only compiled if host has long-long support.  */
 #endif
-	&ecoff_big_vec,
-	&ecoff_biglittle_vec,
-	&ecoff_little_vec,
+	&mips_ecoff_be_vec,
+	&mips_ecoff_bele_vec,
+	&mips_ecoff_le_vec,
 #ifdef BFD64
-	&ecoffalpha_little_vec,
+	&alpha_ecoff_le_vec,
 #endif
-	&go32coff_vec,
-	&go32stubbedcoff_vec,
-	&h8300coff_vec,
-	&h8500coff_vec,
+	&i386_coff_go32_vec,
+	&i386_coff_go32stubbed_vec,
+	&h8300_coff_vec,
+	&h8500_coff_vec,
 #if 0
 	/* Since a.out files lack decent magic numbers, no way to recognize
 	   which kind of a.out file it is.  */
-	&host_aout_vec,
-	/* Clashes with sunos_big_vec magic no.  */
-	&hp300bsd_vec,
+	&aout_vec,
+	/* Clashes with sparc_aout_sunos_be_vec magic no.  */
+	&m68k_aout_hp300bsd_vec,
 #endif
-	&hp300hpux_vec,
-	&i386aout_vec,
-	&i386bsd_vec,
-	&i386coff_vec,
+	&m68k_aout_hp300hpux_vec,
+	&i386_aout_vec,
+	&i386_aout_bsd_vec,
+	&i386_coff_vec,
 #if 0
-	&i386dynix_vec,
+	&i386_aout_dynix_vec,
 #endif
-	&i386freebsd_vec,
+	&i386_aout_fbsd_vec,
 #if 0
 	/* Since a.out files lack decent magic numbers, no way to recognize
 	   which kind of a.out file it is.  */
-	&i386linux_vec,
+	&i386_aout_linux_vec,
 #endif
-	&i386lynx_aout_vec,
-	&i386lynx_coff_vec,
+	&i386_aout_lynx_vec,
+	&i386_coff_lynx_vec,
 #if 0
 	/* No distinguishing features for Mach 3 executables.  */
-	&i386mach3_vec,
+	&i386_aout_mach3_vec,
 #endif
-	&i386msdos_vec,
-	&i386netbsd_vec,
-	&i386os9k_vec,
-	&i386pe_vec,
-	&i386pei_vec,
+	&i386_msdos_vec,
+	&i386_aout_nbsd_vec,
+	&i386_aout_os9k_vec,
+	&i386_pe_vec,
+	&i386_pei_vec,
 #ifdef BFD64
-	&x86_64coff_vec,
-	&x86_64pe_vec,
-	&x86_64pei_vec,
-	&x86_64pe_bigobj_vec,
+	&x86_64_coff_vec,
+	&x86_64_pe_vec,
+	&x86_64_pei_vec,
+	&x86_64_pe_be_vec,
 #endif
-	&i860coff_vec,
-	&icoff_big_vec,
-	&icoff_little_vec,
+	&i860_coff_vec,
+	&icoff_be_vec,
+	&icoff_le_vec,
 	&ieee_vec,
 #if 0
-	&m68k4knetbsd_vec,
-	&m68kaux_coff_vec,
+	&m68k_aout_4knbsd_vec,
+	&m68k_coff_aux_vec,
 #endif
-	&m68kcoff_vec,
-	&m68kcoffun_vec,
+	&m68k_coff_vec,
+	&m68k_coff_un_vec,
 #if 0
 	/* Since a.out files lack decent magic numbers, no way to recognize
 	   which kind of a.out file it is.  */
-	&m68klinux_vec,
+	&m68k_aout_linux_vec,
 #endif
-	&m68knetbsd_vec,
-	&m68ksysvcoff_vec,
-	&m88kbcs_vec,
-	&m88kmach3_vec,
-	&m88kopenbsd_vec,
+	&m68k_aout_nbsd_vec,
+	&m68k_coff_sysv_vec,
+	&m88k_coff_bcs_vec,
+	&m88k_aout_mach3_vec,
+	&m88k_aout_obsd_vec,
 	&mach_o_be_vec,
 	&mach_o_le_vec,
 	&mach_o_fat_vec,
-	&mach_o_i386_vec,
+	&i386_mach_o_vec,
 #ifdef BFD64
-	&mach_o_x86_64_vec,
+	&x86_64_mach_o_vec,
 #endif
-	&mcore_pe_big_vec,
-	&mcore_pe_little_vec,
-	&mcore_pei_big_vec,
-	&mcore_pei_little_vec,
-	&mipslpe_vec,
-	&mipslpei_vec,
-	&newsos3_vec,
+	&mcore_pe_be_vec,
+	&mcore_pe_le_vec,
+	&mcore_pei_be_vec,
+	&mcore_pei_le_vec,
+	&mips_pe_le_vec,
+	&mips_pei_le_vec,
+	&m68k_aout_newsos3_vec,
 #ifdef BFD64
-	&nlm32_alpha_vec,
+	&alpha_nlm32_vec,
 #endif
-	&nlm32_i386_vec,
-	&nlm32_powerpc_vec,
-	&nlm32_sparc_vec,
+	&i386_nlm32_vec,
+	&powerpc_nlm32_vec,
+	&sparc_nlm32_vec,
 #if 0
 	/* We have no oasys tools anymore, so we can't test any of this
 	   anymore. If you want to test the stuff yourself, go ahead...
@@ -1280,8 +1280,8 @@ static const bfd_target * const _bfd_target_vector[] =
 	&oasys_vec,
 #endif
 
-	&pc532machaout_vec,
-	&pc532netbsd_vec,
+	&ns32k_aout_pc532mach_vec,
+	&ns32k_aout_pc532nbsd_vec,
 	&pdp11_aout_vec,
 	&pef_vec,
 	&pef_xlib_vec,
@@ -1290,31 +1290,31 @@ static const bfd_target * const _bfd_target_vector[] =
 #endif
 #if 0
 	/* This has the same magic number as RS/6000.  */
-	&pmac_xcoff_vec,
+	&powerpc_xcoff_vec,
 #endif
-	&ppcboot_vec,
+	&powerpc_boot_vec,
 #if 0
 	/* We have no way of distinguishing these from other a.out variants.  */
-	&riscix_vec,
+	&arm_aout_riscix_vec,
 #endif
 #ifdef BFD64
-	&rs6000coff64_vec,
+	&rs6000_xcoff64_vec,
 #endif
-	&rs6000coff_vec,
-	&shcoff_small_vec,
-	&shcoff_vec,
-	&shlcoff_small_vec,
-	&shlcoff_vec,
-	&shlpe_vec,
-	&shlpei_vec,
-	&som_vec,
-	&sparccoff_vec,
-	&sparcle_aout_vec,
-	&sparclinux_vec,
-	&sparclynx_aout_vec,
-	&sparclynx_coff_vec,
-	&sparcnetbsd_vec,
-	&sunos_big_vec,
+	&rs6000_xcoff_vec,
+	&sh_coff_small_vec,
+	&sh_coff_vec,
+	&sh_coff_small_le_vec,
+	&sh_coff_le_vec,
+	&sh_pe_le_vec,
+	&sh_pei_le_vec,
+	&hppa_som_vec,
+	&sparc_coff_vec,
+	&sparc_aout_le_vec,
+	&sparc_aout_linux_vec,
+	&sparc_aout_lynx_vec,
+	&sparc_coff_lynx_vec,
+	&sparc_aout_nbsd_vec,
+	&sparc_aout_sunos_be_vec,
 	&sym_vec,
 	&tic30_aout_vec,
 	&tic30_coff_vec,
@@ -1324,20 +1324,20 @@ static const bfd_target * const _bfd_target_vector[] =
 	&tic54x_coff1_vec,
 	&tic54x_coff2_beh_vec,
 	&tic54x_coff2_vec,
-	&tic80coff_vec,
-	&vaxbsd_vec,
-	&vaxnetbsd_vec,
-	&vax1knetbsd_vec,
-	&versados_vec,
+	&tic80_coff_vec,
+	&vax_aout_bsd_vec,
+	&vax_aout_nbsd_vec,
+	&vax_aout_1knbsd_vec,
+	&m68k_versados_vec,
 #ifdef BFD64
-	&vms_alpha_vec,
+	&alpha_vms_vec,
 #endif
-        &vms_lib_txt_vec,
-	&w65_vec,
-	&we32kcoff_vec,
-	&z80coff_vec,
-	&z8kcoff_vec,
-	&bfd_elf32_am33lin_vec,
+        &alpha_vms_lib_txt_vec,
+	&w65_coff_vec,
+	&we32k_coff_vec,
+	&z80_coff_vec,
+	&z8k_coff_vec,
+	&am33_elf32_linux_vec,
 #endif /* not SELECT_VECS */
 
 /* Always support S-records, for convenience.  */
@@ -1355,38 +1355,38 @@ static const bfd_target * const _bfd_target_vector[] =
 /* Add any required traditional-core-file-handler.  */
 
 #ifdef AIX386_CORE
-	&aix386_core_vec,
+	&core_aix386_vec,
 #endif
 #if 0
 	/* We don't include cisco_core_*_vec.  Although it has a magic number,
 	   the magic number isn't at the beginning of the file, and thus
 	   might spuriously match other kinds of files.  */
-	&cisco_core_big_vec,
-	&cisco_core_little_vec,
+	&core_cisco_be_vec,
+	&core_cisco_le_vec,
 #endif
 #ifdef HPPABSD_CORE
-	&hppabsd_core_vec,
+	&core_hppabsd_vec,
 #endif
 #ifdef HPUX_CORE
-	&hpux_core_vec,
+	&core_hpux_vec,
 #endif
 #ifdef IRIX_CORE
-	&irix_core_vec,
+	&core_irix_vec,
 #endif
 #ifdef NETBSD_CORE
-	&netbsd_core_vec,
+	&core_netbsd_vec,
 #endif
 #ifdef OSF_CORE
-	&osf_core_vec,
+	&core_osf_vec,
 #endif
 #ifdef PTRACE_CORE
-	&ptrace_core_vec,
+	&core_ptrace_vec,
 #endif
 #ifdef SCO5_CORE
-	&sco5_core_vec,
+	&core_sco5_vec,
 #endif
 #ifdef TRAD_CORE
-	&trad_core_vec,
+	&core_trad_vec,
 #endif
 
 	NULL /* end of list marker */
@@ -1586,7 +1586,7 @@ FUNCTION
 SYNOPSIS
 	const bfd_target *bfd_get_target_info (const char *target_name,
 					       bfd *abfd,
-				 	       bfd_boolean *is_bigendian,
+					       bfd_boolean *is_bigendian,
 					       int *underscoring,
 					       const char **def_target_arch);
 DESCRIPTION
@@ -1655,7 +1655,7 @@ bfd_get_target_info (const char *target_name, bfd *abfd,
 		    {
 		      *hyp = 0;
 		      if (_bfd_find_arch_match (new_tname, arches,
-			  			def_target_arch))
+						def_target_arch))
 			break;
 		    }
 		}
diff --git a/bfd/trad-core.c b/bfd/trad-core.c
index 3827e2e..ce1231e 100644
--- a/bfd/trad-core.c
+++ b/bfd/trad-core.c
@@ -265,7 +265,7 @@ swap_abort (void)
 #define	NO_PUT64 ((void (*) (bfd_uint64_t, void *)) swap_abort)
 #define	NO_GETS64 ((bfd_int64_t (*) (const void *)) swap_abort)
 
-const bfd_target trad_core_vec =
+const bfd_target core_trad_vec =
   {
     "trad-core",
     bfd_target_unknown_flavour,
diff --git a/bfd/vax1knetbsd.c b/bfd/vax1knetbsd.c
index f592cdc..58614ef 100644
--- a/bfd/vax1knetbsd.c
+++ b/bfd/vax1knetbsd.c
@@ -30,7 +30,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (vax1knetbsd_,OP)
+#define MY(OP) CONCAT2 (vax_aout_1knbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-vax1k-netbsd"
diff --git a/bfd/vaxbsd.c b/bfd/vaxbsd.c
index e80e3f2..54e8a32 100644
--- a/bfd/vaxbsd.c
+++ b/bfd/vaxbsd.c
@@ -28,7 +28,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate the
    tokens.  */
-#define MY(OP) CONCAT2 (vaxbsd_,OP)
+#define MY(OP) CONCAT2 (vax_aout_bsd_,OP)
 
 #define TARGETNAME "a.out-vax-bsd"
 
diff --git a/bfd/vaxnetbsd.c b/bfd/vaxnetbsd.c
index e31b44d..faf507e 100644
--- a/bfd/vaxnetbsd.c
+++ b/bfd/vaxnetbsd.c
@@ -30,7 +30,7 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (vaxnetbsd_,OP)
+#define MY(OP) CONCAT2 (vax_aout_nbsd_,OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-vax-netbsd"
diff --git a/bfd/versados.c b/bfd/versados.c
index a2dbdf5..2d49458 100644
--- a/bfd/versados.c
+++ b/bfd/versados.c
@@ -820,7 +820,7 @@ versados_canonicalize_reloc (bfd *abfd,
 #define versados_bfd_final_link                       _bfd_generic_final_link
 #define versados_bfd_link_split_section               _bfd_generic_link_split_section
 
-const bfd_target versados_vec =
+const bfd_target m68k_versados_vec =
 {
   "versados",			/* Name.  */
   bfd_target_versados_flavour,
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index e038f1a..1d2250e 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -9255,7 +9255,7 @@ bfd_vms_get_data (bfd *abfd)
 #define alpha_vms_canonicalize_dynamic_reloc \
   _bfd_nodynamic_canonicalize_dynamic_reloc
 
-const bfd_target vms_alpha_vec =
+const bfd_target alpha_vms_vec =
 {
   "vms-alpha",			/* Name.  */
   bfd_target_evax_flavour,
diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index 21331cd..dbacc33 100644
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -2311,7 +2311,7 @@ _bfd_vms_lib_write_archive_contents (bfd *arch)
 /* Add a target for text library.  This costs almost nothing and is useful to
    read VMS library on the host.  */
 
-const bfd_target vms_lib_txt_vec =
+const bfd_target alpha_vms_lib_txt_vec =
 {
   "vms-libtxt",			/* Name.  */
   bfd_target_unknown_flavour,
author	Alan Modra <amodra@gmail.com>	2014-05-02 20:09:40 +0930
committer	Alan Modra <amodra@gmail.com>	2014-05-02 20:09:40 +0930
commit	6d00b590316c0b08de21a264893b0fd627c54686 (patch)
tree	0979fb1e6f86fa1b5d57f252ad9d804597387ac4 /bfd
parent	4e60800159eab4b73ff263595986d5ae4eaf7413 (diff)
download	gdb-6d00b590316c0b08de21a264893b0fd627c54686.zip gdb-6d00b590316c0b08de21a264893b0fd627c54686.tar.gz gdb-6d00b590316c0b08de21a264893b0fd627c54686.tar.bz2