S/390: Move start of 64 bit binaries from 2GB to 256MB.

ld/ChangeLog:

2016-09-23  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* emulparams/elf64_s390.sh: Change TEXT_START_ADDR to 256MB.
	* testsuite/ld-s390/tlsbin_64.dd: Adjust testcase accordingly.
	* testsuite/ld-s390/tlsbin_64.rd: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 096611618931c2d35ef8455efdde6fa69496bdbf..ee43d4048420a98c3e1da90802e01d2010986a27 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-23  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * emulparams/elf64_s390.sh: Change TEXT_START_ADDR to 256MB.
+       * testsuite/ld-s390/tlsbin_64.dd: Adjust testcase accordingly.
+       * testsuite/ld-s390/tlsbin_64.rd: Likewise.
+
 2016-09-22  Nick Clifton  <nickc@redhat.com>
 
        * emultempl/elf32.em (_try_needed): In verbose mode, report failed

diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh
index 98db3d3bc61b2cb00cc4fa66848d9912fa060127..3fcbbcacf49106e52e3b0bff4ff92d9062ca3b2e 100644 (file)
--- a/ld/emulparams/elf64_s390.sh
+++ b/ld/emulparams/elf64_s390.sh
@@ -2,7 +2,7 @@ SCRIPT_NAME=elf
 ELFSIZE=64
 OUTPUT_FORMAT="elf64-s390"
 NO_REL_RELOCS=yes
-TEXT_START_ADDR=0x80000000
+TEXT_START_ADDR=0x10000000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH="s390:64-bit"

diff --git a/ld/testsuite/ld-s390/tlsbin_64.dd b/ld/testsuite/ld-s390/tlsbin_64.dd
index c5c3ba077ab37068c5ecb12761ed3a5246eaeabf..66e4d112b188fdd3517f6b0d80bd3341c419b73c 100644 (file)
--- a/ld/testsuite/ld-s390/tlsbin_64.dd
+++ b/ld/testsuite/ld-s390/tlsbin_64.dd
@@ -177,7 +177,8 @@ Disassembly of section .text:
  +[0-9a-f]+:   a7 d5 00 16             bras    %r13,[0-9a-f]+ <_start\+0x30>
 # sG6@indntpoff
  +[0-9a-f]+:   00 00 00 00             .long   0x00000000
- +[0-9a-f]+:   80 00 [0-9a-f ]+        ssm     [0-9]+\(%r1\)
+ +[0-9a-f]+:   10 00                   lpr     %r0,%r0
+ +[0-9a-f]+:   [0-9a-f ]+              lr      %r9,%r8
 # bg6@indntpoff
  +[0-9a-f]+:   ff ff ff ff             .long   0xffffffff
  +[0-9a-f]+:   ff ff ff d4             .long   0xffffffd4

diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
index f7caa167d053f7efd5ce4f8de1ecdeb05831f30f..4aee7ecddc1e9011235b0ce9d20fccbcd2605e4e 100644 (file)
--- a/ld/testsuite/ld-s390/tlsbin_64.rd
+++ b/ld/testsuite/ld-s390/tlsbin_64.rd
@@ -34,8 +34,8 @@ There are [0-9]+ program headers, starting at offset [0-9]+
 
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR +0x0+40 0x0+80000040 0x0+80000040 0x0+150 0x0+150 R E 0x8
- +INTERP +0x0+190 0x0+80000190 0x0+80000190 0x0+f 0x0+f R +0x1
+ +PHDR +0x0+40 0x0+10000040 0x0+10000040 0x0+150 0x0+150 R E 0x8
+ +INTERP +0x0+190 0x0+10000190 0x0+10000190 0x0+f 0x0+f R +0x1
 .*Requesting program interpreter.*
  +LOAD .* R E 0x1000
  +LOAD .* RW +0x1000