* ld-cris/expdyn1.d, ld-cris/expdyn5.d, ld-cris/expdyn6.d,

	ld-cris/expdyn7.d, ld-cris/gotplt1.d, ld-cris/gotplt2.d,
	ld-cris/gotplt3.d, ld-cris/hiddef1.d, ld-cris/libdso-2.d,
	ld-cris/locref1.d, ld-cris/locref2.d, ld-cris/weakref2.d,
	ld-i386/tlsbin.rd, ld-i386/tlsnopic.rd, ld-i386/tlspic.rd,
	ld-ia64/tlsbin.dd, ld-ia64/tlsbin.rd, ld-ia64/tlspic.dd,
	ld-ia64/tlspic.rd, ld-powerpc/tlsexe32.d, ld-powerpc/tlsexe32.g,
	ld-powerpc/tlsexe32.r, ld-powerpc/tlsexe32.t,
	ld-powerpc/tlsso32.d, ld-powerpc/tlsso32.g, ld-powerpc/tlsso32.r,
	ld-powerpc/tlsso32.t, ld-s390/tlsbin.dd, ld-s390/tlsbin.rd,
	ld-s390/tlspic.rd, ld-sparc/tlssunbin32.rd,
	ld-sparc/tlssunpic32.rd, ld-x86-64/tlsbin.rd, ld-x86-64/tlspic.dd,
	ld-x86-64/tlspic.rd: Adjust for _GLOBAL_OFFSET_TABLE_ now hidden.

8 files changed, 158 insertions, 159 deletions

diff --git a/ld/testsuite/ld-powerpc/tlsexe32.d b/ld/testsuite/ld-powerpc/tlsexe32.d
index c2cf43f..b9e8b2e 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.d
+++ b/ld/testsuite/ld-powerpc/tlsexe32.d
@@ -8,38 +8,39 @@
 
 Disassembly of section \.text:
 
-0180028c <_start>:
- 180028c:	80 7f 00 0c 	lwz     r3,12\(r31\)
- 1800290:	7c 63 12 14 	add     r3,r3,r2
- 1800294:	38 7f 00 10 	addi    r3,r31,16
- 1800298:	48 01 01 85 	bl      181041c .*
- 180029c:	3c 62 00 00 	addis   r3,r2,0
- 18002a0:	38 63 90 1c 	addi    r3,r3,-28644
+01800264 <_start>:
+ 1800264:	80 7f 00 0c 	lwz     r3,12\(r31\)
+ 1800268:	7c 63 12 14 	add     r3,r3,r2
+ 180026c:	38 7f 00 10 	addi    r3,r31,16
+ 1800270:	48 01 01 85 	bl      18103f4 .*
+ 1800274:	3c 62 00 00 	addis   r3,r2,0
+ 1800278:	38 63 90 1c 	addi    r3,r3,-28644
+ 180027c:	3c 62 00 00 	addis   r3,r2,0
+ 1800280:	38 63 10 00 	addi    r3,r3,4096
+ 1800284:	39 23 80 20 	addi    r9,r3,-32736
+ 1800288:	3d 23 00 00 	addis   r9,r3,0
+ 180028c:	81 49 80 24 	lwz     r10,-32732\(r9\)
+ 1800290:	3d 22 00 00 	addis   r9,r2,0
+ 1800294:	a1 49 90 2c 	lhz     r10,-28628\(r9\)
+ 1800298:	89 42 90 30 	lbz     r10,-28624\(r2\)
+ 180029c:	3d 22 00 00 	addis   r9,r2,0
+ 18002a0:	99 49 90 34 	stb     r10,-28620\(r9\)
  18002a4:	3c 62 00 00 	addis   r3,r2,0
