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.

1 files changed, 631 insertions, 631 deletions

diff --git a/bfd/targets.c b/bfd/targets.c
index d3b585b4b31..0419920e337 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;
 		    }
 		}