[PATCH] x86: Move x86-specific linker options to elf_linker_x86_params

Alan Modra amodra@gmail.com
Mon Apr 8 04:45:00 GMT 2019


On Fri, Apr 05, 2019 at 09:40:01PM -0700, H.J. Lu wrote:
> Remove x86-specific linker options from bfd_link_info and put them in
> elf_linker_x86_params.  Add _bfd_elf_linker_x86_set_options to pass
> x86-specific linker options from ld to bfd.

Nice, but a few more places need EXTRA_EM_FILE in order to set
htab->params.  Applied.

	* emulparams/elf64rdos.sh (EXTRA_EM_FILE): Define.
	* emulparams/i386lynx.sh (EXTRA_EM_FILE): Define.
	* emulparams/i386nto.sh (EXTRA_EM_FILE): Define.

diff --git a/ld/emulparams/elf64rdos.sh b/ld/emulparams/elf64rdos.sh
index 021bc70468..87164d573a 100644
--- a/ld/emulparams/elf64rdos.sh
+++ b/ld/emulparams/elf64rdos.sh
@@ -10,6 +10,7 @@ LARGE_DATA_ADDR=0x80020000000
 ARCH="i386:x86-64"
 MACHINE=
 TEMPLATE_NAME=elf32
+EXTRA_EM_FILE="elf-x86"
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
 LARGE_SECTIONS=yes
diff --git a/ld/emulparams/i386lynx.sh b/ld/emulparams/i386lynx.sh
index 93afb3d7f3..b86967bd46 100644
--- a/ld/emulparams/i386lynx.sh
+++ b/ld/emulparams/i386lynx.sh
@@ -13,6 +13,7 @@ ARCH=i386
 MACHINE=
 NOP=0x9090
 TEMPLATE_NAME=elf32
+EXTRA_EM_FILE="elf-x86"
 GENERATE_SHLIB_SCRIPT=yes
 ELF_INTERPRETER_NAME=\"/usr/lib/ld.so.1\"
 
diff --git a/ld/emulparams/i386nto.sh b/ld/emulparams/i386nto.sh
index bb685f3a01..ab5f84c8bd 100644
--- a/ld/emulparams/i386nto.sh
+++ b/ld/emulparams/i386nto.sh
@@ -8,4 +8,5 @@ ARCH=i386
 MACHINE=
 NOP=0x9090
 TEMPLATE_NAME=elf32
+EXTRA_EM_FILE="elf-x86"
 GENERATE_SHLIB_SCRIPT=yes


-- 
Alan Modra
Australia Development Lab, IBM



More information about the Binutils mailing list