From 6d00b590316c0b08de21a264893b0fd627c54686 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 2 May 2014 20:09:40 +0930 Subject: bfd target vector rationalisation This renames the bfd targets to ____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 ____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. --- ld/emultempl/metagelf.em | 4 ++-- ld/emultempl/nios2elf.em | 6 +++--- ld/emultempl/spuelf.em | 4 ++-- ld/emultempl/tic6xdsbt.em | 26 +++++++++++++------------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'ld/emultempl') diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em index 7aaf168..1f77ecd 100644 --- a/ld/emultempl/metagelf.em +++ b/ld/emultempl/metagelf.em @@ -45,9 +45,9 @@ static bfd_signed_vma group_size = 1; static void metagelf_create_output_section_statements (void) { - extern const bfd_target bfd_elf32_metag_vec; + extern const bfd_target metag_elf32_vec; - if (link_info.output_bfd->xvec != &bfd_elf32_metag_vec) + if (link_info.output_bfd->xvec != &metag_elf32_vec) return; stub_file = lang_add_input_file ("linker stubs", diff --git a/ld/emultempl/nios2elf.em b/ld/emultempl/nios2elf.em index 6936f11..991a11b 100644 --- a/ld/emultempl/nios2elf.em +++ b/ld/emultempl/nios2elf.em @@ -41,10 +41,10 @@ static int need_laying_out = 0; static void nios2elf_create_output_section_statements (void) { - extern const bfd_target bfd_elf32_littlenios2_vec, bfd_elf32_bignios2_vec; + extern const bfd_target nios2_elf32_le_vec, nios2_elf32_be_vec; - if (link_info.output_bfd->xvec != &bfd_elf32_littlenios2_vec - && link_info.output_bfd->xvec != &bfd_elf32_bignios2_vec) + if (link_info.output_bfd->xvec != &nios2_elf32_le_vec + && link_info.output_bfd->xvec != &nios2_elf32_be_vec) return; /* If --no-relax was not explicitly specified by the user, enable diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index 5167b35..1b4d72f 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -89,9 +89,9 @@ static const struct _ovl_stream icache_mgr_stream = { static int is_spu_target (void) { - extern const bfd_target bfd_elf32_spu_vec; + extern const bfd_target spu_elf32_vec; - return link_info.output_bfd->xvec == &bfd_elf32_spu_vec; + return link_info.output_bfd->xvec == &spu_elf32_vec; } /* Create our note section. */ diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em index b6691fd..ca957c4 100644 --- a/ld/emultempl/tic6xdsbt.em +++ b/ld/emultempl/tic6xdsbt.em @@ -36,19 +36,19 @@ static int merge_exidx_entries = -1; static int is_tic6x_target (void) { - extern const bfd_target bfd_elf32_tic6x_le_vec; - extern const bfd_target bfd_elf32_tic6x_be_vec; - extern const bfd_target bfd_elf32_tic6x_linux_le_vec; - extern const bfd_target bfd_elf32_tic6x_linux_be_vec; - extern const bfd_target bfd_elf32_tic6x_elf_le_vec; - extern const bfd_target bfd_elf32_tic6x_elf_be_vec; - - return (link_info.output_bfd->xvec == &bfd_elf32_tic6x_le_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_be_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_linux_le_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_linux_be_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_elf_le_vec - || link_info.output_bfd->xvec == &bfd_elf32_tic6x_elf_be_vec); + extern const bfd_target tic6x_elf32_le_vec; + extern const bfd_target tic6x_elf32_be_vec; + extern const bfd_target tic6x_elf32_linux_le_vec; + extern const bfd_target tic6x_elf32_linux_be_vec; + extern const bfd_target tic6x_elf32_c6000_le_vec; + extern const bfd_target tic6x_elf32_c6000_be_vec; + + return (link_info.output_bfd->xvec == &tic6x_elf32_le_vec + || link_info.output_bfd->xvec == &tic6x_elf32_be_vec + || link_info.output_bfd->xvec == &tic6x_elf32_linux_le_vec + || link_info.output_bfd->xvec == &tic6x_elf32_linux_be_vec + || link_info.output_bfd->xvec == &tic6x_elf32_c6000_le_vec + || link_info.output_bfd->xvec == &tic6x_elf32_c6000_be_vec); } /* Pass params to backend. */ -- cgit v1.1