- 18002a8:	38 63 10 00 	addi    r3,r3,4096
- 18002ac:	39 23 80 20 	addi    r9,r3,-32736
- 18002b0:	3d 23 00 00 	addis   r9,r3,0
- 18002b4:	81 49 80 24 	lwz     r10,-32732\(r9\)
- 18002b8:	3d 22 00 00 	addis   r9,r2,0
- 18002bc:	a1 49 90 2c 	lhz     r10,-28628\(r9\)
- 18002c0:	89 42 90 30 	lbz     r10,-28624\(r2\)
- 18002c4:	3d 22 00 00 	addis   r9,r2,0
- 18002c8:	99 49 90 34 	stb     r10,-28620\(r9\)
- 18002cc:	3c 62 00 00 	addis   r3,r2,0
- 18002d0:	38 63 90 00 	addi    r3,r3,-28672
- 18002d4:	3c 62 00 00 	addis   r3,r2,0
- 18002d8:	38 63 10 00 	addi    r3,r3,4096
- 18002dc:	91 43 80 04 	stw     r10,-32764\(r3\)
- 18002e0:	3d 23 00 00 	addis   r9,r3,0
- 18002e4:	91 49 80 08 	stw     r10,-32760\(r9\)
- 18002e8:	3d 22 00 00 	addis   r9,r2,0
- 18002ec:	b1 49 90 2c 	sth     r10,-28628\(r9\)
- 18002f0:	a1 42 90 14 	lhz     r10,-28652\(r2\)
- 18002f4:	3d 22 00 00 	addis   r9,r2,0
- 18002f8:	a9 49 90 18 	lha     r10,-28648\(r9\)
+ 18002a8:	38 63 90 00 	addi    r3,r3,-28672
+ 18002ac:	3c 62 00 00 	addis   r3,r2,0
+ 18002b0:	38 63 10 00 	addi    r3,r3,4096
+ 18002b4:	91 43 80 04 	stw     r10,-32764\(r3\)
+ 18002b8:	3d 23 00 00 	addis   r9,r3,0
+ 18002bc:	91 49 80 08 	stw     r10,-32760\(r9\)
+ 18002c0:	3d 22 00 00 	addis   r9,r2,0
+ 18002c4:	b1 49 90 2c 	sth     r10,-28628\(r9\)
+ 18002c8:	a1 42 90 14 	lhz     r10,-28652\(r2\)
+ 18002cc:	3d 22 00 00 	addis   r9,r2,0
+ 18002d0:	a9 49 90 18 	lha     r10,-28648\(r9\)
 Disassembly of section \.got:
 
-018103b8 <\.got>:
- 18103b8:	4e 80 00 21 	blrl
- 18103bc:	01 81 03 18 	\.long 0x1810318
+01810390 <_GLOBAL_OFFSET_TABLE_-0x4>:
+ 1810390:	4e 80 00 21 	blrl
+01810394 <_GLOBAL_OFFSET_TABLE_>:
+ 1810394:	01 81 02 f0 00 00 00 00 00 00 00 00 00 00 00 00     .*
 	\.\.\.
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.g b/ld/testsuite/ld-powerpc/tlsexe32.g
index c7ffff3..e30d60f 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.g
+++ b/ld/testsuite/ld-powerpc/tlsexe32.g
@@ -7,5 +7,5 @@
 .*: +file format elf32-powerpc
 
 Contents of section \.got:
- 18103b8 4e800021 01810318 00000000 00000000  .*
- 18103c8 00000000 00000000 00000000           .*
+ 1810390 4e800021 018102f0 00000000 00000000  .*
+ 18103a0 00000000 00000000 00000000           .*
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
index 7a9da4d..1b8bf68 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.r
+++ b/ld/testsuite/ld-powerpc/tlsexe32.r
@@ -16,15 +16,15 @@ Section Headers:
  +\[ 4\] \.dynstr +.*
  +\[ 5\] \.rela\.dyn +.*
  +\[ 6\] \.rela\.plt +.*
- +\[ 7\] \.text +PROGBITS +0180028c 00028c 000070 00 +AX +0 +0 +1
+ +\[ 7\] \.text +PROGBITS +01800264 000264 000070 00 +AX +0 +0 +1
  +\[ 8\] \.sdata2 +PROGBITS +.*
