diff options
Diffstat (limited to 'ld')
203 files changed, 410 insertions, 207 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 18d2c05..ca12975 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,211 @@ 2019-09-11 Alan Modra <amodra@gmail.com> + * 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 <amodra@gmail.com> + * Makefile.am (ALL_EMUL_EXTRA_OFILES): Add ldelf and ldelfgen. (CFILES, HFILES, EXTRA_ld_new_SOURCES): Likewise. * configure.tgt: Formatting. diff --git a/ld/configure b/ld/configure index 3b50f5d..8edef45 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 ee62d10..41a51bb 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 983a92b..0e6f834 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 4a59342..8f68e51 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 38bcd4b..5a08d9e 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 3a7a2e1..0bcab7a 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 5df6ae1..7b4a0e8 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 3c60de0..3e75d14 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 875df7e..625ec39 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 74e9604..cd01769 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 d342819..3a73473 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 fbbf20d..da5ab40 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 4b0cf55..4824f35 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 cfe7ea0..ad13444 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 d46e0bd..0e3147c 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 36392f1..823ddf5 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 d726d63..e9439c4 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 7fb1e2d..63c35a8 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 79be999..f0d7b33 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 0fa6eed..f399248 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 e0bdc21a..4c70ff0 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 4a6e0a3..703a3ae 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 f02dd39..4cbc917 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 0bf3c0f..287d71e 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 fe83dc8..c40e0e1 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 ccda23f..79adbcc 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 64e9d66..6eedf17 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 b097771..1856e62 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 10efa6f..5b9d167 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 4aca22b..434cd9f 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 722ee18..66b0e854 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 d9211b2..3f3d865 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 b33f895..e4a2563 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 02ef7d7..d7b3771 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 93b69da..8de5d6e 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 f7dae40..de282e5 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 578f52a..5abc148 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 5ea9284..94ef1cd 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 c072dba..31b746e 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 c9f7e3f..d572ac8 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 c8de5c4..5eabb69 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 13af316..0ba6b8d 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 235455f..523f323 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 62ea9eb..7bf7bf1 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 43f2519..249553a 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 b34d2b8..e63c349 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 6c0bb40..8d298b4 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 b4114b1..c2a12ff 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 1e0200a..992d454 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 80dce8f..44f817b 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 bc9ae51..4718b1b 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 e78e5ed..986d84d 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 24960ec..d57b3ce 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 fd24012..6267d74 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 be03d40..d80438d 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 c9f1d62..420dea4 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 0db227f..e8cfec1 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 b3fcd32..0db2a4f 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 edbea49..0be3378 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 5ac3b60..bc46491 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 cd2b700..b77c0cc 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 ccb633e..0196375 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 2980e82..61b4761 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 ee98812..88a8cb6 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 7d93aba..f960916 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 9d71d7a..c4cd13c 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 116e37d..f867018 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 b8bb87e..9274170 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 e8d59b8..48d2ecf 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 2872ca6..da89298 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 d1a00e1..e7ffa75 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 e139be7..7619fcc 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 faf3ee0..53b1a05 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 01d84bc..93bccef 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 9ddc754..4267f53 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 17cf4b9..f362ae3 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 f88ccee..1f89529 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 14eb24b..98ee128 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 2454963..9c6628f 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 a512ec3..b3989a4 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 d9ccd83..b3a6a88 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 39325f5..9b05bf9 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 02970a6..5f05ccb 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 8d02042..899efd7 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 9397b87..8ae29ad 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 9a275b7..1c7d206 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 94a7580..de304fe 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 1ed32f9..b0b43f7 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 6b9173d..dffc6cc 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 b4f2385..8cf78ea 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 51cbef7..d6957cb 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 6f4bc4b..645707d 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 0d8c834..dbe68e9 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 6bd85e0..7ed810e 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 c4426bc..40c8092 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 6882a25..1cc07cc 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 6be186e..6f15bdc 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 cf831c7..7348c95 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 f2286ec..cb1c6b5 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 0034a8b..2b34941 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 6db8c21..45b3458 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 4395cfc..3d8c1e4 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 d86fdf6..3caad89 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 77dcb39..268feec 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 deb07c2..7892df9 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 b86967b..59e99d9 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 faee222..8cbc1b9 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 ab5f84c..3291412 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 947c7a8..d67368b 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 9a4ee97..2fcfe9d 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 1caa6e1..2e3df55 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 a8f01d2..ca0f58e 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 c4d7487..03c7c1b 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 acc3ce3..4b23473 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 5c5e672..79b3251 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 ba7a2c4..a00fd43 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 f0a7c31..c1fc5ed 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 deb8699..f149a0f 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 1145c0e..bf4dcea 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 ed70748..9097944 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 e654250..2c04d06 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 02debba..48e9a3a 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 8fbd47b..7be7883 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 5b34319..63c2ff1 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 1dc5e46..8758fd8 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 4929c0d..c985a98 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 c14aae2..aeb225e 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 ddc4fc6..4e77a8c 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 c2bdda3..646ca1c 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 febdad3..04ba78c 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 022de08..7ffb17e 100644 --- a/ld/emultempl/aarch64elf.em +++ b/ld/emultempl/aarch64elf.em @@ -19,7 +19,7 @@ # see <http://www.gnu.org/licenses/>. # -# 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 <<EOF diff --git a/ld/emultempl/alphaelf.em b/ld/emultempl/alphaelf.em index fbee01f..4e7886f 100644 --- a/ld/emultempl/alphaelf.em +++ b/ld/emultempl/alphaelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra alpha +# This file is sourced from elf.em, and defines extra alpha # specific routines. # fragment <<EOF diff --git a/ld/emultempl/arclinux.em b/ld/emultempl/arclinux.em index 48b6a61..4961917 100644 --- a/ld/emultempl/arclinux.em +++ b/ld/emultempl/arclinux.em @@ -20,6 +20,6 @@ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, # MA 02110-1301, USA. -# This file is sourced from elf32.em, and defines extra arc-linux +# This file is sourced from elf.em, and defines extra arc-linux # specific routines. # diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em index 29972f1..bb32bbb 100644 --- a/ld/emultempl/armelf.em +++ b/ld/emultempl/armelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra arm-elf +# This file is sourced from elf.em, and defines extra arm-elf # specific routines. # test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel" diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em index 3c897cb..f3d1082 100644 --- a/ld/emultempl/avrelf.em +++ b/ld/emultempl/avrelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. -# This file is sourced from elf32.em, and defines extra avr-elf specific +# This file is sourced from elf.em, and defines extra avr-elf specific # routines. It is used to generate the trampolines for the avr6 family # of devices where one needs to address the issue that it is not possible # to reach the whole program memory by using 16 bit pointers. diff --git a/ld/emultempl/bfin.em b/ld/emultempl/bfin.em index d5d9856..c6b3ae0 100644 --- a/ld/emultempl/bfin.em +++ b/ld/emultempl/bfin.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra bfin-elf +# This file is sourced from elf.em, and defines extra bfin-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/cr16elf.em b/ld/emultempl/cr16elf.em index 6f97d41..197f0c6 100644 --- a/ld/emultempl/cr16elf.em +++ b/ld/emultempl/cr16elf.em @@ -20,7 +20,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra cr16-elf +# This file is sourced from elf.em, and defines extra cr16-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/crxelf.em b/ld/emultempl/crxelf.em index 22bacde..da01c7c 100644 --- a/ld/emultempl/crxelf.em +++ b/ld/emultempl/crxelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra crx-elf +# This file is sourced from elf.em, and defines extra crx-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/cskyelf.em b/ld/emultempl/cskyelf.em index aaddd9c..10d037c 100644 --- a/ld/emultempl/cskyelf.em +++ b/ld/emultempl/cskyelf.em @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, # MA 02110-1301, USA. -# This file is sourced from elf32.em, and defines extra C-SKY ELF +# This file is sourced from elf.em, and defines extra C-SKY ELF # specific routines. # fragment <<EOF diff --git a/ld/emultempl/elf-generic.em b/ld/emultempl/elf-generic.em index 8392cea..29af264 100644 --- a/ld/emultempl/elf-generic.em +++ b/ld/emultempl/elf-generic.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em and from ELF targets that use +# This file is sourced from elf.em and from ELF targets that use # generic.em. # fragment <<EOF diff --git a/ld/emultempl/elf-x86.em b/ld/emultempl/elf-x86.em index 09780a1..bd6aae4 100644 --- a/ld/emultempl/elf-x86.em +++ b/ld/emultempl/elf-x86.em @@ -18,7 +18,7 @@ # see <http://www.gnu.org/licenses/>. # -# 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 <<EOF diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf.em index 5a3cc2f..5fec4d4 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf.em @@ -1,7 +1,5 @@ # This shell script emits a C file. -*- C -*- # It does some substitutions. -# This file is now misnamed, because it supports both 32 bit and 64 bit -# ELF emulations. test -z "${ELFSIZE}" && ELFSIZE=32 if [ -z "$MACHINE" ]; then OUTPUT_ARCH=${ARCH} diff --git a/ld/emultempl/epiphanyelf_4x4.em b/ld/emultempl/epiphanyelf_4x4.em index 6e0f9cd..123ba60 100644 --- a/ld/emultempl/epiphanyelf_4x4.em +++ b/ld/emultempl/epiphanyelf_4x4.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra epiphany-elf +# This file is sourced from elf.em, and defines extra epiphany-elf # specific routines. # diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em index 547ab9b..d7e822c6 100644 --- a/ld/emultempl/hppaelf.em +++ b/ld/emultempl/hppaelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra hppa-elf +# This file is sourced from elf.em, and defines extra hppa-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/ia64elf.em b/ld/emultempl/ia64elf.em index e67a04c..59e1d8d 100644 --- a/ld/emultempl/ia64elf.em +++ b/ld/emultempl/ia64elf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra ia64-elf +# This file is sourced from elf.em, and defines extra ia64-elf # specific routines. # # Define some shell vars to insert bits of code into the standard elf diff --git a/ld/emultempl/m68hc1xelf.em b/ld/emultempl/m68hc1xelf.em index 3fa325a..b55989e 100644 --- a/ld/emultempl/m68hc1xelf.em +++ b/ld/emultempl/m68hc1xelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra m68hc12-elf +# This file is sourced from elf.em, and defines extra m68hc12-elf # and m68hc11-elf specific routines. It is used to generate the # HC11/HC12 trampolines to call a far function by using a normal 'jsr/bsr'. # diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em index 5c87bf7..add8fd2 100644 --- a/ld/emultempl/m68kelf.em +++ b/ld/emultempl/m68kelf.em @@ -20,9 +20,9 @@ # MA 02110-1301, USA. -# This file is sourced from elf32.em, and defines some extra routines for m68k +# This file is sourced from elf.em, and defines some extra routines for m68k # embedded systems using ELF and for some other systems using m68k ELF. While -# it is sourced from elf32.em for all m68k ELF configurations, here we include +# it is sourced from elf.em for all m68k ELF configurations, here we include # only the features we want depending on the configuration. case ${target} in diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em index 966d19c..f56aa46 100644 --- a/ld/emultempl/metagelf.em +++ b/ld/emultempl/metagelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra metagelf +# This file is sourced from elf.em, and defines extra metagelf # specific routines. Taken from hppaelf.em. # fragment <<EOF diff --git a/ld/emultempl/mmix-elfnmmo.em b/ld/emultempl/mmix-elfnmmo.em index b86ef1f..736988b 100644 --- a/ld/emultempl/mmix-elfnmmo.em +++ b/ld/emultempl/mmix-elfnmmo.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em and mmo.em, used to define +# This file is sourced from elf.em and mmo.em, used to define # MMIX-specific things common to ELF and MMO. fragment <<EOF diff --git a/ld/emultempl/mmixelf.em b/ld/emultempl/mmixelf.em index 02bb5b3..0730a37 100644 --- a/ld/emultempl/mmixelf.em +++ b/ld/emultempl/mmixelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em and used to define MMIX and ELF +# This file is sourced from elf.em and used to define MMIX and ELF # specific things. First include what we have in common with mmo. source_em ${srcdir}/emultempl/mmix-elfnmmo.em diff --git a/ld/emultempl/mmo.em b/ld/emultempl/mmo.em index b4b4f1e..62ee144 100644 --- a/ld/emultempl/mmo.em +++ b/ld/emultempl/mmo.em @@ -24,7 +24,7 @@ fragment <<EOF /* Need to have this macro defined before mmix-elfnmmo, which uses the name for the before_allocation function, defined in ldemul.c (for - the mmo "emulation") or in elf32.em (for the elf64mmix + the mmo "emulation") or in elf.em (for the elf64mmix "emulation"). */ #define gldmmo_before_allocation before_allocation_default @@ -44,7 +44,7 @@ fragment <<EOF /* Place an orphan section. We use this to put random SEC_CODE or SEC_READONLY sections right after MMO_TEXT_SECTION_NAME. Much borrowed - from elf32.em. */ + from elf.em. */ static lang_output_section_statement_type * mmo_place_orphan (asection *s, @@ -181,7 +181,7 @@ mmo_place_orphan (asection *s, return NULL; /* If there's an output section by *this* name, we'll use it, regardless - of actual section flags, in contrast to what's done in elf32.em. */ + of actual section flags, in contrast to what's done in elf.em. */ os = lang_insert_orphan (s, secname, 0, after, place, NULL, NULL); return os; diff --git a/ld/emultempl/needrelax.em b/ld/emultempl/needrelax.em index 3218f3e..aaa27ee 100644 --- a/ld/emultempl/needrelax.em +++ b/ld/emultempl/needrelax.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em. It is used by targets for +# This file is sourced from elf.em. It is used by targets for # which relaxation is not just an optimization, but for correctness. LDEMUL_BEFORE_ALLOCATION=need_relax_${EMULATION_NAME}_before_allocation diff --git a/ld/emultempl/nios2elf.em b/ld/emultempl/nios2elf.em index 676c1fb..02eb06f 100644 --- a/ld/emultempl/nios2elf.em +++ b/ld/emultempl/nios2elf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra Nios II ELF +# This file is sourced from elf.em, and defines extra Nios II ELF # specific routines. Taken from metagelf.em. # fragment <<EOF diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em index eb75373..056068e 100644 --- a/ld/emultempl/ppc32elf.em +++ b/ld/emultempl/ppc32elf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra powerpc32-elf +# This file is sourced from elf.em, and defines extra powerpc32-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em index ef1fd0e..6df2a20 100644 --- a/ld/emultempl/ppc64elf.em +++ b/ld/emultempl/ppc64elf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra powerpc64-elf +# This file is sourced from elf.em, and defines extra powerpc64-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/pruelf.em b/ld/emultempl/pruelf.em index 2995637..0d568fb 100644 --- a/ld/emultempl/pruelf.em +++ b/ld/emultempl/pruelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra pru-elf +# This file is sourced from elf.em, and defines extra pru-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/rxelf.em b/ld/emultempl/rxelf.em index 685743c..d6ced64 100644 --- a/ld/emultempl/rxelf.em +++ b/ld/emultempl/rxelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra rx-elf +# This file is sourced from elf.em, and defines extra rx-elf # specific routines. # test -z "$TARGET2_TYPE" && TARGET2_TYPE="rel" diff --git a/ld/emultempl/scoreelf.em b/ld/emultempl/scoreelf.em index 4370c28..b200419 100644 --- a/ld/emultempl/scoreelf.em +++ b/ld/emultempl/scoreelf.em @@ -23,7 +23,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra score-elf +# This file is sourced from elf.em, and defines extra score-elf # specific routines. # fragment <<EOF diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em index 54f9f8f..40a757a 100644 --- a/ld/emultempl/spuelf.em +++ b/ld/emultempl/spuelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra spu specific +# This file is sourced from elf.em, and defines extra spu specific # features. # fragment <<EOF diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em index a6e2792..9a2544a 100644 --- a/ld/emultempl/tic6xdsbt.em +++ b/ld/emultempl/tic6xdsbt.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra C6X DSBT specific +# This file is sourced from elf.em, and defines extra C6X DSBT specific # features. # fragment <<EOF diff --git a/ld/emultempl/v850elf.em b/ld/emultempl/v850elf.em index 887880d..ac7051f 100644 --- a/ld/emultempl/v850elf.em +++ b/ld/emultempl/v850elf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra cpu specific +# This file is sourced from elf.em, and defines extra cpu specific # features. # fragment <<EOF diff --git a/ld/emultempl/vms.em b/ld/emultempl/vms.em index c7e0b78..996bb77 100644 --- a/ld/emultempl/vms.em +++ b/ld/emultempl/vms.em @@ -85,7 +85,7 @@ gld${EMULATION_NAME}_find_potential_libraries } /* Place an orphan section. We use this to put random OVR sections. - Much borrowed from elf32.em. */ + Much borrowed from elf.em. */ static lang_output_section_statement_type * vms_place_orphan (asection *s, diff --git a/ld/emultempl/vxworks.em b/ld/emultempl/vxworks.em index 1efb807..20a3b97 100644 --- a/ld/emultempl/vxworks.em +++ b/ld/emultempl/vxworks.em @@ -83,7 +83,7 @@ PARSE_AND_LIST_ARGS_CASES=$PARSE_AND_LIST_ARGS_CASES' # # (2) VXWORKS_BASE_EM_FILE set the hook's LDEMUL_FOO variable to # gld${EMULATION_NAME}_foo. This means that the file has -# replaced elf32.em's default definition, so we simply #define +# replaced elf.em's default definition, so we simply #define # the current value of LDEMUL_FOO to vxworks_foo. # # (3) VXWORKS_BASE_EM_FILE set the hook's LDEMUL_FOO variable to diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em index 9abbb4c..c826363 100644 --- a/ld/emultempl/xtensaelf.em +++ b/ld/emultempl/xtensaelf.em @@ -19,7 +19,7 @@ # MA 02110-1301, USA. # -# This file is sourced from elf32.em, and defines extra xtensa-elf +# This file is sourced from elf.em, and defines extra xtensa-elf # specific routines. # fragment <<EOF @@ -1,4 +1,4 @@ -/* ELF emulation code for targets using elf32.em. +/* ELF emulation code for targets using elf.em. Copyright (C) 1991-2019 Free Software Foundation, Inc. This file is part of the GNU Binutils. @@ -1,4 +1,4 @@ -/* ELF emulation code for targets using elf32.em. +/* ELF emulation code for targets using elf.em. Copyright (C) 1991-2019 Free Software Foundation, Inc. This file is part of the GNU Binutils. diff --git a/ld/scripttempl/arclinux.sc b/ld/scripttempl/arclinux.sc index e4bcaf0..e13969e 100644 --- a/ld/scripttempl/arclinux.sc +++ b/ld/scripttempl/arclinux.sc @@ -492,7 +492,7 @@ cat <<EOF ${RELOCATING+*(.text.startup .text.startup.*)} ${RELOCATING+*(.text.hot .text.hot.*)} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } ${FILL} diff --git a/ld/scripttempl/armbpabi.sc b/ld/scripttempl/armbpabi.sc index cb71b55..efc1f7f 100644 --- a/ld/scripttempl/armbpabi.sc +++ b/ld/scripttempl/armbpabi.sc @@ -215,7 +215,7 @@ cat <<EOF { ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } =${NOP-0} diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc index f9f0f7d..c3ad467 100644 --- a/ld/scripttempl/elf.sc +++ b/ld/scripttempl/elf.sc @@ -515,7 +515,7 @@ cat <<EOF ${RELOCATING+*(.text.startup .text.startup.*)} ${RELOCATING+*(.text.hot .text.hot.*)} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } ${FILL} diff --git a/ld/scripttempl/elf64bpf.sc b/ld/scripttempl/elf64bpf.sc index 0996f56..de73775 100644 --- a/ld/scripttempl/elf64bpf.sc +++ b/ld/scripttempl/elf64bpf.sc @@ -513,7 +513,7 @@ cat <<EOF ${RELOCATING+*(.text.startup .text.startup.*)} ${RELOCATING+*(.text.hot .text.hot.*)} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } ${FILL} diff --git a/ld/scripttempl/elf64hppa.sc b/ld/scripttempl/elf64hppa.sc index ee8fb93..2cf5b93 100644 --- a/ld/scripttempl/elf64hppa.sc +++ b/ld/scripttempl/elf64hppa.sc @@ -413,7 +413,7 @@ cat <<EOF { ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } =${NOP-0} diff --git a/ld/scripttempl/elf_chaos.sc b/ld/scripttempl/elf_chaos.sc index 1cc63b6..42aa8a0 100644 --- a/ld/scripttempl/elf_chaos.sc +++ b/ld/scripttempl/elf_chaos.sc @@ -247,7 +247,7 @@ cat <<EOF { ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } =${NOP-0} diff --git a/ld/scripttempl/elfarc.sc b/ld/scripttempl/elfarc.sc index 79d9924..0390e05 100644 --- a/ld/scripttempl/elfarc.sc +++ b/ld/scripttempl/elfarc.sc @@ -272,7 +272,7 @@ cat <<EOF { ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } =${NOP-0} diff --git a/ld/scripttempl/elfarcv2.sc b/ld/scripttempl/elfarcv2.sc index 9b55333..1d5b731 100644 --- a/ld/scripttempl/elfarcv2.sc +++ b/ld/scripttempl/elfarcv2.sc @@ -205,7 +205,7 @@ SECTIONS ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} diff --git a/ld/scripttempl/elfd10v.sc b/ld/scripttempl/elfd10v.sc index 2bf303d..f8e5a5f 100644 --- a/ld/scripttempl/elfd10v.sc +++ b/ld/scripttempl/elfd10v.sc @@ -111,7 +111,7 @@ SECTIONS KEEP (*(SORT_NONE(.fini.*)))} *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t*) _etext = .; diff --git a/ld/scripttempl/elfm68hc11.sc b/ld/scripttempl/elfm68hc11.sc index dc3f14e..0eea5da 100644 --- a/ld/scripttempl/elfm68hc11.sc +++ b/ld/scripttempl/elfm68hc11.sc @@ -320,7 +320,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+*(.tramp)} diff --git a/ld/scripttempl/elfm68hc12.sc b/ld/scripttempl/elfm68hc12.sc index 9f8d92a..a01f273 100644 --- a/ld/scripttempl/elfm68hc12.sc +++ b/ld/scripttempl/elfm68hc12.sc @@ -319,7 +319,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+*(.tramp)} diff --git a/ld/scripttempl/elfm9s12z.sc b/ld/scripttempl/elfm9s12z.sc index d640882..4ea13c8 100644 --- a/ld/scripttempl/elfm9s12z.sc +++ b/ld/scripttempl/elfm9s12z.sc @@ -305,7 +305,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+*(.tramp)} diff --git a/ld/scripttempl/elfxgate.sc b/ld/scripttempl/elfxgate.sc index fd6c073..ae28755 100644 --- a/ld/scripttempl/elfxgate.sc +++ b/ld/scripttempl/elfxgate.sc @@ -319,7 +319,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+*(.tramp)} diff --git a/ld/scripttempl/elfxtensa.sc b/ld/scripttempl/elfxtensa.sc index e81cb98..df68041 100644 --- a/ld/scripttempl/elfxtensa.sc +++ b/ld/scripttempl/elfxtensa.sc @@ -419,7 +419,7 @@ cat <<EOF ${RELOCATING+${TEXT_START_SYMBOLS}} *(.literal .text .stub${RELOCATING+ .literal.* .text.* .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} diff --git a/ld/scripttempl/epiphany_4x4.sc b/ld/scripttempl/epiphany_4x4.sc index f86ce89..882954d 100644 --- a/ld/scripttempl/epiphany_4x4.sc +++ b/ld/scripttempl/epiphany_4x4.sc @@ -490,7 +490,7 @@ cat <<EOF { ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } /* ${RELOCATING+ > INTERNAL_RAM} */ =${NOP-0} diff --git a/ld/scripttempl/iq2000.sc b/ld/scripttempl/iq2000.sc index 2f988ec..9992091 100644 --- a/ld/scripttempl/iq2000.sc +++ b/ld/scripttempl/iq2000.sc @@ -300,7 +300,7 @@ cat <<EOF *(.text) ${RELOCATING+*(.text.*)} *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+${OTHER_TEXT_SECTIONS}} diff --git a/ld/scripttempl/mep.sc b/ld/scripttempl/mep.sc index 139d1b8..1e5a579 100644 --- a/ld/scripttempl/mep.sc +++ b/ld/scripttempl/mep.sc @@ -311,7 +311,7 @@ cat <<EOF { ${RELOCATING+${TEXT_START_SYMBOLS}} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } =${NOP-0} diff --git a/ld/scripttempl/nds32elf.sc b/ld/scripttempl/nds32elf.sc index 97f868b..065c984 100644 --- a/ld/scripttempl/nds32elf.sc +++ b/ld/scripttempl/nds32elf.sc @@ -439,7 +439,7 @@ cat <<EOF ${RELOCATING+*(.text.startup .text.startup.*)} ${RELOCATING+*(.text.hot .text.hot.*)} *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*}) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+${OTHER_TEXT_SECTIONS}} } ${FILL} diff --git a/ld/scripttempl/v850.sc b/ld/scripttempl/v850.sc index f961530..05b695e 100644 --- a/ld/scripttempl/v850.sc +++ b/ld/scripttempl/v850.sc @@ -79,7 +79,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t*)} } =0 diff --git a/ld/scripttempl/v850_rh850.sc b/ld/scripttempl/v850_rh850.sc index fc1a383..07d0a05 100644 --- a/ld/scripttempl/v850_rh850.sc +++ b/ld/scripttempl/v850_rh850.sc @@ -83,7 +83,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t*)} } =0 diff --git a/ld/scripttempl/xstormy16.sc b/ld/scripttempl/xstormy16.sc index 757e0b8..13a9b44 100644 --- a/ld/scripttempl/xstormy16.sc +++ b/ld/scripttempl/xstormy16.sc @@ -181,7 +181,7 @@ SECTIONS *(.text) ${RELOCATING+*(.text.*)} *(.stub) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) ${RELOCATING+*(.gnu.linkonce.t.*)} ${RELOCATING+${OTHER_TEXT_SECTIONS}} diff --git a/ld/testsuite/ld-arm/arm-dyn.ld b/ld/testsuite/ld-arm/arm-dyn.ld index 71cb4c9..663a0dd 100644 --- a/ld/testsuite/ld-arm/arm-dyn.ld +++ b/ld/testsuite/ld-arm/arm-dyn.ld @@ -54,7 +54,7 @@ SECTIONS { *(.text .stub .text.* .gnu.linkonce.t.*) KEEP (*(.text.*personality*)) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.glue_7t) *(.glue_7) } =0 diff --git a/ld/testsuite/ld-arm/arm-lib.ld b/ld/testsuite/ld-arm/arm-lib.ld index f946d0a..6f87e1b 100644 --- a/ld/testsuite/ld-arm/arm-lib.ld +++ b/ld/testsuite/ld-arm/arm-lib.ld @@ -53,7 +53,7 @@ SECTIONS { *(.text .stub .text.* .gnu.linkonce.t.*) KEEP (*(.text.*personality*)) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.glue_7t) *(.glue_7) } =0 diff --git a/ld/testsuite/ld-arm/arm-no-rel-plt.ld b/ld/testsuite/ld-arm/arm-no-rel-plt.ld index d175a3d..d56e820 100644 --- a/ld/testsuite/ld-arm/arm-no-rel-plt.ld +++ b/ld/testsuite/ld-arm/arm-no-rel-plt.ld @@ -66,7 +66,7 @@ SECTIONS *(.text.startup .text.startup.*) *(.text.hot .text.hot.*) *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx) } diff --git a/ld/testsuite/ld-arm/fdpic-main.ld b/ld/testsuite/ld-arm/fdpic-main.ld index 4208c66..d19a589 100644 --- a/ld/testsuite/ld-arm/fdpic-main.ld +++ b/ld/testsuite/ld-arm/fdpic-main.ld @@ -77,7 +77,7 @@ SECTIONS *(.text.startup .text.startup.*) *(.text.hot .text.hot.*) *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx) } =0 diff --git a/ld/testsuite/ld-arm/fdpic-shared.ld b/ld/testsuite/ld-arm/fdpic-shared.ld index 450d6f9..b1e262d 100644 --- a/ld/testsuite/ld-arm/fdpic-shared.ld +++ b/ld/testsuite/ld-arm/fdpic-shared.ld @@ -68,7 +68,7 @@ SECTIONS *(.text.startup .text.startup.*) *(.text.hot .text.hot.*) *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.glue_7t) *(.glue_7) *(.vfp11_veneer) *(.v4_bx) } =0 diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index cf4ed42..061bcf2 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -113,7 +113,7 @@ foreach t $test_list { set ASFLAGS "$saved_ASFLAGS" # Check that the --out-implib option work correctly. -# Targets that don't use elf32.em won't support this. +# Targets that don't use elf.em won't support this. run_ld_link_tests [list \ [list "Generate empty import library" \ "--out-implib=tmpdir/implib.lib" "" \ diff --git a/ld/testsuite/ld-elf/orphan-region.d b/ld/testsuite/ld-elf/orphan-region.d index a6d4d64..1343574 100644 --- a/ld/testsuite/ld-elf/orphan-region.d +++ b/ld/testsuite/ld-elf/orphan-region.d @@ -2,7 +2,7 @@ #ld: -T orphan-region.ld -N -z stack-size=0 #readelf: -S -l --wide #xfail: [uses_genelf] hppa*64*-*-* spu-*-* *-*-nacl* -# if not using elf32.em, you don't get fancy orphan handling +# if not using elf.em, you don't get fancy orphan handling # spu twiddles LOAD range, hppa64 adds PHDR, nacl splits to two segments #... diff --git a/ld/testsuite/ld-elf/orphan.d b/ld/testsuite/ld-elf/orphan.d index cbd64fd..9219cf7 100644 --- a/ld/testsuite/ld-elf/orphan.d +++ b/ld/testsuite/ld-elf/orphan.d @@ -2,7 +2,7 @@ #ld: -T orphan.ld #readelf: -S --wide #xfail: [uses_genelf] -# if not using elf32.em, you don't get fancy orphan handling +# if not using elf.em, you don't get fancy orphan handling #... \[[ 0-9]+\] \.(text|notbad)[ \t]+PROGBITS[ \t0-9a-f]+AX?.* diff --git a/ld/testsuite/ld-elf/pr349.d b/ld/testsuite/ld-elf/pr349.d index 2864653..6de05e8 100644 --- a/ld/testsuite/ld-elf/pr349.d +++ b/ld/testsuite/ld-elf/pr349.d @@ -3,7 +3,7 @@ #ld: -r #readelf: -S #xfail: [uses_genelf] -# if not using elf32.em, you don't get fancy section handling +# if not using elf.em, you don't get fancy section handling #... .* .abcxyz .* diff --git a/ld/testsuite/ld-elf/warn2.d b/ld/testsuite/ld-elf/warn2.d index 3319fa7..005056b 100644 --- a/ld/testsuite/ld-elf/warn2.d +++ b/ld/testsuite/ld-elf/warn2.d @@ -4,7 +4,7 @@ #ld: -T group.ld #warning: ^[^\n]*\.[obj]+: warning: function 'Foo' used$ #readelf: -s -# if not using elf32.em, you don't get fancy section handling +# if not using elf.em, you don't get fancy section handling #xfail: [uses_genelf] #xfail: "sparc64-*-solaris2*" "sparcv9-*-solaris2*" diff --git a/ld/testsuite/ld-elfvsb/elf-offset.ld b/ld/testsuite/ld-elfvsb/elf-offset.ld index cd90bcc..b60861a 100644 --- a/ld/testsuite/ld-elfvsb/elf-offset.ld +++ b/ld/testsuite/ld-elfvsb/elf-offset.ld @@ -69,7 +69,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*) } diff --git a/ld/testsuite/ld-mips-elf/mips-dyn.ld b/ld/testsuite/ld-mips-elf/mips-dyn.ld index bd2802fc..c93e139 100644 --- a/ld/testsuite/ld-mips-elf/mips-dyn.ld +++ b/ld/testsuite/ld-mips-elf/mips-dyn.ld @@ -68,7 +68,7 @@ SECTIONS _ftext = . ; *(.text .stub .text.* .gnu.linkonce.t.*) KEEP (*(.text.*personality*)) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.mips16.fn.*) *(.mips16.call.*) } =0 diff --git a/ld/testsuite/ld-mips-elf/mips-lib.ld b/ld/testsuite/ld-mips-elf/mips-lib.ld index b3a2c97..76961fa 100644 --- a/ld/testsuite/ld-mips-elf/mips-lib.ld +++ b/ld/testsuite/ld-mips-elf/mips-lib.ld @@ -67,7 +67,7 @@ SECTIONS _ftext = . ; *(.text .stub .text.* .gnu.linkonce.t.*) KEEP (*(.text.*personality*)) - /* .gnu.warning sections are handled specially by elf32.em. */ + /* .gnu.warning sections are handled specially by elf.em. */ *(.gnu.warning) *(.mips16.fn.*) *(.mips16.call.*) } =0 diff --git a/ld/testsuite/ld-scripts/dynamic-sections.t b/ld/testsuite/ld-scripts/dynamic-sections.t index 64cf47d6..c63f3a8 100644 --- a/ld/testsuite/ld-scripts/dynamic-sections.t +++ b/ld/testsuite/ld-scripts/dynamic-sections.t @@ -5,7 +5,7 @@ SECTIONS .rodata : { *(.rodata) } /* The .rel* sections are typically placed here, because of the way - elf32.em handles orphaned sections. A bug introduced on 2002-06-10 + elf.em handles orphaned sections. A bug introduced on 2002-06-10 would cause . to be 0 at this point. */ _bar = ASSERT (. > 0, "Bad . value"); diff --git a/ld/testsuite/ld-shared/elf-offset.ld b/ld/testsuite/ld-shared/elf-offset.ld index ee587f9..8f1622a 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*) } |