Remove spurious conflict indicators.

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

diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
index 233eb98a16c39ec8abea1294cb482d0bdb0cb840..ae8f26e411e03968e0208efc57991ac96483c61d 100644 (file)
--- a/ld/emulparams/elf64_s390.sh
+++ b/ld/emulparams/elf64_s390.sh
@@ -1,15 +1,17 @@
 SCRIPT_NAME=elf
 ELFSIZE=64
 OUTPUT_FORMAT="elf64-s390"
+NO_REL_RELOCS=yes
 TEXT_START_ADDR=0x80000000
-MAXPAGESIZE=0x1000
-NONPAGED_TEXT_START_ADDR=0x80000000
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="s390:64-bit"
 MACHINE=
 NOP=0x07070707
 TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes 
 GENERATE_PIE_SCRIPT=yes
+NO_SMALL_DATA=yes
 
 # Treat a host that matches the target with the possible exception of "x"
 # in the name as if it were native.