X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=ld%2Femulparams%2Felf64_s390.sh;h=d0a2a59a0926932ce74f650cedb948f5d3774b94;hb=fa4f2d46f95a1c673b025fab7f292cb864a99020;hp=236fd1767e757ca4625bc20474972e009177ae51;hpb=f52d1d64053435bf10413c8722f8c547fcdd08ef;p=binutils-gdb.git

diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
index 236fd1767e7..d0a2a59a092 100644
--- a/ld/emulparams/elf64_s390.sh
+++ b/ld/emulparams/elf64_s390.sh
@@ -1,14 +1,23 @@
 SCRIPT_NAME=elf
 ELFSIZE=64
 OUTPUT_FORMAT="elf64-s390"
-TEXT_START_ADDR=0x80000000
-MAXPAGESIZE=0x1000
-NONPAGED_TEXT_START_ADDR=0x80000000
+NO_REL_RELOCS=yes
+TEXT_START_ADDR=0x1000000
+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="s390:64-bit"
 MACHINE=
 NOP=0x07070707
-TEMPLATE_NAME=elf32
-GENERATE_SHLIB_SCRIPT=yes 
+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
+SYMBOL_ABI_ALIGNMENT=2
 
 # Treat a host that matches the target with the possible exception of "x"
 # in the name as if it were native.
@@ -16,26 +25,17 @@ if test `echo "$host" | sed -e s/390x/390/` \
    = `echo "$target" | sed -e s/390x/390/`; then
   case " $EMULATION_LIBPATH " in
     *" ${EMULATION_NAME} "*)
-      LIB_PATH=${libdir}
-      for lib in ${NATIVE_LIB_DIRS}; do
-	case :${LIB_PATH}: in
-	  *:${lib}:*) ;;
-	  *) LIB_PATH=${LIB_PATH}:${lib} ;;
-	esac
-      done
-
-      case "$target" in
-	s390*-linux*)
-	  suffix=64 ;;
-      esac
-
-      # Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first
-      # on Linux.
-      if [ -n "$suffix" ]; then
-	case "$EMULATION_NAME" in
-	  *64*)
-	    LIB_PATH=`echo ${LIB_PATH}: | sed -e s,:,$suffix:,g`$LIB_PATH ;;
-	esac
-      fi ;;
+      NATIVE=yes
   esac
 fi
+
+# Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first
+# on Linux.
+case "$target" in
+  s390*-linux*)
+    case "$EMULATION_NAME" in
+      *64*)
+	LIBPATH_SUFFIX=64 ;;
+    esac
+    ;;
+esac