Fix skip.exp test failure observed with gcc-9.2.0

[deliverable/binutils-gdb.git] / ld / emulparams / elf64_s390.sh

diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
index fc9f06a9f089186d318e3217481ac96eb6840236..899efd7f532b993b63dee4d896d3bf54e2bf766c 100644 (file)
--- a/ld/emulparams/elf64_s390.sh
+++ b/ld/emulparams/elf64_s390.sh
@@ -8,11 +8,15 @@ 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
 NO_SMALL_DATA=yes
+EXTRA_EM_FILE=s390
 IREL_IN_PLT=
+SEPARATE_GOTPLT=0
+test -z "$RELRO" && unset SEPARATE_GOTPLT
 
 # Treat a host that matches the target with the possible exception of "x"
 # in the name as if it were native.