- +\[ 9\] \.tdata +PROGBITS +018102fc 0002fc 00001c 00 WAT +0 +0 +4
- +\[10\] \.tbss +NOBITS +01810318 000318 00001c 00 WAT +0 +0 +4
- +\[11\] \.dynamic +DYNAMIC +01810318 000318 0000a0 08 +WA +4 +0 +4
- +\[12\] \.data +PROGBITS +018103b8 0003b8 000000 00 +WA +0 +0 +1
- +\[13\] \.got +PROGBITS +018103b8 0003b8 00001c 04 WAX +0 +0 +4
- +\[14\] \.sdata +PROGBITS +018103d4 0003d4 000000 00 +WA +0 +0 +4
- +\[15\] \.sbss +NOBITS +018103d4 0003d4 000000 00 +WA +0 +0 +1
+ +\[ 9\] \.tdata +PROGBITS +018102d4 0002d4 00001c 00 WAT +0 +0 +4
+ +\[10\] \.tbss +NOBITS +018102f0 0002f0 00001c 00 WAT +0 +0 +4
+ +\[11\] \.dynamic +DYNAMIC +018102f0 0002f0 0000a0 08 +WA +4 +0 +4
+ +\[12\] \.data +PROGBITS +01810390 000390 000000 00 +WA +0 +0 +1
+ +\[13\] \.got +PROGBITS +01810390 000390 00001c 04 WAX +0 +0 +4
+ +\[14\] \.sdata +PROGBITS +018103ac 0003ac 000000 00 +WA +0 +0 +4
+ +\[15\] \.sbss +NOBITS +018103ac 0003ac 000000 00 +WA +0 +0 +1
  +\[16\] \.plt +NOBITS +.*
  +\[17\] \.bss +NOBITS +.*
  +\[18\] \.shstrtab +STRTAB +.*
@@ -33,7 +33,7 @@ Section Headers:
 #...
 
 Elf file type is EXEC \(Executable file\)
-Entry point 0x180028c
+Entry point 0x1800264
 There are 6 program headers, starting at offset 52
 
 Program Headers:
@@ -41,10 +41,10 @@ Program Headers:
  +PHDR +0x000034 0x01800034 0x01800034 0x000e0 0x000e0 R E 0x4
  +INTERP +0x000114 0x01800114 0x01800114 0x00011 0x00011 R +0x1
  +\[Requesting program interpreter: .*\]
- +LOAD +0x000000 0x01800000 0x01800000 0x002fc 0x002fc R E 0x10000
- +LOAD +0x0002fc 0x018102fc 0x018102fc 0x000d8 0x0012c RWE 0x10000
- +DYNAMIC +0x000318 0x01810318 0x01810318 0x000a0 0x000a0 RW +0x4
- +TLS +0x0002fc 0x018102fc 0x018102fc 0x0001c 0x00038 R +0x4
+ +LOAD +0x000000 0x01800000 0x01800000 0x002d4 0x002d4 R E 0x10000
+ +LOAD +0x0002d4 0x018102d4 0x018102d4 0x000d8 0x0012c RWE 0x10000
+ +DYNAMIC +0x0002f0 0x018102f0 0x018102f0 0x000a0 0x000a0 RW +0x4
+ +TLS +0x0002d4 0x018102d4 0x018102d4 0x0001c 0x00038 R +0x4
 
  Section to Segment mapping:
  +Segment Sections\.\.\.
@@ -55,27 +55,26 @@ Program Headers:
  +04 +\.dynamic 
  +05 +\.tdata \.tbss 
 
-Relocation section '\.rela\.dyn' at offset 0x268 contains 2 entries:
+Relocation section '\.rela\.dyn' at offset 0x240 contains 2 entries:
  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-018103c8 +00000249 R_PPC_TPREL32 +00000000 +gd \+ 0
-018103cc +00000444 R_PPC_DTPMOD32 +00000000 +ld \+ 0
+018103a0 +00000249 R_PPC_TPREL32 +00000000 +gd \+ 0
+018103a4 +00000444 R_PPC_DTPMOD32 +00000000 +ld \+ 0
 
-Relocation section '\.rela\.plt' at offset 0x280 contains 1 entries:
+Relocation section '\.rela\.plt' at offset 0x258 contains 1 entries:
  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-0181041c +00000315 R_PPC_JMP_SLOT +0181041c +__tls_get_addr \+ 0
+018103f4 +00000315 R_PPC_JMP_SLOT +018103f4 +__tls_get_addr \+ 0
 
-Symbol table '\.dynsym' contains 10 entries:
+Symbol table '\.dynsym' contains 9 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 00000000 +0 NOTYPE +LOCAL +DEFAULT +UND 
- +1: 01810318 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +1: 018102f0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +2: 00000000 +0 TLS +GLOBAL DEFAULT +UND gd
- +3: 0181041c +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +3: 018103f4 +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
  +4: 00000000 +0 TLS +GLOBAL DEFAULT +UND ld
