Fix i386-lynxos and other runtime linker fails

Segfaults due to htab->params being NULL.

	* 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/ChangeLog b/ld/ChangeLog
index 88044d199039bc2bd185b881aef072559a366a87..b1e7b0420d60577bf3087a9bc2ab3dba7f995618 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-08  Alan Modra  <amodra@gmail.com>
+
+       * emulparams/elf64rdos.sh (EXTRA_EM_FILE): Define.
+       * emulparams/i386lynx.sh (EXTRA_EM_FILE): Define.
+       * emulparams/i386nto.sh (EXTRA_EM_FILE): Define.
+
 2019-04-06  H.J. Lu  <hongjiu.lu@intel.com>
 
        * Makefile.am (ELF_X86_DEPS): Add $(srcdir)/emultempl/elf-x86.em.

diff --git a/ld/emulparams/elf64rdos.sh b/ld/emulparams/elf64rdos.sh
index 021bc7046890e7bb8cc2cf09d061940feb7abc1f..87164d573aac7d3b4ef3375e856d20c6d3cdbc46 100644 (file)
--- 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 93afb3d7f37b50f629274550b48883825fc7160d..b86967bd4691e0020004a010fe58ffeb27980e69 100644 (file)
--- 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 bb685f3a015b7695f396abf3687fa00a288b9768..ab5f84c8bdb884ce6889379e4e9155b3633c855f 100644 (file)
--- 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