From 075a2b89c71796f1f0f38f51b0f60d4048c49410 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 10 Sep 2019 12:27:29 +0930 Subject: [PATCH] Rename elf32.em to elf.em * emultempl/elf32.em: Remove "misnamed" comment. Rename to.. * emultempl/elf.em: ..this. * configure.ac (elf_list_options): Adjust TEMPLATE_NAME grep. * emulparams/aarch64cloudabi.sh (TEMPLATE_NAME): Set to elf. * emulparams/aarch64elf.sh: Likewise. * emulparams/aarch64elf32.sh: Likewise. * emulparams/aarch64fbsd.sh: Likewise. * emulparams/aarch64linux.sh: Likewise. * emulparams/aarch64linux32.sh: Likewise. * emulparams/arcelf.sh: Likewise. * emulparams/arcelf_prof.sh: Likewise. * emulparams/arclinux.sh: Likewise. * emulparams/arclinux_prof.sh: Likewise. * emulparams/arcv2elf.sh: Likewise. * emulparams/arcv2elfx.sh: Likewise. * emulparams/armelf.sh: Likewise. * emulparams/armelf_fuchsia.sh: Likewise. * emulparams/armelf_linux.sh: Likewise. * emulparams/armelf_phoenix.sh: Likewise. * emulparams/armnto.sh: Likewise. * emulparams/avr1.sh: Likewise. * emulparams/avr2.sh: Likewise. * emulparams/avr25.sh: Likewise. * emulparams/avr3.sh: Likewise. * emulparams/avr31.sh: Likewise. * emulparams/avr35.sh: Likewise. * emulparams/avr4.sh: Likewise. * emulparams/avr5.sh: Likewise. * emulparams/avr51.sh: Likewise. * emulparams/avr6.sh: Likewise. * emulparams/avrtiny.sh: Likewise. * emulparams/avrxmega1.sh: Likewise. * emulparams/avrxmega2.sh: Likewise. * emulparams/avrxmega3.sh: Likewise. * emulparams/avrxmega4.sh: Likewise. * emulparams/avrxmega5.sh: Likewise. * emulparams/avrxmega6.sh: Likewise. * emulparams/avrxmega7.sh: Likewise. * emulparams/criself.sh: Likewise. * emulparams/crislinux.sh: Likewise. * emulparams/cskyelf.sh: Likewise. * emulparams/d10velf.sh: Likewise. * emulparams/elf32_sparc.sh: Likewise. * emulparams/elf32_spu.sh: Likewise. * emulparams/elf32_tic6x_le.sh: Likewise. * emulparams/elf32_x86_64.sh: Likewise. * emulparams/elf32am33lin.sh: Likewise. * emulparams/elf32bfin.sh: Likewise. * emulparams/elf32bfinfd.sh: Likewise. * emulparams/elf32bmip.sh: Likewise. * emulparams/elf32bmipn32-defs.sh: Likewise. * emulparams/elf32cr16.sh: Likewise. * emulparams/elf32cr16c.sh: Likewise. * emulparams/elf32crx.sh: Likewise. * emulparams/elf32epiphany.sh: Likewise. * emulparams/elf32epiphany_4x4.sh: Likewise. * emulparams/elf32frvfd.sh: Likewise. * emulparams/elf32ip2k.sh: Likewise. * emulparams/elf32lm32.sh: Likewise. * emulparams/elf32lm32fd.sh: Likewise. * emulparams/elf32lriscv-defs.sh: Likewise. * emulparams/elf32m32c.sh: Likewise. * emulparams/elf32mb_linux.sh: Likewise. * emulparams/elf32mbel_linux.sh: Likewise. * emulparams/elf32mcore.sh: Likewise. * emulparams/elf32mep.sh: Likewise. * emulparams/elf32metag.sh: Likewise. * emulparams/elf32microblaze.sh: Likewise. * emulparams/elf32mipswindiss.sh: Likewise. * emulparams/elf32or1k.sh: Likewise. * emulparams/elf32ppccommon.sh: Likewise. * emulparams/elf32rl78.sh: Likewise. * emulparams/elf32rx.sh: Likewise. * emulparams/elf32tilegx.sh: Likewise. * emulparams/elf32tilepro.sh: Likewise. * emulparams/elf32vax.sh: Likewise. * emulparams/elf32visium.sh: Likewise. * emulparams/elf32xc16x.sh: Likewise. * emulparams/elf32xc16xl.sh: Likewise. * emulparams/elf32xc16xs.sh: Likewise. * emulparams/elf32xstormy16.sh: Likewise. * emulparams/elf32xtensa.sh: Likewise. * emulparams/elf64_aix.sh: Likewise. * emulparams/elf64_ia64.sh: Likewise. * emulparams/elf64_s390.sh: Likewise. * emulparams/elf64_sparc.sh: Likewise. * emulparams/elf64alpha.sh: Likewise. * emulparams/elf64bpf.sh: Likewise. * emulparams/elf64hppa.sh: Likewise. * emulparams/elf64mmix.sh: Likewise. * emulparams/elf64rdos.sh: Likewise. * emulparams/elf64tilegx.sh: Likewise. * emulparams/elf_i386.sh: Likewise. * emulparams/elf_i386_be.sh: Likewise. * emulparams/elf_i386_ldso.sh: Likewise. * emulparams/elf_i386_vxworks.sh: Likewise. * emulparams/elf_iamcu.sh: Likewise. * emulparams/elf_k1om.sh: Likewise. * emulparams/elf_l1om.sh: Likewise. * emulparams/elf_s390.sh: Likewise. * emulparams/elf_x86_64.sh: Likewise. * emulparams/h8300elf.sh: Likewise. * emulparams/h8300elf_linux.sh: Likewise. * emulparams/hppa64linux.sh: Likewise. * emulparams/hppaelf.sh: Likewise. * emulparams/hppalinux.sh: Likewise. * emulparams/i386lynx.sh: Likewise. * emulparams/i386moss.sh: Likewise. * emulparams/i386nto.sh: Likewise. * emulparams/m32relf.sh: Likewise. * emulparams/m32relf_linux.sh: Likewise. * emulparams/m68hc11elf.sh: Likewise. * emulparams/m68hc11elfb.sh: Likewise. * emulparams/m68hc12elf.sh: Likewise. * emulparams/m68hc12elfb.sh: Likewise. * emulparams/m68kelf.sh: Likewise. * emulparams/mn10300.sh: Likewise. * emulparams/nds32elf.sh: Likewise. * emulparams/nds32elf16m.sh: Likewise. * emulparams/nds32elf_linux.sh: Likewise. * emulparams/nios2elf.sh: Likewise. * emulparams/nios2linux.sh: Likewise. * emulparams/pruelf.sh: Likewise. * emulparams/score3_elf.sh: Likewise. * emulparams/shelf.sh: Likewise. * emulparams/shelf_nto.sh: Likewise. * emulparams/shelf_vxworks.sh: Likewise. * emulparams/shlelf_linux.sh: Likewise. * emulparams/shlelf_nto.sh: Likewise. * emulparams/v850.sh: Likewise. * emulparams/v850_rh850.sh: Likewise. * ldelf.c: Update comment. * ldelf.h: Likewise. * emultempl/aarch64elf.em: Likewise. * emultempl/alphaelf.em: Likewise. * emultempl/arclinux.em: Likewise. * emultempl/armelf.em: Likewise. * emultempl/avrelf.em: Likewise. * emultempl/bfin.em: Likewise. * emultempl/cr16elf.em: Likewise. * emultempl/crxelf.em: Likewise. * emultempl/cskyelf.em: Likewise. * emultempl/elf-generic.em: Likewise. * emultempl/elf-x86.em: Likewise. * emultempl/epiphanyelf_4x4.em: Likewise. * emultempl/hppaelf.em: Likewise. * emultempl/ia64elf.em: Likewise. * emultempl/m68hc1xelf.em: Likewise. * emultempl/m68kelf.em: Likewise. * emultempl/metagelf.em: Likewise. * emultempl/mmix-elfnmmo.em: Likewise. * emultempl/mmixelf.em: Likewise. * emultempl/mmo.em: Likewise. * emultempl/needrelax.em: Likewise. * emultempl/nios2elf.em: Likewise. * emultempl/ppc32elf.em: Likewise. * emultempl/ppc64elf.em: Likewise. * emultempl/pruelf.em: Likewise. * emultempl/rxelf.em: Likewise. * emultempl/scoreelf.em: Likewise. * emultempl/spuelf.em: Likewise. * emultempl/tic6xdsbt.em: Likewise. * emultempl/v850elf.em: Likewise. * emultempl/vms.em: Likewise. * emultempl/vxworks.em: Likewise. * emultempl/xtensaelf.em: Likewise. * scripttempl/arclinux.sc: Likewise. * scripttempl/armbpabi.sc: Likewise. * scripttempl/elf.sc: Likewise. * scripttempl/elf64bpf.sc: Likewise. * scripttempl/elf64hppa.sc: Likewise. * scripttempl/elf_chaos.sc: Likewise. * scripttempl/elfarc.sc: Likewise. * scripttempl/elfarcv2.sc: Likewise. * scripttempl/elfd10v.sc: Likewise. * scripttempl/elfm68hc11.sc: Likewise. * scripttempl/elfm68hc12.sc: Likewise. * scripttempl/elfm9s12z.sc: Likewise. * scripttempl/elfxgate.sc: Likewise. * scripttempl/elfxtensa.sc: Likewise. * scripttempl/epiphany_4x4.sc: Likewise. * scripttempl/iq2000.sc: Likewise. * scripttempl/mep.sc: Likewise. * scripttempl/nds32elf.sc: Likewise. * scripttempl/v850.sc: Likewise. * scripttempl/v850_rh850.sc: Likewise. * scripttempl/xstormy16.sc: Likewise. * testsuite/ld-arm/arm-dyn.ld: Likewise. * testsuite/ld-arm/arm-lib.ld: Likewise. * testsuite/ld-arm/arm-no-rel-plt.ld: Likewise. * testsuite/ld-arm/fdpic-main.ld: Likewise. * testsuite/ld-arm/fdpic-shared.ld: Likewise. * testsuite/ld-elf/elf.exp: Likewise. * testsuite/ld-elf/orphan-region.d: Likewise. * testsuite/ld-elf/orphan.d: Likewise. * testsuite/ld-elf/pr349.d: Likewise. * testsuite/ld-elf/warn2.d: Likewise. * testsuite/ld-elfvsb/elf-offset.ld: Likewise. * testsuite/ld-mips-elf/mips-dyn.ld: Likewise. * testsuite/ld-mips-elf/mips-lib.ld: Likewise. * testsuite/ld-scripts/dynamic-sections.t: Likewise. * testsuite/ld-shared/elf-offset.ld: Likewise. * configure: Regenerate. --- ld/ChangeLog | 206 +++++++++++++++++++++ ld/configure | 2 +- ld/configure.ac | 2 +- ld/emulparams/aarch64cloudabi.sh | 2 +- ld/emulparams/aarch64elf.sh | 2 +- ld/emulparams/aarch64elf32.sh | 2 +- ld/emulparams/aarch64fbsd.sh | 2 +- ld/emulparams/aarch64linux.sh | 2 +- ld/emulparams/aarch64linux32.sh | 2 +- ld/emulparams/arcelf.sh | 2 +- ld/emulparams/arcelf_prof.sh | 2 +- ld/emulparams/arclinux.sh | 2 +- ld/emulparams/arclinux_prof.sh | 2 +- ld/emulparams/arcv2elf.sh | 2 +- ld/emulparams/arcv2elfx.sh | 2 +- ld/emulparams/armelf.sh | 2 +- ld/emulparams/armelf_fuchsia.sh | 2 +- ld/emulparams/armelf_linux.sh | 2 +- ld/emulparams/armelf_phoenix.sh | 2 +- ld/emulparams/armnto.sh | 2 +- ld/emulparams/avr1.sh | 2 +- ld/emulparams/avr2.sh | 2 +- ld/emulparams/avr25.sh | 2 +- ld/emulparams/avr3.sh | 2 +- ld/emulparams/avr31.sh | 2 +- ld/emulparams/avr35.sh | 2 +- ld/emulparams/avr4.sh | 2 +- ld/emulparams/avr5.sh | 2 +- ld/emulparams/avr51.sh | 2 +- ld/emulparams/avr6.sh | 2 +- ld/emulparams/avrtiny.sh | 2 +- ld/emulparams/avrxmega1.sh | 2 +- ld/emulparams/avrxmega2.sh | 2 +- ld/emulparams/avrxmega3.sh | 2 +- ld/emulparams/avrxmega4.sh | 2 +- ld/emulparams/avrxmega5.sh | 2 +- ld/emulparams/avrxmega6.sh | 2 +- ld/emulparams/avrxmega7.sh | 2 +- ld/emulparams/criself.sh | 2 +- ld/emulparams/crislinux.sh | 2 +- ld/emulparams/cskyelf.sh | 2 +- ld/emulparams/d10velf.sh | 2 +- ld/emulparams/elf32_sparc.sh | 2 +- ld/emulparams/elf32_spu.sh | 2 +- ld/emulparams/elf32_tic6x_le.sh | 2 +- ld/emulparams/elf32_x86_64.sh | 2 +- ld/emulparams/elf32am33lin.sh | 2 +- ld/emulparams/elf32bfin.sh | 2 +- ld/emulparams/elf32bfinfd.sh | 2 +- ld/emulparams/elf32bmip.sh | 2 +- ld/emulparams/elf32bmipn32-defs.sh | 2 +- ld/emulparams/elf32cr16.sh | 2 +- ld/emulparams/elf32cr16c.sh | 2 +- ld/emulparams/elf32crx.sh | 2 +- ld/emulparams/elf32epiphany.sh | 2 +- ld/emulparams/elf32epiphany_4x4.sh | 2 +- ld/emulparams/elf32frvfd.sh | 2 +- ld/emulparams/elf32ip2k.sh | 2 +- ld/emulparams/elf32lm32.sh | 2 +- ld/emulparams/elf32lm32fd.sh | 2 +- ld/emulparams/elf32lriscv-defs.sh | 2 +- ld/emulparams/elf32m32c.sh | 2 +- ld/emulparams/elf32mb_linux.sh | 2 +- ld/emulparams/elf32mbel_linux.sh | 2 +- ld/emulparams/elf32mcore.sh | 2 +- ld/emulparams/elf32mep.sh | 2 +- ld/emulparams/elf32metag.sh | 2 +- ld/emulparams/elf32microblaze.sh | 2 +- ld/emulparams/elf32mipswindiss.sh | 2 +- ld/emulparams/elf32or1k.sh | 2 +- ld/emulparams/elf32ppccommon.sh | 2 +- ld/emulparams/elf32rl78.sh | 2 +- ld/emulparams/elf32rx.sh | 2 +- ld/emulparams/elf32tilegx.sh | 2 +- ld/emulparams/elf32tilepro.sh | 2 +- ld/emulparams/elf32vax.sh | 2 +- ld/emulparams/elf32visium.sh | 2 +- ld/emulparams/elf32xc16x.sh | 2 +- ld/emulparams/elf32xc16xl.sh | 2 +- ld/emulparams/elf32xc16xs.sh | 2 +- ld/emulparams/elf32xstormy16.sh | 2 +- ld/emulparams/elf32xtensa.sh | 2 +- ld/emulparams/elf64_aix.sh | 2 +- ld/emulparams/elf64_ia64.sh | 2 +- ld/emulparams/elf64_s390.sh | 2 +- ld/emulparams/elf64_sparc.sh | 2 +- ld/emulparams/elf64alpha.sh | 2 +- ld/emulparams/elf64bpf.sh | 2 +- ld/emulparams/elf64hppa.sh | 2 +- ld/emulparams/elf64mmix.sh | 2 +- ld/emulparams/elf64rdos.sh | 2 +- ld/emulparams/elf64tilegx.sh | 3 +- ld/emulparams/elf_i386.sh | 2 +- ld/emulparams/elf_i386_be.sh | 2 +- ld/emulparams/elf_i386_ldso.sh | 2 +- ld/emulparams/elf_i386_vxworks.sh | 2 +- ld/emulparams/elf_iamcu.sh | 2 +- ld/emulparams/elf_k1om.sh | 2 +- ld/emulparams/elf_l1om.sh | 2 +- ld/emulparams/elf_s390.sh | 2 +- ld/emulparams/elf_x86_64.sh | 2 +- ld/emulparams/h8300elf.sh | 2 +- ld/emulparams/h8300elf_linux.sh | 2 +- ld/emulparams/hppa64linux.sh | 2 +- ld/emulparams/hppaelf.sh | 2 +- ld/emulparams/hppalinux.sh | 2 +- ld/emulparams/i386lynx.sh | 2 +- ld/emulparams/i386moss.sh | 2 +- ld/emulparams/i386nto.sh | 2 +- ld/emulparams/m32relf.sh | 2 +- ld/emulparams/m32relf_linux.sh | 2 +- ld/emulparams/m68hc11elf.sh | 2 +- ld/emulparams/m68hc11elfb.sh | 2 +- ld/emulparams/m68hc12elf.sh | 2 +- ld/emulparams/m68hc12elfb.sh | 2 +- ld/emulparams/m68kelf.sh | 2 +- ld/emulparams/mn10300.sh | 2 +- ld/emulparams/nds32elf.sh | 2 +- ld/emulparams/nds32elf16m.sh | 2 +- ld/emulparams/nds32elf_linux.sh | 2 +- ld/emulparams/nios2elf.sh | 2 +- ld/emulparams/nios2linux.sh | 2 +- ld/emulparams/pruelf.sh | 2 +- ld/emulparams/score3_elf.sh | 2 +- ld/emulparams/shelf.sh | 2 +- ld/emulparams/shelf_nto.sh | 2 +- ld/emulparams/shelf_vxworks.sh | 2 +- ld/emulparams/shlelf_linux.sh | 2 +- ld/emulparams/shlelf_nto.sh | 2 +- ld/emulparams/v850.sh | 2 +- ld/emulparams/v850_rh850.sh | 2 +- ld/emultempl/aarch64elf.em | 2 +- ld/emultempl/alphaelf.em | 2 +- ld/emultempl/arclinux.em | 2 +- ld/emultempl/armelf.em | 2 +- ld/emultempl/avrelf.em | 2 +- ld/emultempl/bfin.em | 2 +- ld/emultempl/cr16elf.em | 2 +- ld/emultempl/crxelf.em | 2 +- ld/emultempl/cskyelf.em | 2 +- ld/emultempl/elf-generic.em | 2 +- ld/emultempl/elf-x86.em | 2 +- ld/emultempl/{elf32.em => elf.em} | 2 - ld/emultempl/epiphanyelf_4x4.em | 2 +- ld/emultempl/hppaelf.em | 2 +- ld/emultempl/ia64elf.em | 2 +- ld/emultempl/m68hc1xelf.em | 2 +- ld/emultempl/m68kelf.em | 4 +- ld/emultempl/metagelf.em | 2 +- ld/emultempl/mmix-elfnmmo.em | 2 +- ld/emultempl/mmixelf.em | 2 +- ld/emultempl/mmo.em | 6 +- ld/emultempl/needrelax.em | 2 +- ld/emultempl/nios2elf.em | 2 +- ld/emultempl/ppc32elf.em | 2 +- ld/emultempl/ppc64elf.em | 2 +- ld/emultempl/pruelf.em | 2 +- ld/emultempl/rxelf.em | 2 +- ld/emultempl/scoreelf.em | 2 +- ld/emultempl/spuelf.em | 2 +- ld/emultempl/tic6xdsbt.em | 2 +- ld/emultempl/v850elf.em | 2 +- ld/emultempl/vms.em | 2 +- ld/emultempl/vxworks.em | 2 +- ld/emultempl/xtensaelf.em | 2 +- ld/ldelf.c | 2 +- ld/ldelf.h | 2 +- ld/scripttempl/arclinux.sc | 2 +- ld/scripttempl/armbpabi.sc | 2 +- ld/scripttempl/elf.sc | 2 +- ld/scripttempl/elf64bpf.sc | 2 +- ld/scripttempl/elf64hppa.sc | 2 +- ld/scripttempl/elf_chaos.sc | 2 +- ld/scripttempl/elfarc.sc | 2 +- ld/scripttempl/elfarcv2.sc | 2 +- ld/scripttempl/elfd10v.sc | 2 +- ld/scripttempl/elfm68hc11.sc | 2 +- ld/scripttempl/elfm68hc12.sc | 2 +- ld/scripttempl/elfm9s12z.sc | 2 +- ld/scripttempl/elfxgate.sc | 2 +- ld/scripttempl/elfxtensa.sc | 2 +- ld/scripttempl/epiphany_4x4.sc | 2 +- ld/scripttempl/iq2000.sc | 2 +- ld/scripttempl/mep.sc | 2 +- ld/scripttempl/nds32elf.sc | 2 +- ld/scripttempl/v850.sc | 2 +- ld/scripttempl/v850_rh850.sc | 2 +- ld/scripttempl/xstormy16.sc | 2 +- ld/testsuite/ld-arm/arm-dyn.ld | 2 +- ld/testsuite/ld-arm/arm-lib.ld | 2 +- ld/testsuite/ld-arm/arm-no-rel-plt.ld | 2 +- ld/testsuite/ld-arm/fdpic-main.ld | 2 +- ld/testsuite/ld-arm/fdpic-shared.ld | 2 +- ld/testsuite/ld-elf/elf.exp | 2 +- ld/testsuite/ld-elf/orphan-region.d | 2 +- ld/testsuite/ld-elf/orphan.d | 2 +- ld/testsuite/ld-elf/pr349.d | 2 +- ld/testsuite/ld-elf/warn2.d | 2 +- ld/testsuite/ld-elfvsb/elf-offset.ld | 2 +- ld/testsuite/ld-mips-elf/mips-dyn.ld | 2 +- ld/testsuite/ld-mips-elf/mips-lib.ld | 2 +- ld/testsuite/ld-scripts/dynamic-sections.t | 2 +- ld/testsuite/ld-shared/elf-offset.ld | 2 +- 203 files changed, 410 insertions(+), 207 deletions(-) rename ld/emultempl/{elf32.em => elf.em} (99%) diff --git a/ld/ChangeLog b/ld/ChangeLog index 18d2c051d4..ca12975e94 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,209 @@ +2019-09-11 Alan Modra + + * emultempl/elf32.em: Remove "misnamed" comment. Rename to.. + * emultempl/elf.em: ..this. + * configure.ac (elf_list_options): Adjust TEMPLATE_NAME grep. + * emulparams/aarch64cloudabi.sh (TEMPLATE_NAME): Set to elf. + * emulparams/aarch64elf.sh: Likewise. + * emulparams/aarch64elf32.sh: Likewise. + * emulparams/aarch64fbsd.sh: Likewise. + * emulparams/aarch64linux.sh: Likewise. + * emulparams/aarch64linux32.sh: Likewise. + * emulparams/arcelf.sh: Likewise. + * emulparams/arcelf_prof.sh: Likewise. + * emulparams/arclinux.sh: Likewise. + * emulparams/arclinux_prof.sh: Likewise. + * emulparams/arcv2elf.sh: Likewise. + * emulparams/arcv2elfx.sh: Likewise. + * emulparams/armelf.sh: Likewise. + * emulparams/armelf_fuchsia.sh: Likewise. + * emulparams/armelf_linux.sh: Likewise. + * emulparams/armelf_phoenix.sh: Likewise. + * emulparams/armnto.sh: Likewise. + * emulparams/avr1.sh: Likewise. + * emulparams/avr2.sh: Likewise. + * emulparams/avr25.sh: Likewise. + * emulparams/avr3.sh: Likewise. + * emulparams/avr31.sh: Likewise. + * emulparams/avr35.sh: Likewise. + * emulparams/avr4.sh: Likewise. + * emulparams/avr5.sh: Likewise. + * emulparams/avr51.sh: Likewise. + * emulparams/avr6.sh: Likewise. + * emulparams/avrtiny.sh: Likewise. + * emulparams/avrxmega1.sh: Likewise. + * emulparams/avrxmega2.sh: Likewise. + * emulparams/avrxmega3.sh: Likewise. + * emulparams/avrxmega4.sh: Likewise. + * emulparams/avrxmega5.sh: Likewise. + * emulparams/avrxmega6.sh: Likewise. + * emulparams/avrxmega7.sh: Likewise. + * emulparams/criself.sh: Likewise. + * emulparams/crislinux.sh: Likewise. + * emulparams/cskyelf.sh: Likewise. + * emulparams/d10velf.sh: Likewise. + * emulparams/elf32_sparc.sh: Likewise. + * emulparams/elf32_spu.sh: Likewise. + * emulparams/elf32_tic6x_le.sh: Likewise. + * emulparams/elf32_x86_64.sh: Likewise. + * emulparams/elf32am33lin.sh: Likewise. + * emulparams/elf32bfin.sh: Likewise. + * emulparams/elf32bfinfd.sh: Likewise. + * emulparams/elf32bmip.sh: Likewise. + * emulparams/elf32bmipn32-defs.sh: Likewise. + * emulparams/elf32cr16.sh: Likewise. + * emulparams/elf32cr16c.sh: Likewise. + * emulparams/elf32crx.sh: Likewise. + * emulparams/elf32epiphany.sh: Likewise. + * emulparams/elf32epiphany_4x4.sh: Likewise. + * emulparams/elf32frvfd.sh: Likewise. + * emulparams/elf32ip2k.sh: Likewise. + * emulparams/elf32lm32.sh: Likewise. + * emulparams/elf32lm32fd.sh: Likewise. + * emulparams/elf32lriscv-defs.sh: Likewise. + * emulparams/elf32m32c.sh: Likewise. + * emulparams/elf32mb_linux.sh: Likewise. + * emulparams/elf32mbel_linux.sh: Likewise. + * emulparams/elf32mcore.sh: Likewise. + * emulparams/elf32mep.sh: Likewise. + * emulparams/elf32metag.sh: Likewise. + * emulparams/elf32microblaze.sh: Likewise. + * emulparams/elf32mipswindiss.sh: Likewise. + * emulparams/elf32or1k.sh: Likewise. + * emulparams/elf32ppccommon.sh: Likewise. + * emulparams/elf32rl78.sh: Likewise. + * emulparams/elf32rx.sh: Likewise. + * emulparams/elf32tilegx.sh: Likewise. + * emulparams/elf32tilepro.sh: Likewise. + * emulparams/elf32vax.sh: Likewise. + * emulparams/elf32visium.sh: Likewise. + * emulparams/elf32xc16x.sh: Likewise. + * emulparams/elf32xc16xl.sh: Likewise. + * emulparams/elf32xc16xs.sh: Likewise. + * emulparams/elf32xstormy16.sh: Likewise. + * emulparams/elf32xtensa.sh: Likewise. + * emulparams/elf64_aix.sh: Likewise. + * emulparams/elf64_ia64.sh: Likewise. + * emulparams/elf64_s390.sh: Likewise. + * emulparams/elf64_sparc.sh: Likewise. + * emulparams/elf64alpha.sh: Likewise. + * emulparams/elf64bpf.sh: Likewise. + * emulparams/elf64hppa.sh: Likewise. + * emulparams/elf64mmix.sh: Likewise. + * emulparams/elf64rdos.sh: Likewise. + * emulparams/elf64tilegx.sh: Likewise. + * emulparams/elf_i386.sh: Likewise. + * emulparams/elf_i386_be.sh: Likewise. + * emulparams/elf_i386_ldso.sh: Likewise. + * emulparams/elf_i386_vxworks.sh: Likewise. + * emulparams/elf_iamcu.sh: Likewise. + * emulparams/elf_k1om.sh: Likewise. + * emulparams/elf_l1om.sh: Likewise. + * emulparams/elf_s390.sh: Likewise. + * emulparams/elf_x86_64.sh: Likewise. + * emulparams/h8300elf.sh: Likewise. + * emulparams/h8300elf_linux.sh: Likewise. + * emulparams/hppa64linux.sh: Likewise. + * emulparams/hppaelf.sh: Likewise. + * emulparams/hppalinux.sh: Likewise. + * emulparams/i386lynx.sh: Likewise. + * emulparams/i386moss.sh: Likewise. + * emulparams/i386nto.sh: Likewise. + * emulparams/m32relf.sh: Likewise. + * emulparams/m32relf_linux.sh: Likewise. + * emulparams/m68hc11elf.sh: Likewise. + * emulparams/m68hc11elfb.sh: Likewise. + * emulparams/m68hc12elf.sh: Likewise. + * emulparams/m68hc12elfb.sh: Likewise. + * emulparams/m68kelf.sh: Likewise. + * emulparams/mn10300.sh: Likewise. + * emulparams/nds32elf.sh: Likewise. + * emulparams/nds32elf16m.sh: Likewise. + * emulparams/nds32elf_linux.sh: Likewise. + * emulparams/nios2elf.sh: Likewise. + * emulparams/nios2linux.sh: Likewise. + * emulparams/pruelf.sh: Likewise. + * emulparams/score3_elf.sh: Likewise. + * emulparams/shelf.sh: Likewise. + * emulparams/shelf_nto.sh: Likewise. + * emulparams/shelf_vxworks.sh: Likewise. + * emulparams/shlelf_linux.sh: Likewise. + * emulparams/shlelf_nto.sh: Likewise. + * emulparams/v850.sh: Likewise. + * emulparams/v850_rh850.sh: Likewise. + * ldelf.c: Update comment. + * ldelf.h: Likewise. + * emultempl/aarch64elf.em: Likewise. + * emultempl/alphaelf.em: Likewise. + * emultempl/arclinux.em: Likewise. + * emultempl/armelf.em: Likewise. + * emultempl/avrelf.em: Likewise. + * emultempl/bfin.em: Likewise. + * emultempl/cr16elf.em: Likewise. + * emultempl/crxelf.em: Likewise. + * emultempl/cskyelf.em: Likewise. + * emultempl/elf-generic.em: Likewise. + * emultempl/elf-x86.em: Likewise. + * emultempl/epiphanyelf_4x4.em: Likewise. + * emultempl/hppaelf.em: Likewise. + * emultempl/ia64elf.em: Likewise. + * emultempl/m68hc1xelf.em: Likewise. + * emultempl/m68kelf.em: Likewise. + * emultempl/metagelf.em: Likewise. + * emultempl/mmix-elfnmmo.em: Likewise. + * emultempl/mmixelf.em: Likewise. + * emultempl/mmo.em: Likewise. + * emultempl/needrelax.em: Likewise. + * emultempl/nios2elf.em: Likewise. + * emultempl/ppc32elf.em: Likewise. + * emultempl/ppc64elf.em: Likewise. + * emultempl/pruelf.em: Likewise. + * emultempl/rxelf.em: Likewise. + * emultempl/scoreelf.em: Likewise. + * emultempl/spuelf.em: Likewise. + * emultempl/tic6xdsbt.em: Likewise. + * emultempl/v850elf.em: Likewise. + * emultempl/vms.em: Likewise. + * emultempl/vxworks.em: Likewise. + * emultempl/xtensaelf.em: Likewise. + * scripttempl/arclinux.sc: Likewise. + * scripttempl/armbpabi.sc: Likewise. + * scripttempl/elf.sc: Likewise. + * scripttempl/elf64bpf.sc: Likewise. + * scripttempl/elf64hppa.sc: Likewise. + * scripttempl/elf_chaos.sc: Likewise. + * scripttempl/elfarc.sc: Likewise. + * scripttempl/elfarcv2.sc: Likewise. + * scripttempl/elfd10v.sc: Likewise. + * scripttempl/elfm68hc11.sc: Likewise. + * scripttempl/elfm68hc12.sc: Likewise. + * scripttempl/elfm9s12z.sc: Likewise. + * scripttempl/elfxgate.sc: Likewise. + * scripttempl/elfxtensa.sc: Likewise. + * scripttempl/epiphany_4x4.sc: Likewise. + * scripttempl/iq2000.sc: Likewise. + * scripttempl/mep.sc: Likewise. + * scripttempl/nds32elf.sc: Likewise. + * scripttempl/v850.sc: Likewise. + * scripttempl/v850_rh850.sc: Likewise. + * scripttempl/xstormy16.sc: Likewise. + * testsuite/ld-arm/arm-dyn.ld: Likewise. + * testsuite/ld-arm/arm-lib.ld: Likewise. + * testsuite/ld-arm/arm-no-rel-plt.ld: Likewise. + * testsuite/ld-arm/fdpic-main.ld: Likewise. + * testsuite/ld-arm/fdpic-shared.ld: Likewise. + * testsuite/ld-elf/elf.exp: Likewise. + * testsuite/ld-elf/orphan-region.d: Likewise. + * testsuite/ld-elf/orphan.d: Likewise. + * testsuite/ld-elf/pr349.d: Likewise. + * testsuite/ld-elf/warn2.d: Likewise. + * testsuite/ld-elfvsb/elf-offset.ld: Likewise. + * testsuite/ld-mips-elf/mips-dyn.ld: Likewise. + * testsuite/ld-mips-elf/mips-lib.ld: Likewise. + * testsuite/ld-scripts/dynamic-sections.t: Likewise. + * testsuite/ld-shared/elf-offset.ld: Likewise. + * configure: Regenerate. + 2019-09-11 Alan Modra * Makefile.am (ALL_EMUL_EXTRA_OFILES): Add ldelf and ldelfgen. diff --git a/ld/configure b/ld/configure index 3b50f5db8e..8edef4548e 100755 --- a/ld/configure +++ b/ld/configure @@ -17522,7 +17522,7 @@ tdir_$i=$result" elf_list_options=TRUE ;; *) - if $GREP "TEMPLATE_NAME=elf32" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then + if $GREP "TEMPLATE_NAME=elf" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then elf_list_options=TRUE fi ;; diff --git a/ld/configure.ac b/ld/configure.ac index ee62d10ac5..41a51bbb7e 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -378,7 +378,7 @@ tdir_$i=$result" elf_list_options=TRUE ;; *) - if $GREP "TEMPLATE_NAME=elf32" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then + if $GREP "TEMPLATE_NAME=elf" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then elf_list_options=TRUE fi ;; diff --git a/ld/emulparams/aarch64cloudabi.sh b/ld/emulparams/aarch64cloudabi.sh index 983a92b50e..0e6f834816 100644 --- a/ld/emulparams/aarch64cloudabi.sh +++ b/ld/emulparams/aarch64cloudabi.sh @@ -9,7 +9,7 @@ BIG_OUTPUT_FORMAT="elf64-bigaarch64-cloudabi" LITTLE_OUTPUT_FORMAT="elf64-littleaarch64-cloudabi" NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=aarch64elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/aarch64elf.sh b/ld/emulparams/aarch64elf.sh index 4a59342722..8f68e517b4 100644 --- a/ld/emulparams/aarch64elf.sh +++ b/ld/emulparams/aarch64elf.sh @@ -9,7 +9,7 @@ BIG_OUTPUT_FORMAT="elf64-bigaarch64" LITTLE_OUTPUT_FORMAT="elf64-littleaarch64" NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=aarch64elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/aarch64elf32.sh b/ld/emulparams/aarch64elf32.sh index 38bcd4bbb0..5a08d9e29f 100644 --- a/ld/emulparams/aarch64elf32.sh +++ b/ld/emulparams/aarch64elf32.sh @@ -9,7 +9,7 @@ BIG_OUTPUT_FORMAT="elf32-bigaarch64" LITTLE_OUTPUT_FORMAT="elf32-littleaarch64" NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=aarch64elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/aarch64fbsd.sh b/ld/emulparams/aarch64fbsd.sh index 3a7a2e18aa..0bcab7a4ba 100644 --- a/ld/emulparams/aarch64fbsd.sh +++ b/ld/emulparams/aarch64fbsd.sh @@ -9,7 +9,7 @@ BIG_OUTPUT_FORMAT="elf64-bigaarch64" LITTLE_OUTPUT_FORMAT="elf64-littleaarch64" NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=aarch64elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/aarch64linux.sh b/ld/emulparams/aarch64linux.sh index 5df6ae18d8..7b4a0e8607 100644 --- a/ld/emulparams/aarch64linux.sh +++ b/ld/emulparams/aarch64linux.sh @@ -9,7 +9,7 @@ BIG_OUTPUT_FORMAT="elf64-bigaarch64" LITTLE_OUTPUT_FORMAT="elf64-littleaarch64" NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=aarch64elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/aarch64linux32.sh b/ld/emulparams/aarch64linux32.sh index 3c60de0cac..3e75d1492e 100644 --- a/ld/emulparams/aarch64linux32.sh +++ b/ld/emulparams/aarch64linux32.sh @@ -9,7 +9,7 @@ BIG_OUTPUT_FORMAT="elf32-bigaarch64" LITTLE_OUTPUT_FORMAT="elf32-littleaarch64" NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=aarch64elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/arcelf.sh b/ld/emulparams/arcelf.sh index 875df7e0b3..625ec39779 100644 --- a/ld/emulparams/arcelf.sh +++ b/ld/emulparams/arcelf.sh @@ -1,6 +1,6 @@ source_sh ${srcdir}/emulparams/arc-endianness.sh SCRIPT_NAME=elfarc -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf if [ "x${ARC_ENDIAN}" = "xbig" ]; then OUTPUT_FORMAT="elf32-bigarc" else diff --git a/ld/emulparams/arcelf_prof.sh b/ld/emulparams/arcelf_prof.sh index 74e9604eca..cd01769914 100644 --- a/ld/emulparams/arcelf_prof.sh +++ b/ld/emulparams/arcelf_prof.sh @@ -1,6 +1,6 @@ source_sh ${srcdir}/emulparams/arc-endianness.sh SCRIPT_NAME=elfarc -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf if [ "x${ARC_ENDIAN}" = "xbig" ]; then OUTPUT_FORMAT="elf32-bigarc" else diff --git a/ld/emulparams/arclinux.sh b/ld/emulparams/arclinux.sh index d342819215..3a7347314a 100644 --- a/ld/emulparams/arclinux.sh +++ b/ld/emulparams/arclinux.sh @@ -12,7 +12,7 @@ TEXT_START_ADDR=0x10000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ENTRY=__start -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=arclinux GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/arclinux_prof.sh b/ld/emulparams/arclinux_prof.sh index fbbf20d15f..da5ab405fb 100644 --- a/ld/emulparams/arclinux_prof.sh +++ b/ld/emulparams/arclinux_prof.sh @@ -14,7 +14,7 @@ NONPAGED_TEXT_START_ADDR=0x10000 ARCH=arc MACHINE= ENTRY=__start -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=arclinux GENERATE_SHLIB_SCRIPT=yes SDATA_START_SYMBOLS='__SDATA_BEGIN__ = .;' diff --git a/ld/emulparams/arcv2elf.sh b/ld/emulparams/arcv2elf.sh index 4b0cf553a6..4824f3540c 100644 --- a/ld/emulparams/arcv2elf.sh +++ b/ld/emulparams/arcv2elf.sh @@ -17,7 +17,7 @@ ARCH=arc MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" EMBEDDED=yes GENERIC_BOARD=no -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf LITTLE_OUTPUT_FORMAT="elf32-littlearc" BIG_OUTPUT_FORMAT="elf32-bigarc" TEXT_START_ADDR=0x100 diff --git a/ld/emulparams/arcv2elfx.sh b/ld/emulparams/arcv2elfx.sh index cfe7ea022a..ad13444125 100644 --- a/ld/emulparams/arcv2elfx.sh +++ b/ld/emulparams/arcv2elfx.sh @@ -13,7 +13,7 @@ SDATA_MEMORY=sdata ARCH=arc MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" GENERIC_BOARD=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf LITTLE_OUTPUT_FORMAT="elf32-littlearc" BIG_OUTPUT_FORMAT="elf32-bigarc" TEXT_START_ADDR=0x100 diff --git a/ld/emulparams/armelf.sh b/ld/emulparams/armelf.sh index d46e0bdbff..0e3147c1f2 100644 --- a/ld/emulparams/armelf.sh +++ b/ld/emulparams/armelf.sh @@ -4,7 +4,7 @@ OUTPUT_FORMAT="elf32-littlearm" BIG_OUTPUT_FORMAT="elf32-bigarm" LITTLE_OUTPUT_FORMAT="elf32-littlearm" TEXT_START_ADDR=0x8000 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=armelf OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx)' OTHER_BSS_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__bss_start__ = .${CREATE_SHLIB+)};" diff --git a/ld/emulparams/armelf_fuchsia.sh b/ld/emulparams/armelf_fuchsia.sh index 36392f1163..823ddf503c 100644 --- a/ld/emulparams/armelf_fuchsia.sh +++ b/ld/emulparams/armelf_fuchsia.sh @@ -5,7 +5,7 @@ BIG_OUTPUT_FORMAT="elf32-bigarm" LITTLE_OUTPUT_FORMAT="elf32-littlearm" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=armelf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/armelf_linux.sh b/ld/emulparams/armelf_linux.sh index d726d63eb3..e9439c4620 100644 --- a/ld/emulparams/armelf_linux.sh +++ b/ld/emulparams/armelf_linux.sh @@ -5,7 +5,7 @@ BIG_OUTPUT_FORMAT="elf32-bigarm" LITTLE_OUTPUT_FORMAT="elf32-littlearm" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=armelf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/armelf_phoenix.sh b/ld/emulparams/armelf_phoenix.sh index 7fb1e2d363..63c35a8290 100644 --- a/ld/emulparams/armelf_phoenix.sh +++ b/ld/emulparams/armelf_phoenix.sh @@ -5,7 +5,7 @@ BIG_OUTPUT_FORMAT="elf32-bigarm" LITTLE_OUTPUT_FORMAT="elf32-littlearm" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=armelf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/armnto.sh b/ld/emulparams/armnto.sh index 79be9995bd..f0d7b33273 100644 --- a/ld/emulparams/armnto.sh +++ b/ld/emulparams/armnto.sh @@ -4,7 +4,7 @@ OUTPUT_FORMAT="elf32-littlearm" BIG_OUTPUT_FORMAT="elf32-bigarm" LITTLE_OUTPUT_FORMAT="elf32-littlearm" TEXT_START_ADDR=0x00100000 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=armelf OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx)' OTHER_BSS_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__bss_start__ = .${CREATE_SHLIB+)};" diff --git a/ld/emulparams/avr1.sh b/ld/emulparams/avr1.sh index 0fa6eedfe2..f3992483d2 100644 --- a/ld/emulparams/avr1.sh +++ b/ld/emulparams/avr1.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=8K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr2.sh b/ld/emulparams/avr2.sh index e0bdc21a6f..4c70ff0618 100644 --- a/ld/emulparams/avr2.sh +++ b/ld/emulparams/avr2.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=8K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr25.sh b/ld/emulparams/avr25.sh index 4a6e0a38ce..703a3ae25e 100644 --- a/ld/emulparams/avr25.sh +++ b/ld/emulparams/avr25.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=8K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr3.sh b/ld/emulparams/avr3.sh index f02dd39dc4..4cbc91727a 100644 --- a/ld/emulparams/avr3.sh +++ b/ld/emulparams/avr3.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=128K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr31.sh b/ld/emulparams/avr31.sh index 0bf3c0fe3e..287d71e787 100644 --- a/ld/emulparams/avr31.sh +++ b/ld/emulparams/avr31.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=128K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr35.sh b/ld/emulparams/avr35.sh index fe83dc8657..c40e0e1916 100644 --- a/ld/emulparams/avr35.sh +++ b/ld/emulparams/avr35.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=64K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr4.sh b/ld/emulparams/avr4.sh index ccda23fd93..79adbcc7ae 100644 --- a/ld/emulparams/avr4.sh +++ b/ld/emulparams/avr4.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=8K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr5.sh b/ld/emulparams/avr5.sh index 64e9d66de4..6eedf17d9f 100644 --- a/ld/emulparams/avr5.sh +++ b/ld/emulparams/avr5.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=128K DATA_ORIGIN=0x800060 diff --git a/ld/emulparams/avr51.sh b/ld/emulparams/avr51.sh index b097771465..1856e625be 100644 --- a/ld/emulparams/avr51.sh +++ b/ld/emulparams/avr51.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=128K DATA_ORIGIN=0x800100 diff --git a/ld/emulparams/avr6.sh b/ld/emulparams/avr6.sh index 10efa6f1ba..5b9d167964 100644 --- a/ld/emulparams/avr6.sh +++ b/ld/emulparams/avr6.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x800200 diff --git a/ld/emulparams/avrtiny.sh b/ld/emulparams/avrtiny.sh index 4aca22b084..434cd9f6e9 100644 --- a/ld/emulparams/avrtiny.sh +++ b/ld/emulparams/avrtiny.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=4K DATA_ORIGIN=0x0800040 diff --git a/ld/emulparams/avrxmega1.sh b/ld/emulparams/avrxmega1.sh index 722ee18053..66b0e8544a 100644 --- a/ld/emulparams/avrxmega1.sh +++ b/ld/emulparams/avrxmega1.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/avrxmega2.sh b/ld/emulparams/avrxmega2.sh index d9211b23bc..3f3d86518d 100644 --- a/ld/emulparams/avrxmega2.sh +++ b/ld/emulparams/avrxmega2.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/avrxmega3.sh b/ld/emulparams/avrxmega3.sh index b33f895ba8..e4a25635db 100644 --- a/ld/emulparams/avrxmega3.sh +++ b/ld/emulparams/avrxmega3.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/avrxmega4.sh b/ld/emulparams/avrxmega4.sh index 02ef7d7229..d7b377135e 100644 --- a/ld/emulparams/avrxmega4.sh +++ b/ld/emulparams/avrxmega4.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/avrxmega5.sh b/ld/emulparams/avrxmega5.sh index 93b69da81d..8de5d6e959 100644 --- a/ld/emulparams/avrxmega5.sh +++ b/ld/emulparams/avrxmega5.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/avrxmega6.sh b/ld/emulparams/avrxmega6.sh index f7dae40f2d..de282e584e 100644 --- a/ld/emulparams/avrxmega6.sh +++ b/ld/emulparams/avrxmega6.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/avrxmega7.sh b/ld/emulparams/avrxmega7.sh index 578f52a769..5abc148209 100644 --- a/ld/emulparams/avrxmega7.sh +++ b/ld/emulparams/avrxmega7.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=avr OUTPUT_FORMAT="elf32-avr" MAXPAGESIZE=1 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_LENGTH=1024K DATA_ORIGIN=0x802000 diff --git a/ld/emulparams/criself.sh b/ld/emulparams/criself.sh index 5ea928425e..94ef1cd624 100644 --- a/ld/emulparams/criself.sh +++ b/ld/emulparams/criself.sh @@ -1,7 +1,7 @@ # This is for embedded products (no MMU) with ELF. MACHINE= SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf # Symbols have underscore prepended. OUTPUT_FORMAT="elf32-us-cris" diff --git a/ld/emulparams/crislinux.sh b/ld/emulparams/crislinux.sh index c072dbae2b..31b746e947 100644 --- a/ld/emulparams/crislinux.sh +++ b/ld/emulparams/crislinux.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-cris" NO_REL_RELOCS=yes ARCH=cris -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf ENTRY=_start diff --git a/ld/emulparams/cskyelf.sh b/ld/emulparams/cskyelf.sh index c9f7e3fa5c..d572ac8b64 100644 --- a/ld/emulparams/cskyelf.sh +++ b/ld/emulparams/cskyelf.sh @@ -32,4 +32,4 @@ OTHER_BSS_END_SYMBOLS="__bss_end__ = . ;" # This sets the stack to the top of the simulator memory (2^19 bytes). # STACK_ADDR=0x80000 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf diff --git a/ld/emulparams/d10velf.sh b/ld/emulparams/d10velf.sh index c8de5c4a13..5eabb693c5 100644 --- a/ld/emulparams/d10velf.sh +++ b/ld/emulparams/d10velf.sh @@ -6,4 +6,4 @@ READONLY_START_ADDR=0x02000004 ARCH=d10v MAXPAGESIZE=32 EMBEDDED=t -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf diff --git a/ld/emulparams/elf32_sparc.sh b/ld/emulparams/elf32_sparc.sh index 13af316de1..0ba6b8d86e 100644 --- a/ld/emulparams/elf32_sparc.sh +++ b/ld/emulparams/elf32_sparc.sh @@ -10,7 +10,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ALIGNMENT=8 ARCH=sparc MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf DATA_PLT= GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf32_spu.sh b/ld/emulparams/elf32_spu.sh index 235455f8b9..523f323302 100644 --- a/ld/emulparams/elf32_spu.sh +++ b/ld/emulparams/elf32_spu.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=spuelf OUTPUT_FORMAT="elf32-spu" NO_REL_RELOCS=yes diff --git a/ld/emulparams/elf32_tic6x_le.sh b/ld/emulparams/elf32_tic6x_le.sh index 62ea9eb920..7bf7bf1ddf 100644 --- a/ld/emulparams/elf32_tic6x_le.sh +++ b/ld/emulparams/elf32_tic6x_le.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-tic6x-le" BIG_OUTPUT_FORMAT="elf32-tic6x-be" EXTRA_EM_FILE=tic6xdsbt diff --git a/ld/emulparams/elf32_x86_64.sh b/ld/emulparams/elf32_x86_64.sh index 43f2519108..249553aaac 100644 --- a/ld/emulparams/elf32_x86_64.sh +++ b/ld/emulparams/elf32_x86_64.sh @@ -13,7 +13,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH="i386:x64-32" MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf32am33lin.sh b/ld/emulparams/elf32am33lin.sh index b34d2b8751..e63c349d73 100644 --- a/ld/emulparams/elf32am33lin.sh +++ b/ld/emulparams/elf32am33lin.sh @@ -6,6 +6,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=mn10300 MACHINE= NOP=0xcbcb -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/elf32bfin.sh b/ld/emulparams/elf32bfin.sh index 6c0bb4090b..8d298b467c 100644 --- a/ld/emulparams/elf32bfin.sh +++ b/ld/emulparams/elf32bfin.sh @@ -5,7 +5,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" TARGET_PAGE_SIZE=0x1000 ARCH=bfin MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes EMBEDDED=yes USER_LABEL_PREFIX=_ diff --git a/ld/emulparams/elf32bfinfd.sh b/ld/emulparams/elf32bfinfd.sh index b4114b1417..c2a12ff7a6 100644 --- a/ld/emulparams/elf32bfinfd.sh +++ b/ld/emulparams/elf32bfinfd.sh @@ -2,7 +2,7 @@ source_sh ${srcdir}/emulparams/elf32bfin.sh unset STACK_ADDR OUTPUT_FORMAT="elf32-bfinfdpic" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes EMBEDDED= # This gets us program headers mapped as part of the text segment. diff --git a/ld/emulparams/elf32bmip.sh b/ld/emulparams/elf32bmip.sh index 1e0200a73b..992d45469f 100644 --- a/ld/emulparams/elf32bmip.sh +++ b/ld/emulparams/elf32bmip.sh @@ -73,7 +73,7 @@ OTHER_SECTIONS=" " ARCH=mips MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=mipself GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf32bmipn32-defs.sh b/ld/emulparams/elf32bmipn32-defs.sh index 80dce8fbea..44f817b0cf 100644 --- a/ld/emulparams/elf32bmipn32-defs.sh +++ b/ld/emulparams/elf32bmipn32-defs.sh @@ -10,7 +10,7 @@ OUTPUT_FORMAT="elf32-bigmips" BIG_OUTPUT_FORMAT="elf32-bigmips" LITTLE_OUTPUT_FORMAT="elf32-littlemips" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=mipself # Note: use "x$var" not x"$var" in case directive in order to work around bug in bash 4.2 diff --git a/ld/emulparams/elf32cr16.sh b/ld/emulparams/elf32cr16.sh index bc9ae51bdc..4718b1bf08 100644 --- a/ld/emulparams/elf32cr16.sh +++ b/ld/emulparams/elf32cr16.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf32cr16 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-cr16" ARCH=cr16 ENTRY=_start diff --git a/ld/emulparams/elf32cr16c.sh b/ld/emulparams/elf32cr16c.sh index e78e5edc7f..986d84df5b 100644 --- a/ld/emulparams/elf32cr16c.sh +++ b/ld/emulparams/elf32cr16c.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf32cr16c -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-cr16c" ARCH=cr16c ENTRY=_start diff --git a/ld/emulparams/elf32crx.sh b/ld/emulparams/elf32crx.sh index 24960ec52c..d57b3ce8b8 100644 --- a/ld/emulparams/elf32crx.sh +++ b/ld/emulparams/elf32crx.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf32crx -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-crx" ARCH=crx ENTRY=_start diff --git a/ld/emulparams/elf32epiphany.sh b/ld/emulparams/elf32epiphany.sh index fd2401296c..6267d741ef 100644 --- a/ld/emulparams/elf32epiphany.sh +++ b/ld/emulparams/elf32epiphany.sh @@ -1,4 +1,4 @@ -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf MACHINE= SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-epiphany" diff --git a/ld/emulparams/elf32epiphany_4x4.sh b/ld/emulparams/elf32epiphany_4x4.sh index be03d40c01..d80438d422 100644 --- a/ld/emulparams/elf32epiphany_4x4.sh +++ b/ld/emulparams/elf32epiphany_4x4.sh @@ -2,7 +2,7 @@ MACHINE= SCRIPT_NAME=epiphany_4x4 OUTPUT_FORMAT="elf32-epiphany" TEXT_START_ADDR=0x40 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=epiphanyelf_4x4 OTHER_TEXT_SECTIONS= OTHER_BSS_SYMBOLS= diff --git a/ld/emulparams/elf32frvfd.sh b/ld/emulparams/elf32frvfd.sh index c9f1d6273e..420dea471f 100644 --- a/ld/emulparams/elf32frvfd.sh +++ b/ld/emulparams/elf32frvfd.sh @@ -2,7 +2,7 @@ source_sh ${srcdir}/emulparams/elf32frv.sh unset STACK_ADDR OUTPUT_FORMAT="elf32-frvfdpic" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf unset EXTRA_EM_FILE GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf32ip2k.sh b/ld/emulparams/elf32ip2k.sh index 0db227fe3a..e8cfec11a7 100644 --- a/ld/emulparams/elf32ip2k.sh +++ b/ld/emulparams/elf32ip2k.sh @@ -1,4 +1,4 @@ -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf MACHINE= SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-ip2k" diff --git a/ld/emulparams/elf32lm32.sh b/ld/emulparams/elf32lm32.sh index b3fcd32140..0db2a4f8df 100644 --- a/ld/emulparams/elf32lm32.sh +++ b/ld/emulparams/elf32lm32.sh @@ -4,7 +4,7 @@ SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-lm32" MAXPAGESIZE=0x1000 EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf TEXT_START_ADDR=0x0000 DYNAMIC_LINK=FALSE ALIGNMENT=4 diff --git a/ld/emulparams/elf32lm32fd.sh b/ld/emulparams/elf32lm32fd.sh index edbea49b6a..0be3378df3 100644 --- a/ld/emulparams/elf32lm32fd.sh +++ b/ld/emulparams/elf32lm32fd.sh @@ -3,7 +3,7 @@ unset STACK_ADDR unset DYNAMIC_LINK OUTPUT_FORMAT="elf32-lm32fdpic" MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes EMBEDDED= # This gets us program headers mapped as part of the text segment. diff --git a/ld/emulparams/elf32lriscv-defs.sh b/ld/emulparams/elf32lriscv-defs.sh index 5ac3b6023d..bc464918e5 100644 --- a/ld/emulparams/elf32lriscv-defs.sh +++ b/ld/emulparams/elf32lriscv-defs.sh @@ -3,7 +3,7 @@ SCRIPT_NAME=elf ARCH=riscv NO_REL_RELOCS=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=riscvelf ELFSIZE=32 diff --git a/ld/emulparams/elf32m32c.sh b/ld/emulparams/elf32m32c.sh index cd2b700a18..b77c0cc79b 100644 --- a/ld/emulparams/elf32m32c.sh +++ b/ld/emulparams/elf32m32c.sh @@ -6,7 +6,7 @@ TEXT_START_ADDR=0x2000 ARCH=m32c ENTRY=_start EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=needrelax ELFSIZE=32 MAXPAGESIZE=256 diff --git a/ld/emulparams/elf32mb_linux.sh b/ld/emulparams/elf32mb_linux.sh index ccb633ebe0..01963752f4 100644 --- a/ld/emulparams/elf32mb_linux.sh +++ b/ld/emulparams/elf32mb_linux.sh @@ -11,7 +11,7 @@ ARCH=microblaze NOP=0x80000000 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf32mbel_linux.sh b/ld/emulparams/elf32mbel_linux.sh index 2980e82077..61b47613bc 100644 --- a/ld/emulparams/elf32mbel_linux.sh +++ b/ld/emulparams/elf32mbel_linux.sh @@ -11,7 +11,7 @@ ARCH=microblaze NOP=0x80000000 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf32mcore.sh b/ld/emulparams/elf32mcore.sh index ee988129c4..88a8cb6e70 100644 --- a/ld/emulparams/elf32mcore.sh +++ b/ld/emulparams/elf32mcore.sh @@ -26,7 +26,7 @@ OTHER_BSS_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__bss_end__ = .${CREATE_SHLIB+)} # This sets the stack to the top of the simulator memory (2^19 bytes). STACK_ADDR=0x80000 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf # This code gets inserted into the generic elf32.sc linker script # and allows us to define our own command line switches. diff --git a/ld/emulparams/elf32mep.sh b/ld/emulparams/elf32mep.sh index 7d93abab1e..f960916b17 100644 --- a/ld/emulparams/elf32mep.sh +++ b/ld/emulparams/elf32mep.sh @@ -6,7 +6,7 @@ ARCH=mep MAXPAGESIZE=256 ENTRY=_start EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf if test -n "${RELOCATING}"; then DATA_START_SYMBOLS='__data_start = . ;' diff --git a/ld/emulparams/elf32metag.sh b/ld/emulparams/elf32metag.sh index 9d71d7a915..c4cd13c0c9 100644 --- a/ld/emulparams/elf32metag.sh +++ b/ld/emulparams/elf32metag.sh @@ -1,6 +1,6 @@ MACHINE= SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes OUTPUT_FORMAT="elf32-metag" diff --git a/ld/emulparams/elf32microblaze.sh b/ld/emulparams/elf32microblaze.sh index 116e37d070..f867018eb3 100644 --- a/ld/emulparams/elf32microblaze.sh +++ b/ld/emulparams/elf32microblaze.sh @@ -20,7 +20,7 @@ NOP=0x80000000 #$@{RELOCATING+ PROVIDE (__stack = 0x7000);@} #OTHER_RELOCATING_SECTIONS='PROVIDE (_stack = _end + 0x1000);' -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf #GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/elf32mipswindiss.sh b/ld/emulparams/elf32mipswindiss.sh index b8bb87edeb..9274170f76 100644 --- a/ld/emulparams/elf32mipswindiss.sh +++ b/ld/emulparams/elf32mipswindiss.sh @@ -1,4 +1,4 @@ -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=mipself SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-bigmips" diff --git a/ld/emulparams/elf32or1k.sh b/ld/emulparams/elf32or1k.sh index e8d59b810f..48d2ecfa2b 100644 --- a/ld/emulparams/elf32or1k.sh +++ b/ld/emulparams/elf32or1k.sh @@ -1,6 +1,6 @@ SCRIPT_NAME=elf MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-or1k" NOP=0x15000000 TEXT_START_ADDR=0x0000 diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh index 2872ca6a16..da892988f5 100644 --- a/ld/emulparams/elf32ppccommon.sh +++ b/ld/emulparams/elf32ppccommon.sh @@ -2,7 +2,7 @@ # elf32ppc.sh elf32ppcvxworks.sh elf64ppc.sh source_sh ${srcdir}/emulparams/dynamic_undefined_weak.sh -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes SCRIPT_NAME=elf diff --git a/ld/emulparams/elf32rl78.sh b/ld/emulparams/elf32rl78.sh index d1a00e185a..e7ffa75909 100644 --- a/ld/emulparams/elf32rl78.sh +++ b/ld/emulparams/elf32rl78.sh @@ -6,7 +6,7 @@ TEXT_START_ADDR=0x00000 ARCH=rl78 ENTRY=_start EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf ELFSIZE=32 # EXTRA_EM_FILE=needrelax MAXPAGESIZE=256 diff --git a/ld/emulparams/elf32rx.sh b/ld/emulparams/elf32rx.sh index e139be7196..7619fcc169 100644 --- a/ld/emulparams/elf32rx.sh +++ b/ld/emulparams/elf32rx.sh @@ -6,7 +6,7 @@ TEXT_START_ADDR=0x10000000 ARCH=rx ENTRY=_start EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=rxelf # EXTRA_EM_FILE=needrelax ELFSIZE=32 diff --git a/ld/emulparams/elf32tilegx.sh b/ld/emulparams/elf32tilegx.sh index faf3ee0386..53b1a051c1 100644 --- a/ld/emulparams/elf32tilegx.sh +++ b/ld/emulparams/elf32tilegx.sh @@ -11,7 +11,7 @@ ARCH=tilegx ALIGNMENT=64 MACHINE= NOP=0 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_COMBRELOC_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf32tilepro.sh b/ld/emulparams/elf32tilepro.sh index 01d84bcff3..93bccef428 100644 --- a/ld/emulparams/elf32tilepro.sh +++ b/ld/emulparams/elf32tilepro.sh @@ -12,7 +12,7 @@ ARCH=tilepro ALIGNMENT=64 MACHINE= NOP=0 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_COMBRELOC_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf32vax.sh b/ld/emulparams/elf32vax.sh index 9ddc754c66..4267f53d4c 100644 --- a/ld/emulparams/elf32vax.sh +++ b/ld/emulparams/elf32vax.sh @@ -9,6 +9,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=vax MACHINE= NOP=0x0101 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf32visium.sh b/ld/emulparams/elf32visium.sh index 17cf4b9ba3..f362ae3f82 100644 --- a/ld/emulparams/elf32visium.sh +++ b/ld/emulparams/elf32visium.sh @@ -5,5 +5,5 @@ MAXPAGESIZE=0x10000 NONPAGED_TEXT_START_ADDR=0x10000 ARCH=visium MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf DYNAMIC_LINK=FALSE diff --git a/ld/emulparams/elf32xc16x.sh b/ld/emulparams/elf32xc16x.sh index f88ccee817..1f89529be6 100644 --- a/ld/emulparams/elf32xc16x.sh +++ b/ld/emulparams/elf32xc16x.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf32xc16x -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-xc16x" TEXT_START_ADDR=0x00400 ARCH=xc16x diff --git a/ld/emulparams/elf32xc16xl.sh b/ld/emulparams/elf32xc16xl.sh index 14eb24bec8..98ee128ce3 100644 --- a/ld/emulparams/elf32xc16xl.sh +++ b/ld/emulparams/elf32xc16xl.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf32xc16xl -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-xc16x" TEXT_START_ADDR=0xc00300 ARCH=xc16x:xc16xl diff --git a/ld/emulparams/elf32xc16xs.sh b/ld/emulparams/elf32xc16xs.sh index 2454963a97..9c6628f964 100644 --- a/ld/emulparams/elf32xc16xs.sh +++ b/ld/emulparams/elf32xc16xs.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf32xc16xs -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-xc16x" TEXT_START_ADDR=0xc00300 ARCH=xc16x:xc16xs diff --git a/ld/emulparams/elf32xstormy16.sh b/ld/emulparams/elf32xstormy16.sh index a512ec3690..b3989a4eb7 100644 --- a/ld/emulparams/elf32xstormy16.sh +++ b/ld/emulparams/elf32xstormy16.sh @@ -1,6 +1,6 @@ MACHINE= SCRIPT_NAME=xstormy16 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=needrelax OUTPUT_FORMAT="elf32-xstormy16" # See also `include/elf/xstormy16.h' diff --git a/ld/emulparams/elf32xtensa.sh b/ld/emulparams/elf32xtensa.sh index d9ccd83921..b3a6a886f3 100644 --- a/ld/emulparams/elf32xtensa.sh +++ b/ld/emulparams/elf32xtensa.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elfxtensa -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=xtensaelf OUTPUT_FORMAT=undefined BIG_OUTPUT_FORMAT="elf32-xtensa-be" diff --git a/ld/emulparams/elf64_aix.sh b/ld/emulparams/elf64_aix.sh index 39325f5772..9b05bf9a90 100644 --- a/ld/emulparams/elf64_aix.sh +++ b/ld/emulparams/elf64_aix.sh @@ -1,7 +1,7 @@ # See genscripts.sh and ../scripttempl/elf.sc for the meaning of these. SCRIPT_NAME=elf ELFSIZE=64 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf64-ia64-aix-little" ARCH=ia64 MACHINE= diff --git a/ld/emulparams/elf64_ia64.sh b/ld/emulparams/elf64_ia64.sh index 02970a6f03..5f05ccbbba 100644 --- a/ld/emulparams/elf64_ia64.sh +++ b/ld/emulparams/elf64_ia64.sh @@ -1,7 +1,7 @@ # See genscripts.sh and ../scripttempl/elf.sc for the meaning of these. SCRIPT_NAME=elf ELFSIZE=64 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=ia64elf OUTPUT_FORMAT="elf64-ia64-little" ARCH=ia64 diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh index 8d02042856..899efd7f53 100644 --- a/ld/emulparams/elf64_s390.sh +++ b/ld/emulparams/elf64_s390.sh @@ -8,7 +8,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH="s390:64-bit" MACHINE= NOP=0x07070707 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes GENERATE_RELRO_SCRIPT=yes diff --git a/ld/emulparams/elf64_sparc.sh b/ld/emulparams/elf64_sparc.sh index 9397b87dbc..8ae29ad78c 100644 --- a/ld/emulparams/elf64_sparc.sh +++ b/ld/emulparams/elf64_sparc.sh @@ -1,6 +1,6 @@ SCRIPT_NAME=elf ELFSIZE=64 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf64-sparc" NO_REL_RELOCS=yes MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" diff --git a/ld/emulparams/elf64alpha.sh b/ld/emulparams/elf64alpha.sh index 9a275b73e6..1c7d206225 100644 --- a/ld/emulparams/elf64alpha.sh +++ b/ld/emulparams/elf64alpha.sh @@ -1,7 +1,7 @@ ENTRY=_start SCRIPT_NAME=elf ELFSIZE=64 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=alphaelf OUTPUT_FORMAT="elf64-alpha" NO_REL_RELOCS=yes diff --git a/ld/emulparams/elf64bpf.sh b/ld/emulparams/elf64bpf.sh index 94a7580487..de304fed89 100644 --- a/ld/emulparams/elf64bpf.sh +++ b/ld/emulparams/elf64bpf.sh @@ -1,4 +1,4 @@ -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf SCRIPT_NAME=elf64bpf BIG_OUTPUT_FORMAT="elf64-bpfbe" LITTLE_OUTPUT_FORMAT="elf64-bpfle" diff --git a/ld/emulparams/elf64hppa.sh b/ld/emulparams/elf64hppa.sh index 1ed32f9721..b0b43f7ecd 100644 --- a/ld/emulparams/elf64hppa.sh +++ b/ld/emulparams/elf64hppa.sh @@ -17,7 +17,7 @@ SHLIB_DATA_ADDR=0x8000000000001000 ARCH=hppa MACHINE=hppa2.0w ENTRY="main" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes # We really want multiple .stub sections, one for each input .text section, diff --git a/ld/emulparams/elf64mmix.sh b/ld/emulparams/elf64mmix.sh index 6b9173d95d..dffc6cc6f7 100644 --- a/ld/emulparams/elf64mmix.sh +++ b/ld/emulparams/elf64mmix.sh @@ -1,4 +1,4 @@ -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes ELFSIZE=64 SCRIPT_NAME=elf diff --git a/ld/emulparams/elf64rdos.sh b/ld/emulparams/elf64rdos.sh index b4f2385951..8cf78ea251 100644 --- a/ld/emulparams/elf64rdos.sh +++ b/ld/emulparams/elf64rdos.sh @@ -9,7 +9,7 @@ TEXT_START_ADDR=0x180E0000000 LARGE_DATA_ADDR=0x80020000000 ARCH="i386:x86-64" MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf64tilegx.sh b/ld/emulparams/elf64tilegx.sh index 51cbef7f3d..d6957cb33c 100644 --- a/ld/emulparams/elf64tilegx.sh +++ b/ld/emulparams/elf64tilegx.sh @@ -11,8 +11,7 @@ ARCH=tilegx ALIGNMENT=64 MACHINE= NOP=0 -# Note that "elf32.em" actually handles elf64 also. -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_COMBRELOC_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_i386.sh b/ld/emulparams/elf_i386.sh index 6f4bc4bc1d..645707ddbd 100644 --- a/ld/emulparams/elf_i386.sh +++ b/ld/emulparams/elf_i386.sh @@ -11,7 +11,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH=i386 MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_i386_be.sh b/ld/emulparams/elf_i386_be.sh index 0d8c834b18..dbe68e99e6 100644 --- a/ld/emulparams/elf_i386_be.sh +++ b/ld/emulparams/elf_i386_be.sh @@ -9,7 +9,7 @@ TEXT_START_ADDR=0x80000000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=i386 MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf_i386_ldso.sh b/ld/emulparams/elf_i386_ldso.sh index 6bd85e00bc..7ed810e5ac 100644 --- a/ld/emulparams/elf_i386_ldso.sh +++ b/ld/emulparams/elf_i386_ldso.sh @@ -10,7 +10,7 @@ TEXT_START_ADDR=0x08048000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=i386 MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes ELF_INTERPRETER_NAME=\"/usr/lib/ld.so.1\" NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf_i386_vxworks.sh b/ld/emulparams/elf_i386_vxworks.sh index c4426bceb9..40c809263d 100644 --- a/ld/emulparams/elf_i386_vxworks.sh +++ b/ld/emulparams/elf_i386_vxworks.sh @@ -6,7 +6,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH=i386 MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_iamcu.sh b/ld/emulparams/elf_iamcu.sh index 6882a25dca..1cc07cc720 100644 --- a/ld/emulparams/elf_iamcu.sh +++ b/ld/emulparams/elf_iamcu.sh @@ -11,7 +11,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH=iamcu MACHINE= COMPILE_IN=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_k1om.sh b/ld/emulparams/elf_k1om.sh index 6be186e083..6f15bdc057 100644 --- a/ld/emulparams/elf_k1om.sh +++ b/ld/emulparams/elf_k1om.sh @@ -12,7 +12,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH="k1om" MACHINE= COMPILE_IN=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_l1om.sh b/ld/emulparams/elf_l1om.sh index cf831c7418..7348c95787 100644 --- a/ld/emulparams/elf_l1om.sh +++ b/ld/emulparams/elf_l1om.sh @@ -12,7 +12,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH="l1om" MACHINE= COMPILE_IN=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/elf_s390.sh b/ld/emulparams/elf_s390.sh index f2286ecc16..cb1c6b5b04 100644 --- a/ld/emulparams/elf_s390.sh +++ b/ld/emulparams/elf_s390.sh @@ -7,7 +7,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH="s390:31-bit" MACHINE= NOP=0x07070707 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes NO_SMALL_DATA=yes diff --git a/ld/emulparams/elf_x86_64.sh b/ld/emulparams/elf_x86_64.sh index 0034a8b926..2b34941986 100644 --- a/ld/emulparams/elf_x86_64.sh +++ b/ld/emulparams/elf_x86_64.sh @@ -13,7 +13,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH="i386:x86-64" MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/h8300elf.sh b/ld/emulparams/h8300elf.sh index 6db8c216d6..45b3458d1c 100644 --- a/ld/emulparams/h8300elf.sh +++ b/ld/emulparams/h8300elf.sh @@ -8,7 +8,7 @@ TEXT_START_ADDR=0x100 MAXPAGESIZE=2 TARGET_PAGE_SIZE=128 ARCH=h8300 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EMBEDDED=yes STACK_ADDR=0xfefc TINY_READONLY_SECTION=".tinyrodata : diff --git a/ld/emulparams/h8300elf_linux.sh b/ld/emulparams/h8300elf_linux.sh index 4395cfc4da..3d8c1e482c 100644 --- a/ld/emulparams/h8300elf_linux.sh +++ b/ld/emulparams/h8300elf_linux.sh @@ -8,7 +8,7 @@ TEXT_START_ADDR=0x100 MAXPAGESIZE=2 TARGET_PAGE_SIZE=128 ARCH=h8300 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EMBEDDED=yes STACK_ADDR=0xfefc TINY_READONLY_SECTION=".tinyrodata : diff --git a/ld/emulparams/hppa64linux.sh b/ld/emulparams/hppa64linux.sh index d86fdf6ddf..3caad892db 100644 --- a/ld/emulparams/hppa64linux.sh +++ b/ld/emulparams/hppa64linux.sh @@ -8,7 +8,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=hppa MACHINE=hppa2.0w ENTRY="main" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes # We really want multiple .stub sections, one for each input .text section, diff --git a/ld/emulparams/hppaelf.sh b/ld/emulparams/hppaelf.sh index 77dcb39773..268feec6a0 100644 --- a/ld/emulparams/hppaelf.sh +++ b/ld/emulparams/hppaelf.sh @@ -5,5 +5,5 @@ TARGET_PAGE_SIZE=0x1000 ARCH=hppa NOP=0x08000240 START="$START$" -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=hppaelf diff --git a/ld/emulparams/hppalinux.sh b/ld/emulparams/hppalinux.sh index deb07c23dd..7892df9130 100644 --- a/ld/emulparams/hppalinux.sh +++ b/ld/emulparams/hppalinux.sh @@ -30,5 +30,5 @@ DATA_PLT= PLT_BEFORE_GOT= GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=hppaelf diff --git a/ld/emulparams/i386lynx.sh b/ld/emulparams/i386lynx.sh index b86967bd46..59e99d9a4b 100644 --- a/ld/emulparams/i386lynx.sh +++ b/ld/emulparams/i386lynx.sh @@ -12,7 +12,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=i386 MACHINE= NOP=0x9090 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes ELF_INTERPRETER_NAME=\"/usr/lib/ld.so.1\" diff --git a/ld/emulparams/i386moss.sh b/ld/emulparams/i386moss.sh index faee222a11..8cbc1b9998 100644 --- a/ld/emulparams/i386moss.sh +++ b/ld/emulparams/i386moss.sh @@ -6,6 +6,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=i386 MACHINE= NOP=0x90909090 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/i386nto.sh b/ld/emulparams/i386nto.sh index ab5f84c8bd..3291412706 100644 --- a/ld/emulparams/i386nto.sh +++ b/ld/emulparams/i386nto.sh @@ -7,6 +7,6 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=i386 MACHINE= NOP=0x9090 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="elf-x86" GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/m32relf.sh b/ld/emulparams/m32relf.sh index 947c7a8eae..d67368b5cc 100644 --- a/ld/emulparams/m32relf.sh +++ b/ld/emulparams/m32relf.sh @@ -1,6 +1,6 @@ MACHINE= SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-m32r" TEXT_START_ADDR=0x100 ARCH=m32r diff --git a/ld/emulparams/m32relf_linux.sh b/ld/emulparams/m32relf_linux.sh index 9a4ee9778e..2fcfe9d9b3 100644 --- a/ld/emulparams/m32relf_linux.sh +++ b/ld/emulparams/m32relf_linux.sh @@ -1,6 +1,6 @@ MACHINE= SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-m32r-linux" TEXT_START_ADDR=0x1000 ARCH=m32r diff --git a/ld/emulparams/m68hc11elf.sh b/ld/emulparams/m68hc11elf.sh index 1caa6e1928..2e3df55dca 100644 --- a/ld/emulparams/m68hc11elf.sh +++ b/ld/emulparams/m68hc11elf.sh @@ -14,5 +14,5 @@ ARCH=m68hc11 MAXPAGESIZE=32 EMBEDDED=yes GENERIC_BOARD=no -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=m68hc1xelf diff --git a/ld/emulparams/m68hc11elfb.sh b/ld/emulparams/m68hc11elfb.sh index a8f01d246f..ca0f58e003 100644 --- a/ld/emulparams/m68hc11elfb.sh +++ b/ld/emulparams/m68hc11elfb.sh @@ -7,6 +7,6 @@ EEPROM_MEMORY=eeprom ARCH=m68hc11 MAXPAGESIZE=32 GENERIC_BOARD=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=m68hc1xelf diff --git a/ld/emulparams/m68hc12elf.sh b/ld/emulparams/m68hc12elf.sh index c4d74871f1..03c7c1b8ad 100644 --- a/ld/emulparams/m68hc12elf.sh +++ b/ld/emulparams/m68hc12elf.sh @@ -14,5 +14,5 @@ ARCH=m68hc12 MAXPAGESIZE=32 EMBEDDED=yes GENERIC_BOARD=no -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=m68hc1xelf diff --git a/ld/emulparams/m68hc12elfb.sh b/ld/emulparams/m68hc12elfb.sh index acc3ce34d3..4b23473468 100644 --- a/ld/emulparams/m68hc12elfb.sh +++ b/ld/emulparams/m68hc12elfb.sh @@ -7,6 +7,6 @@ EEPROM_MEMORY=eeprom ARCH=m68hc12 MAXPAGESIZE=32 GENERIC_BOARD=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=m68hc1xelf diff --git a/ld/emulparams/m68kelf.sh b/ld/emulparams/m68kelf.sh index 5c5e672dfc..79b3251eba 100644 --- a/ld/emulparams/m68kelf.sh +++ b/ld/emulparams/m68kelf.sh @@ -7,7 +7,7 @@ COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH=m68k MACHINE= NOP=0x4e714e71 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=m68kelf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/mn10300.sh b/ld/emulparams/mn10300.sh index ba7a2c4e5f..a00fd433e5 100644 --- a/ld/emulparams/mn10300.sh +++ b/ld/emulparams/mn10300.sh @@ -1,6 +1,6 @@ source_sh ${srcdir}/emulparams/mn10200.sh OUTPUT_FORMAT="elf32-mn10300" ARCH=mn10300 -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf unset EXTRA_EM_FILE GENERATE_SHLIB_SCRIPT=yes diff --git a/ld/emulparams/nds32elf.sh b/ld/emulparams/nds32elf.sh index f0a7c31329..c1fc5ed584 100644 --- a/ld/emulparams/nds32elf.sh +++ b/ld/emulparams/nds32elf.sh @@ -3,7 +3,7 @@ TEXT_START_ADDR=0x500000 OTHER_END_SYMBOLS='PROVIDE (_stack = 0x3000000);' SCRIPT_NAME=nds32elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=nds32elf BIG_OUTPUT_FORMAT="elf32-nds32be" LITTLE_OUTPUT_FORMAT="elf32-nds32le" diff --git a/ld/emulparams/nds32elf16m.sh b/ld/emulparams/nds32elf16m.sh index deb8699004..f149a0fb1b 100644 --- a/ld/emulparams/nds32elf16m.sh +++ b/ld/emulparams/nds32elf16m.sh @@ -3,7 +3,7 @@ TEXT_START_ADDR=0x300000 OTHER_END_SYMBOLS='PROVIDE (_stack = 0x780000);' SCRIPT_NAME=nds32elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=nds32elf BIG_OUTPUT_FORMAT="elf32-nds32be" LITTLE_OUTPUT_FORMAT="elf32-nds32le" diff --git a/ld/emulparams/nds32elf_linux.sh b/ld/emulparams/nds32elf_linux.sh index 1145c0eeea..bf4dcea2cf 100644 --- a/ld/emulparams/nds32elf_linux.sh +++ b/ld/emulparams/nds32elf_linux.sh @@ -2,7 +2,7 @@ DEFAULT_TEXT_START_ADDR=0 DEFAULT_STACK_START_ADDR=0 MACHINE= SCRIPT_NAME=nds32elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=nds32elf BIG_OUTPUT_FORMAT="elf32-nds32be-linux" LITTLE_OUTPUT_FORMAT="elf32-nds32le-linux" diff --git a/ld/emulparams/nios2elf.sh b/ld/emulparams/nios2elf.sh index ed70748474..9097944947 100644 --- a/ld/emulparams/nios2elf.sh +++ b/ld/emulparams/nios2elf.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=nios2elf OUTPUT_FORMAT="elf32-littlenios2" LITTLE_OUTPUT_FORMAT="elf32-littlenios2" diff --git a/ld/emulparams/nios2linux.sh b/ld/emulparams/nios2linux.sh index e65425084d..2c04d062b1 100644 --- a/ld/emulparams/nios2linux.sh +++ b/ld/emulparams/nios2linux.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE="nios2elf" OUTPUT_FORMAT="elf32-littlenios2" LITTLE_OUTPUT_FORMAT="elf32-littlenios2" diff --git a/ld/emulparams/pruelf.sh b/ld/emulparams/pruelf.sh index 02debba764..48e9a3a3be 100644 --- a/ld/emulparams/pruelf.sh +++ b/ld/emulparams/pruelf.sh @@ -1,5 +1,5 @@ SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf OUTPUT_FORMAT="elf32-pru" LITTLE_OUTPUT_FORMAT="elf32-pru" SCRIPT_NAME=pru diff --git a/ld/emulparams/score3_elf.sh b/ld/emulparams/score3_elf.sh index 8fbd47bf8e..7be7883363 100644 --- a/ld/emulparams/score3_elf.sh +++ b/ld/emulparams/score3_elf.sh @@ -1,6 +1,6 @@ MACHINE= SCRIPT_NAME=elf -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf EXTRA_EM_FILE=scoreelf OUTPUT_FORMAT="elf32-bigscore" BIG_OUTPUT_FORMAT="elf32-bigscore" diff --git a/ld/emulparams/shelf.sh b/ld/emulparams/shelf.sh index 5b34319490..63c2ff19dc 100644 --- a/ld/emulparams/shelf.sh +++ b/ld/emulparams/shelf.sh @@ -8,7 +8,7 @@ TEXT_START_ADDR=0x1000 MAXPAGESIZE=128 ARCH=sh MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes EMBEDDED=yes # These are for compatibility with the COFF toolchain. diff --git a/ld/emulparams/shelf_nto.sh b/ld/emulparams/shelf_nto.sh index 1dc5e4652b..8758fd8efd 100644 --- a/ld/emulparams/shelf_nto.sh +++ b/ld/emulparams/shelf_nto.sh @@ -5,7 +5,7 @@ TEXT_START_ADDR=0x08040000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=sh MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes TEXT_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_btext = .${CREATE_SHLIB+)};" ENTRY=_start diff --git a/ld/emulparams/shelf_vxworks.sh b/ld/emulparams/shelf_vxworks.sh index 4929c0d53d..c985a98ae4 100644 --- a/ld/emulparams/shelf_vxworks.sh +++ b/ld/emulparams/shelf_vxworks.sh @@ -10,7 +10,7 @@ TEXT_START_ADDR=0x1000 MAXPAGESIZE='CONSTANT (MAXPAGESIZE)' ARCH=sh MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes ENTRY=__start SYMPREFIX=_ diff --git a/ld/emulparams/shlelf_linux.sh b/ld/emulparams/shlelf_linux.sh index c14aae228d..aeb225e664 100644 --- a/ld/emulparams/shlelf_linux.sh +++ b/ld/emulparams/shlelf_linux.sh @@ -9,7 +9,7 @@ MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ARCH=sh MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes GENERATE_PIE_SCRIPT=yes diff --git a/ld/emulparams/shlelf_nto.sh b/ld/emulparams/shlelf_nto.sh index ddc4fc6bb5..4e77a8ce35 100644 --- a/ld/emulparams/shlelf_nto.sh +++ b/ld/emulparams/shlelf_nto.sh @@ -5,7 +5,7 @@ TEXT_START_ADDR=0x08040000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ARCH=sh MACHINE= -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf GENERATE_SHLIB_SCRIPT=yes TEXT_START_SYMBOLS="${CREATE_SHLIB+PROVIDE (}_btext = .${CREATE_SHLIB+)};" ENTRY=_start diff --git a/ld/emulparams/v850.sh b/ld/emulparams/v850.sh index c2bdda3273..646ca1c042 100644 --- a/ld/emulparams/v850.sh +++ b/ld/emulparams/v850.sh @@ -13,4 +13,4 @@ ARCH=v850 MAXPAGESIZE=256 ENTRY=_start EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf diff --git a/ld/emulparams/v850_rh850.sh b/ld/emulparams/v850_rh850.sh index febdad3d18..04ba78c8f6 100644 --- a/ld/emulparams/v850_rh850.sh +++ b/ld/emulparams/v850_rh850.sh @@ -13,4 +13,4 @@ ARCH=v850_rh850 MAXPAGESIZE=256 ENTRY=_start EMBEDDED=yes -TEMPLATE_NAME=elf32 +TEMPLATE_NAME=elf diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em index 022de0834e..7ffb17e7a9 100644 --- a/ld/emultempl/aarch64elf.em +++ b/ld/emultempl/aarch64elf.em @@ -19,7 +19,7 @@ # see . # -# This file is sourced from elf32.em, and defines extra aarch64-elf +# This file is sourced from elf.em, and defines extra aarch64-elf # specific routines. # fragment <. # -# This file is sourced from elf32.em, and defines x86 specific routines. +# This file is sourced from elf.em, and defines x86 specific routines. # fragment < INTERNAL_RAM} */ =${NOP-0} diff --git a/ld/scripttempl/iq2000.sc b/ld/scripttempl/iq2000.sc index 2f988ec4aa..999209160f 100644 --- a/ld/scripttempl/iq2000.sc +++ b/ld/scripttempl/iq2000.sc @@ -300,7 +300,7 @@ cat < 0, "Bad . value"); diff --git a/ld/testsuite/ld-shared/elf-offset.ld b/ld/testsuite/ld-shared/elf-offset.ld index ee587f9fdd..8f1622aaad 100644 --- a/ld/testsuite/ld-shared/elf-offset.ld +++ b/ld/testsuite/ld-shared/elf-offset.ld @@ -67,7 +67,7 @@ SECTIONS *(.text) *(.text.*) *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.gnu.linkonce.t*) } -- 2.34.1