- +5: 01810428 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +6: 018103d4 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +7: 018103d4 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +8: 018103bc +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +9: 01810428 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +5: 01810400 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
+ +6: 018103ac +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +7: 018103ac +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +8: 01810400 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
 
 Symbol table '\.symtab' contains 47 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
@@ -86,15 +85,15 @@ Symbol table '\.symtab' contains 47 entries:
  +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 
  +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 
  +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 
- +7: 0180028c +0 SECTION LOCAL +DEFAULT +7 
+ +7: 01800264 +0 SECTION LOCAL +DEFAULT +7 
  +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 
- +9: 018102fc +0 SECTION LOCAL +DEFAULT +9 
- +10: 01810318 +0 SECTION LOCAL +DEFAULT +10 
- +11: 01810318 +0 SECTION LOCAL +DEFAULT +11 
- +12: 018103b8 +0 SECTION LOCAL +DEFAULT +12 
- +13: 018103b8 +0 SECTION LOCAL +DEFAULT +13 
- +14: 018103d4 +0 SECTION LOCAL +DEFAULT +14 
- +15: 018103d4 +0 SECTION LOCAL +DEFAULT +15 
+ +9: 018102d4 +0 SECTION LOCAL +DEFAULT +9 
+ +10: 018102f0 +0 SECTION LOCAL +DEFAULT +10 
+ +11: 018102f0 +0 SECTION LOCAL +DEFAULT +11 
+ +12: 01810390 +0 SECTION LOCAL +DEFAULT +12 
+ +13: 01810390 +0 SECTION LOCAL +DEFAULT +13 
+ +14: 018103ac +0 SECTION LOCAL +DEFAULT +14 
+ +15: 018103ac +0 SECTION LOCAL +DEFAULT +15 
  +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 
  +17: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 
  +18: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18 
@@ -107,7 +106,7 @@ Symbol table '\.symtab' contains 47 entries:
  +25: 00000010 +0 TLS +LOCAL +DEFAULT +9 ie4
  +26: 00000014 +0 TLS +LOCAL +DEFAULT +9 le4
  +27: 00000018 +0 TLS +LOCAL +DEFAULT +9 le5
- +28: 01810318 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +28: 018102f0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +29: 00000000 +0 TLS +GLOBAL DEFAULT +UND gd
  +30: 00000030 +0 TLS +GLOBAL DEFAULT +10 le0
  +31: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
@@ -121,7 +120,7 @@ Symbol table '\.symtab' contains 47 entries:
  +39: 00000024 +0 TLS +GLOBAL DEFAULT +10 ld1
  +40: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
  +41: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +42: 018103bc +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +42: 01810394 +0 OBJECT +GLOBAL +HIDDEN +13 _GLOBAL_OFFSET_TABLE_
  +43: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
  +44: 0000001c +0 TLS +GLOBAL DEFAULT +10 gd0
  +45: 0000002c +0 TLS +GLOBAL DEFAULT +10 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.t b/ld/testsuite/ld-powerpc/tlsexe32.t
index f05aaf3..0e1d726 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.t
+++ b/ld/testsuite/ld-powerpc/tlsexe32.t
@@ -7,5 +7,5 @@
 .*: +file format elf32-powerpc
 
 Contents of section \.tdata:
- 18102fc 12345678 23456789 3456789a 456789ab  .*
- 181030c 56789abc 6789abcd 789abcde           .*
+ 18102d4 12345678 23456789 3456789a 456789ab  .*
+ 18102e4 56789abc 6789abcd 789abcde           .*
diff --git a/ld/testsuite/ld-powerpc/tlsso32.d b/ld/testsuite/ld-powerpc/tlsso32.d
index 5e23c28..02e5d08 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.d
+++ b/ld/testsuite/ld-powerpc/tlsso32.d
@@ -8,38 +8,38 @@
 
 Disassembly of section \.text:
 
-0+498 <_start>:
- 498:	38 7f 00 1c 	addi    r3,r31,28
- 49c:	48 00 00 01 	bl      49c .*
- 4a0:	38 7f 00 0c 	addi    r3,r31,12
- 4a4:	48 00 00 01 	bl      4a4 .*
- 4a8:	38 7f 00 24 	addi    r3,r31,36
- 4ac:	48 01 01 95 	bl      10640 .*
- 4b0:	38 7f 00 0c 	addi    r3,r31,12
- 4b4:	48 01 01 8d 	bl      10640 .*
- 4b8:	39 23 80 20 	addi    r9,r3,-32736
- 4bc:	3d 23 00 00 	addis   r9,r3,0
- 4c0:	81 49 80 24 	lwz     r10,-32732\(r9\)
- 4c4:	81 3f 00 2c 	lwz     r9,44\(r31\)
- 4c8:	7d 49 12 2e 	lhzx    r10,r9,r2
- 4cc:	89 42 00 00 	lbz     r10,0\(r2\)
- 4d0:	3d 22 00 00 	addis   r9,r2,0
- 4d4:	99 49 00 00 	stb     r10,0\(r9\)
- 4d8:	38 7e 00 14 	addi    r3,r30,20
- 4dc:	48 00 00 01 	bl      4dc .*
- 4e0:	38 7e 00 0c 	addi    r3,r30,12
- 4e4:	48 00 00 01 	bl      4e4 .*
- 4e8:	91 43 80 04 	stw     r10,-32764\(r3\)
- 4ec:	3d 23 00 00 	addis   r9,r3,0
- 4f0:	91 49 80 08 	stw     r10,-32760\(r9\)
- 4f4:	81 3e 00 2c 	lwz     r9,44\(r30\)
- 4f8:	7d 49 13 2e 	sthx    r10,r9,r2
- 4fc:	a1 42 00 00 	lhz     r10,0\(r2\)
- 500:	3d 22 00 00 	addis   r9,r2,0
- 504:	a9 49 00 00 	lha     r10,0\(r9\)
+0+46c <_start>:
+ 46c:	38 7f 00 1c 	addi    r3,r31,28
+ 470:	48 00 00 01 	bl      470 .*
+ 474:	38 7f 00 0c 	addi    r3,r31,12
+ 478:	48 00 00 01 	bl      478 .*
+ 47c:	38 7f 00 24 	addi    r3,r31,36
+ 480:	48 01 01 95 	bl      10614 .*
+ 484:	38 7f 00 0c 	addi    r3,r31,12
+ 488:	48 01 01 8d 	bl      10614 .*
+ 48c:	39 23 80 20 	addi    r9,r3,-32736
+ 490:	3d 23 00 00 	addis   r9,r3,0
+ 494:	81 49 80 24 	lwz     r10,-32732\(r9\)
+ 498:	81 3f 00 2c 	lwz     r9,44\(r31\)
+ 49c:	7d 49 12 2e 	lhzx    r10,r9,r2
+ 4a0:	89 42 00 00 	lbz     r10,0\(r2\)
+ 4a4:	3d 22 00 00 	addis   r9,r2,0
+ 4a8:	99 49 00 00 	stb     r10,0\(r9\)
+ 4ac:	38 7e 00 14 	addi    r3,r30,20
+ 4b0:	48 00 00 01 	bl      4b0 .*
+ 4b4:	38 7e 00 0c 	addi    r3,r30,12
+ 4b8:	48 00 00 01 	bl      4b8 .*
+ 4bc:	91 43 80 04 	stw     r10,-32764\(r3\)
+ 4c0:	3d 23 00 00 	addis   r9,r3,0
+ 4c4:	91 49 80 08 	stw     r10,-32760\(r9\)
+ 4c8:	81 3e 00 2c 	lwz     r9,44\(r30\)
+ 4cc:	7d 49 13 2e 	sthx    r10,r9,r2
+ 4d0:	a1 42 00 00 	lhz     r10,0\(r2\)
+ 4d4:	3d 22 00 00 	addis   r9,r2,0
+ 4d8:	a9 49 00 00 	lha     r10,0\(r9\)
 Disassembly of section \.got:
 
-000105c4 <\.got>:
-   105c4:	4e 80 00 21 	blrl
-   105c8:	00 01 05 24 	\.long 0x10524
+00010598 <\.got>:
+   10598:	4e 80 00 21 	blrl
+   1059c:	00 01 04 f8 	\.long 0x104f8
 	\.\.\.
diff --git a/ld/testsuite/ld-powerpc/tlsso32.g b/ld/testsuite/ld-powerpc/tlsso32.g
index 7e1a294..9639d4f 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.g
+++ b/ld/testsuite/ld-powerpc/tlsso32.g
@@ -7,7 +7,7 @@
 .*: +file format elf32-powerpc
 
 Contents of section \.got:
- 105c4 4e800021 00010524 00000000 00000000  .*
- 105d4 00000000 00000000 00000000 00000000  .*
- 105e4 00000000 00000000 00000000 00000000  .*
- 105f4 00000000                             .*
+ 10598 4e800021 000104f8 00000000 00000000  .*
+ 105a8 00000000 00000000 00000000 00000000  .*
+ 105b8 00000000 00000000 00000000 00000000  .*
+ 105c8 00000000                             .*
diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
index 4ca2fcf..e2b3543 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.r
+++ b/ld/testsuite/ld-powerpc/tlsso32.r
@@ -14,12 +14,12 @@ Section Headers:
  +\[ 3\] \.dynstr +.*
  +\[ 4\] \.rela\.dyn +.*
  +\[ 5\] \.rela\.plt +.*
- +\[ 6\] \.text +PROGBITS +0+498 0+498 0+70 0+ +AX +0 +0 +1
- +\[ 7\] \.tdata +PROGBITS +0+10508 0+508 0+1c 0+ WAT +0 +0 +4
- +\[ 8\] \.tbss +NOBITS +0+10524 0+524 0+1c 0+ WAT +0 +0 +4
- +\[ 9\] \.dynamic +DYNAMIC +0+10524 0+524 0+a0 08 +WA +3 +0 +4
- +\[10\] \.data +PROGBITS +0+105c4 0+5c4 0+ 0+ +WA +0 +0 +1
- +\[11\] \.got +PROGBITS +0+105c4 0+5c4 0+34 04 WAX +0 +0 +4
+ +\[ 6\] \.text +PROGBITS +0+46c 0+46c 0+70 0+ +AX +0 +0 +1
+ +\[ 7\] \.tdata +PROGBITS +0+104dc 0+4dc 0+1c 0+ WAT +0 +0 +4
+ +\[ 8\] \.tbss +NOBITS +0+104f8 0+4f8 0+1c 0+ WAT +0 +0 +4
+ +\[ 9\] \.dynamic +DYNAMIC +0+104f8 0+4f8 0+a0 08 +WA +3 +0 +4
+ +\[10\] \.data +PROGBITS +0+10598 0+598 0+ 0+ +WA +0 +0 +1
+ +\[11\] \.got +PROGBITS +0+10598 0+598 0+34 04 WAX +0 +0 +4
  +\[12\] \.sdata2 +.*
  +\[13\] \.sdata +.*
  +\[14\] \.sbss +.*
@@ -36,10 +36,10 @@ There are 4 program headers.*
 
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+508 0x0+508 R E 0x10000
- +LOAD +0x0+508 0x0+10508 0x0+10508 0x0+f0 0x0+144 RWE 0x10000
- +DYNAMIC +0x0+524 0x0+10524 0x0+10524 0x0+a0 0x0+a0 RW +0x4
- +TLS +0x0+508 0x0+10508 0x0+10508 0x0+1c 0x0+38 R +0x4
+ +LOAD +0x0+ 0x0+ 0x0+ 0x0+4dc 0x0+4dc R E 0x10000
+ +LOAD +0x0+4dc 0x0+104dc 0x0+104dc 0x0+f0 0x0+144 RWE 0x10000
+ +DYNAMIC +0x0+4f8 0x0+104f8 0x0+104f8 0x0+a0 0x0+a0 RW +0x4
+ +TLS +0x0+4dc 0x0+104dc 0x0+104dc 0x0+1c 0x0+38 R +0x4
 
  Section to Segment mapping:
  +Segment Sections\.\.\.
@@ -50,41 +50,41 @@ Program Headers:
 
 Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 18 entries:
  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-0+49c +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
-0+4a4 +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
-0+4dc +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
-0+4e4 +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
-0+4ce +0+b45 R_PPC_TPREL16 +0+30 +le0 \+ 0
-0+4d2 +0+e48 R_PPC_TPREL16_HA +0+34 +le1 \+ 0
-0+4d6 +0+e46 R_PPC_TPREL16_LO +0+34 +le1 \+ 0
-0+4fe +0+245 R_PPC_TPREL16 +0+10508 +\.tdata \+ 1051c
-0+502 +0+248 R_PPC_TPREL16_HA +0+10508 +\.tdata \+ 10520
-0+506 +0+246 R_PPC_TPREL16_LO +0+10508 +\.tdata \+ 10520
-0+105d4 +0+44 R_PPC_DTPMOD32 +0+
-0+105dc +0+44 R_PPC_DTPMOD32 +0+
-0+105e0 +0+4e R_PPC_DTPREL32 +0+
-0+105e4 +0+a44 R_PPC_DTPMOD32 +0+ +gd \+ 0
-0+105e8 +0+a4e R_PPC_DTPREL32 +0+ +gd \+ 0
-0+105ec +0+1944 R_PPC_DTPMOD32 +0+1c +gd0 \+ 0
-0+105f0 +0+194e R_PPC_DTPREL32 +0+1c +gd0 \+ 0
-0+105f4 +0+1a49 R_PPC_TPREL32 +0+2c +ie0 \+ 0
+0+470 +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
+0+478 +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
+0+4b0 +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
+0+4b8 +0+c0a R_PPC_REL24 +0+ +__tls_get_addr \+ 0
+0+4a2 +0+b45 R_PPC_TPREL16 +0+30 +le0 \+ 0
+0+4a6 +0+e48 R_PPC_TPREL16_HA +0+34 +le1 \+ 0
+0+4aa +0+e46 R_PPC_TPREL16_LO +0+34 +le1 \+ 0
+0+4d2 +0+245 R_PPC_TPREL16 +0+104dc +\.tdata \+ 104f0
+0+4d6 +0+248 R_PPC_TPREL16_HA +0+104dc +\.tdata \+ 104f4
+0+4da +0+246 R_PPC_TPREL16_LO +0+104dc +\.tdata \+ 104f4
+0+105a8 +0+44 R_PPC_DTPMOD32 +0+
+0+105b0 +0+44 R_PPC_DTPMOD32 +0+
+0+105b4 +0+4e R_PPC_DTPREL32 +0+
+0+105b8 +0+a44 R_PPC_DTPMOD32 +0+ +gd \+ 0
+0+105bc +0+a4e R_PPC_DTPREL32 +0+ +gd \+ 0
+0+105c0 +0+1844 R_PPC_DTPMOD32 +0+1c +gd0 \+ 0
+0+105c4 +0+184e R_PPC_DTPREL32 +0+1c +gd0 \+ 0
+0+105c8 +0+1949 R_PPC_TPREL32 +0+2c +ie0 \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym\. Value +Symbol's Name \+ Addend
-0+10640 +0+c15 R_PPC_JMP_SLOT +0+ +__tls_get_addr \+ 0
+0+10614 +0+c15 R_PPC_JMP_SLOT +0+ +__tls_get_addr \+ 0
 
-Symbol table '\.dynsym' contains 28 entries:
+Symbol table '\.dynsym' contains 27 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
- +[0-9]+: 0+498 +0 SECTION LOCAL +DEFAULT +6 
- +[0-9]+: 0+10508 +0 SECTION LOCAL +DEFAULT +7 
- +[0-9]+: 0+10524 +0 SECTION LOCAL +DEFAULT +8 
- +[0-9]+: 0+105c4 +0 SECTION LOCAL +DEFAULT +10 
- +[0-9]+: 0+105f8 +0 SECTION LOCAL +DEFAULT +12 
- +[0-9]+: 0+105f8 +0 SECTION LOCAL +DEFAULT +13 
- +[0-9]+: 0+105f8 +0 SECTION LOCAL +DEFAULT +14 
- +[0-9]+: 0+1064c +0 SECTION LOCAL +DEFAULT +16 
- +[0-9]+: 0+10524 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+46c +0 SECTION LOCAL +DEFAULT +6 
+ +[0-9]+: 0+104dc +0 SECTION LOCAL +DEFAULT +7 
+ +[0-9]+: 0+104f8 +0 SECTION LOCAL +DEFAULT +8 
+ +[0-9]+: 0+10598 +0 SECTION LOCAL +DEFAULT +10 
+ +[0-9]+: 0+105cc +0 SECTION LOCAL +DEFAULT +12 
+ +[0-9]+: 0+105cc +0 SECTION LOCAL +DEFAULT +13 
+ +[0-9]+: 0+105cc +0 SECTION LOCAL +DEFAULT +14 
+ +[0-9]+: 0+10620 +0 SECTION LOCAL +DEFAULT +16 
+ +[0-9]+: 0+104f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
  +[0-9]+: 0+30 +0 TLS +GLOBAL DEFAULT +8 le0
  +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
@@ -98,7 +98,6 @@ Symbol table '\.dynsym' contains 28 entries:
  +[0-9]+: 0+24 +0 TLS +GLOBAL DEFAULT +8 ld1
  +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
  +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: 0+105c8 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
  +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
  +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 gd0
  +[0-9]+: 0+2c +0 TLS +GLOBAL DEFAULT +8 ie0
@@ -112,17 +111,17 @@ Symbol table '\.symtab' contains 46 entries:
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 
- +[0-9]+: 0+498 +0 SECTION LOCAL +DEFAULT +6 
- +[0-9]+: 0+10508 +0 SECTION LOCAL +DEFAULT +7 
- +[0-9]+: 0+10524 +0 SECTION LOCAL +DEFAULT +8 
+ +[0-9]+: 0+46c +0 SECTION LOCAL +DEFAULT +6 
+ +[0-9]+: 0+104dc +0 SECTION LOCAL +DEFAULT +7 
+ +[0-9]+: 0+104f8 +0 SECTION LOCAL +DEFAULT +8 
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 
- +[0-9]+: 0+105c4 +0 SECTION LOCAL +DEFAULT +10 
+ +[0-9]+: 0+10598 +0 SECTION LOCAL +DEFAULT +10 
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 
- +[0-9]+: 0+105f8 +0 SECTION LOCAL +DEFAULT +12 
- +[0-9]+: 0+105f8 +0 SECTION LOCAL +DEFAULT +13 
- +[0-9]+: 0+105f8 +0 SECTION LOCAL +DEFAULT +14 
+ +[0-9]+: 0+105cc +0 SECTION LOCAL +DEFAULT +12 
+ +[0-9]+: 0+105cc +0 SECTION LOCAL +DEFAULT +13 
+ +[0-9]+: 0+105cc +0 SECTION LOCAL +DEFAULT +14 
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 
- +[0-9]+: 0+1064c +0 SECTION LOCAL +DEFAULT +16 
+ +[0-9]+: 0+10620 +0 SECTION LOCAL +DEFAULT +16 
  +[0-9]+: 0+ +0 SECTION LOCAL +DEFAULT +17 
  +[0-9]+: 0+ +0 SECTION LOCAL +DEFAULT +18 
  +[0-9]+: 0+ +0 SECTION LOCAL +DEFAULT +19 
@@ -133,7 +132,8 @@ Symbol table '\.symtab' contains 46 entries:
  +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +7 ie4
  +[0-9]+: 0+14 +0 TLS +LOCAL +DEFAULT +7 le4
  +[0-9]+: 0+18 +0 TLS +LOCAL +DEFAULT +7 le5
- +[0-9]+: 0+10524 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+1059c +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: 0+104f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
  +[0-9]+: 0+30 +0 TLS +GLOBAL DEFAULT +8 le0
  +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
@@ -147,7 +147,6 @@ Symbol table '\.symtab' contains 46 entries:
  +[0-9]+: 0+24 +0 TLS +GLOBAL DEFAULT +8 ld1
  +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
  +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: 0+105c8 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
  +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
  +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 gd0
  +[0-9]+: 0+2c +0 TLS +GLOBAL DEFAULT +8 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsso32.t b/ld/testsuite/ld-powerpc/tlsso32.t
index a1594db..66a38d5 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.t
+++ b/ld/testsuite/ld-powerpc/tlsso32.t
@@ -7,5 +7,5 @@
 .*: +file format elf32-powerpc
 
 Contents of section \.tdata:
- 10508 12345678 23456789 3456789a 456789ab  .*
- 10518 56789abc 6789abcd 789abcde           .*
+ 104dc 12345678 23456789 3456789a 456789ab  .*
+ 104ec 56789abc 6789abcd 789abcde           .*