* ld-elfvsb/elfvsb.exp: Run for powerpc64 too.

	* ld-powerpc/tls.t: Update.
	* ld-powerpc/tlsexe.d: Update.
	* ld-powerpc/tlsexe.r: Update.
	* ld-powerpc/tlsexetoc.d: Update.
	* ld-powerpc/tlsexetoc.r: Update.
	* ld-powerpc/tlsexetoc.t: Update.
	* ld-powerpc/tlsso.d: Update.
	* ld-powerpc/tlsso.g: Update.
	* ld-powerpc/tlsso.r: Update.
	* ld-powerpc/tlsso.t: Update.
	* ld-powerpc/tlstocso.d: Update.
	* ld-powerpc/tlstocso.g: Update.
	* ld-powerpc/tlstocso.r: Update.
	* ld-powerpc/tlstocso.t: Update.

16 files changed, 552 insertions, 530 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index cd38c94d..094ca04 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2003-06-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* ld-elfvsb/elfvsb.exp: Run for powerpc64 too.
+	* ld-powerpc/tls.t: Update.
+	* ld-powerpc/tlsexe.d: Update.
+	* ld-powerpc/tlsexe.r: Update.
+	* ld-powerpc/tlsexetoc.d: Update.
+	* ld-powerpc/tlsexetoc.r: Update.
+	* ld-powerpc/tlsexetoc.t: Update.
+	* ld-powerpc/tlsso.d: Update.
+	* ld-powerpc/tlsso.g: Update.
+	* ld-powerpc/tlsso.r: Update.
+	* ld-powerpc/tlsso.t: Update.
+	* ld-powerpc/tlstocso.d: Update.
+	* ld-powerpc/tlstocso.g: Update.
+	* ld-powerpc/tlstocso.r: Update.
+	* ld-powerpc/tlstocso.t: Update.
+
 2003-06-03  H.J. Lu <hongjiu.lu@intel.com>
 
 	* ld-discard/extern.d: Updated.
diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index d30858a..9f0073a 100644
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -29,7 +29,7 @@ if { ![istarget hppa*64*-*-hpux*] \
      && ![istarget ia64-*-linux*] \
      && ![istarget m68k-*-linux*] \
      && ![istarget mips*-*-linux*] \
-     && ![istarget powerpc-*-linux*] \
+     && ![istarget powerpc*-*-linux*] \
      && ![istarget arm*-*-linux*] \
      && ![istarget alpha*-*-linux*] \
      && ![istarget sparc*-*-linux*] \
diff --git a/ld/testsuite/ld-powerpc/tls.t b/ld/testsuite/ld-powerpc/tls.t
index a37e69b..32a909b 100644
--- a/ld/testsuite/ld-powerpc/tls.t
+++ b/ld/testsuite/ld-powerpc/tls.t
@@ -8,7 +8,7 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.tdata:
- 10010188 12345678 9abcdef0 23456789 abcdef01  .*
- 10010198 3456789a bcdef012 456789ab cdef0123  .*
- 100101a8 56789abc def01234 6789abcd ef012345  .*
- 100101b8 789abcde f0123456 00c0ffee           .*
+.* 12345678 9abcdef0 23456789 abcdef01  .*
+.* 3456789a bcdef012 456789ab cdef0123  .*
+.* 56789abc def01234 6789abcd ef012345  .*
+.* 789abcde f0123456 00c0ffee           .*
diff --git a/ld/testsuite/ld-powerpc/tlsexe.d b/ld/testsuite/ld-powerpc/tlsexe.d
index bd4819c..6dac928 100644
--- a/ld/testsuite/ld-powerpc/tlsexe.d
+++ b/ld/testsuite/ld-powerpc/tlsexe.d
@@ -56,13 +56,21 @@ Disassembly of section \.text:
 .*	e9 4d 90 2a 	lwa	r10,-28632\(r13\)
 .*	3d 2d 00 00 	addis	r9,r13,0
 .*	a9 49 90 30 	lha	r10,-28624\(r9\)
-.*	e8 41 00 28 	ld	r2,40\(r1\)
-.*	3d 82 00 00 	addis	r12,r2,0
-.*	e9 6c 80 30 	ld	r11,-32720\(r12\)
-.*	e8 4c 80 38 	ld	r2,-32712\(r12\)
+.*	7d 89 02 a6 	mfctr	r12
+.*	78 0b 1f 24 	rldicr	r11,r0,3,60
+.*	34 40 80 00 	addic\.	r2,r0,-32768
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7c 42 fe 76 	sradi	r2,r2,63
+.*	78 0b 17 64 	rldicr	r11,r0,2,61
+.*	7c 42 58 38 	and	r2,r2,r11
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7d 8c 12 14 	add	r12,r12,r2
+.*	3d 8c 00 01 	addis	r12,r12,1
+.*	e9 6c 01 c4 	ld	r11,452\(r12\)
+.*	39 8c 01 c4 	addi	r12,r12,452
+.*	e8 4c 00 08 	ld	r2,8\(r12\)
 .*	7d 69 03 a6 	mtctr	r11
-.*	e9 6c 80 40 	ld	r11,-32704\(r12\)
+.*	e9 6c 00 10 	ld	r11,16\(r12\)
 .*	4e 80 04 20 	bctr
-.*	60 00 00 00 	nop
 .*	38 00 00 00 	li	r0,0
-.*	4b ff ff dc 	b	.*
+.*	4b ff ff bc 	b	.*
diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
index 713e8f3..c8cb591 100644
--- a/ld/testsuite/ld-powerpc/tlsexe.r
+++ b/ld/testsuite/ld-powerpc/tlsexe.r
@@ -5,36 +5,34 @@
 #readelf: -WSsrl
 #target: powerpc64*-*-*
 
-There are 22 section headers.*
+There are 20 section headers.*
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
  +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
  +\[ 1\] \.interp +PROGBITS +0+10000190 0+190 0+11 0+ +A +0 +0 +1
- +\[ 2\] \.hash +HASH +0+100001a8 0+1a8 0+40 04 +A +3 +0 +8
- +\[ 3\] \.dynsym +DYNSYM +0+100001e8 0+1e8 0+108 18 +A +4 +1 +8
- +\[ 4\] \.dynstr +STRTAB +0+100002f0 0+2f0 0+51 0+ +A +0 +0 +1
- +\[ 5\] \.rela\.dyn +RELA +0+10000348 0+348 0+48 18 +A +3 +0 +8
- +\[ 6\] \.rela\.plt +RELA +0+10000390 0+390 0+18 18 +A +3 +11 +8
- +\[ 7\] \.text +PROGBITS +0+100003a8 0+3a8 0+dc 0+ +AX +0 +0 +4
+ +\[ 2\] \.hash +HASH +0+100001a8 0+1a8 0+3c 04 +A +3 +0 +8
+ +\[ 3\] \.dynsym +DYNSYM +0+100001e8 0+1e8 0+f0 18 +A +4 +1 +8
+ +\[ 4\] \.dynstr +STRTAB +0+100002d8 0+2d8 0+50 0+ +A +0 +0 +1
+ +\[ 5\] \.rela\.dyn +RELA +0+10000328 0+328 0+48 18 +A +3 +0 +8
+ +\[ 6\] \.rela\.plt +RELA +0+10000370 0+370 0+18 18 +A +3 +f +8
+ +\[ 7\] \.text +PROGBITS +0+10000388 0+388 0+fc 0+ +AX +0 +0 +4
  +\[ 8\] \.data +PROGBITS +0+10010488 0+488 0+ 0+ +WA +0 +0 +1
  +\[ 9\] \.branch_lt +PROGBITS +0+10010488 0+488 0+ 0+ +WA +0 +0 +8
  +\[10\] \.tdata +PROGBITS +0+10010488 0+488 0+38 0+ WAT +0 +0 +8
  +\[11\] \.tbss +NOBITS +0+100104c0 0+4c0 0+38 0+ WAT +0 +0 +8
  +\[12\] \.dynamic +DYNAMIC +0+100104c0 0+4c0 0+150 10 +WA +4 +0 +8
- +\[13\] \.ctors +PROGBITS +0+10010610 0+640 0+ 0+ +W +0 +0 +1
- +\[14\] \.dtors +PROGBITS +0+10010610 0+640 0+ 0+ +W +0 +0 +1
- +\[15\] \.got +PROGBITS +0+10010610 0+610 0+30 08 +WA +0 +0 +8
- +\[16\] \.sbss +PROGBITS +0+10010640 0+640 0+ 0+ +W +0 +0 +1
- +\[17\] \.plt +NOBITS +0+10010640 0+640 0+30 18 +WA +0 +0 +8
- +\[18\] \.bss +NOBITS +0+10010670 0+640 0+ 0+ +WA +0 +0 +1
- +\[19\] \.shstrtab +STRTAB +0+ 0+640 0+98 0+ +0 +0 +1
- +\[20\] \.symtab +SYMTAB +0+ 0+c58 0+450 18 +21 +1d +8
- +\[21\] \.strtab +STRTAB +0+ 0+10a8 0+8c 0+ +0 +0 +1
+ +\[13\] \.got +PROGBITS +0+10010610 0+610 0+30 08 +WA +0 +0 +8
+ +\[14\] \.sbss +PROGBITS +0+10010640 0+640 0+ 0+ +W +0 +0 +1
+ +\[15\] \.plt +NOBITS +0+10010640 0+640 0+30 18 +WA +0 +0 +8
+ +\[16\] \.bss +NOBITS +0+10010670 0+640 0+ 0+ +WA +0 +0 +1
+ +\[17\] \.shstrtab +STRTAB +0+ 0+640 0+8a 0+ +0 +0 +1
+ +\[18\] \.symtab +SYMTAB +0+ 0+bd0 0+408 18 +19 +1b +8
+ +\[19\] \.strtab +STRTAB +0+ 0+fd8 0+86 0+ +0 +0 +1
 #...
 
 Elf file type is EXEC \(Executable file\)
-Entry point 0x100003c4
+Entry point 0x100003a4
 There are 6 program headers.*
 
 Program Headers:
@@ -60,13 +58,13 @@ Relocation section '\.rela\.dyn' at offset .* contains 3 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
 0+10010620 +0+200000049 R_PPC64_TPREL64 +0+ gd \+ 0
 0+10010628 +0+500000044 R_PPC64_DTPMOD64 +0+ ld \+ 0
-0+10010638 +0+70000004e R_PPC64_DTPREL64 +0+50 ld2 \+ 0
+0+10010638 +0+60000004e R_PPC64_DTPREL64 +0+50 ld2 \+ 0
 
 Relocation section '\.rela\.plt' at offset .* contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
 0+10010658 +0+300000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
 
-Symbol table '\.dynsym' contains 11 entries:
+Symbol table '\.dynsym' contains 10 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+100104c0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
@@ -74,57 +72,53 @@ Symbol table '\.dynsym' contains 11 entries:
  +3: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
  +4: 0+ +0 FUNC +GLOBAL DEFAULT +UND \.__tls_get_addr
  +5: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +6: 0+10010670 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +7: 0+50 +0 TLS +GLOBAL DEFAULT +11 ld2
- +8: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +9: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +10: 0+10010670 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +6: 0+50 +0 TLS +GLOBAL DEFAULT +11 ld2
+ +7: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +8: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +9: 0+10010670 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '\.symtab' contains 46 entries:
+Symbol table '\.symtab' contains 43 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+10000190 +0 SECTION LOCAL +DEFAULT +1 
  +2: 0+100001a8 +0 SECTION LOCAL +DEFAULT +2 
  +3: 0+100001e8 +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+100002f0 +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+10000348 +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+10000390 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+100003a8 +0 SECTION LOCAL +DEFAULT +7 
+ +4: 0+100002d8 +0 SECTION LOCAL +DEFAULT +4 
+ +5: 0+10000328 +0 SECTION LOCAL +DEFAULT +5 
+ +6: 0+10000370 +0 SECTION LOCAL +DEFAULT +6 
+ +7: 0+10000388 +0 SECTION LOCAL +DEFAULT +7 
  +8: 0+10010488 +0 SECTION LOCAL +DEFAULT +8 
  +9: 0+10010488 +0 SECTION LOCAL +DEFAULT +9 
  +10: 0+10010488 +0 SECTION LOCAL +DEFAULT +10 
  +11: 0+100104c0 +0 SECTION LOCAL +DEFAULT +11 
  +12: 0+100104c0 +0 SECTION LOCAL +DEFAULT +12 
  +13: 0+10010610 +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+10010610 +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+10010610 +0 SECTION LOCAL +DEFAULT +15 
- +16: 0+10010640 +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+10010640 +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+10010670 +0 SECTION LOCAL +DEFAULT +18 
+ +14: 0+10010640 +0 SECTION LOCAL +DEFAULT +14 
+ +15: 0+10010640 +0 SECTION LOCAL +DEFAULT +15 
+ +16: 0+10010670 +0 SECTION LOCAL +DEFAULT +16 
+ +17: 0+ +0 SECTION LOCAL +DEFAULT +17 
+ +18: 0+ +0 SECTION LOCAL +DEFAULT +18 
  +19: 0+ +0 SECTION LOCAL +DEFAULT +19 
- +20: 0+ +0 SECTION LOCAL +DEFAULT +20 
- +21: 0+ +0 SECTION LOCAL +DEFAULT +21 
- +22: 0+ +0 TLS +LOCAL +DEFAULT +10 gd4
- +23: 0+8 +0 TLS +LOCAL +DEFAULT +10 ld4
- +24: 0+10 +0 TLS +LOCAL +DEFAULT +10 ld5
- +25: 0+18 +0 TLS +LOCAL +DEFAULT +10 ld6
- +26: 0+20 +0 TLS +LOCAL +DEFAULT +10 ie4
- +27: 0+28 +0 TLS +LOCAL +DEFAULT +10 le4
- +28: 0+30 +0 TLS +LOCAL +DEFAULT +10 le5
- +29: 0+100104c0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +30: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +31: 0+60 +0 TLS +GLOBAL DEFAULT +11 le0
- +32: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +33: 0+ +0 FUNC +GLOBAL DEFAULT +UND \.__tls_get_addr
- +34: 0+40 +0 TLS +GLOBAL DEFAULT +11 ld0
- +35: 0+68 +0 TLS +GLOBAL DEFAULT +11 le1
- +36: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +37: 0+100003c4 +0 NOTYPE +GLOBAL DEFAULT +7 _start
- +38: 0+10010670 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +39: 0+50 +0 TLS +GLOBAL DEFAULT +11 ld2
- +40: 0+48 +0 TLS +GLOBAL DEFAULT +11 ld1
- +41: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +42: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +43: 0+10010670 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +44: 0+38 +0 TLS +GLOBAL DEFAULT +11 gd0
- +45: 0+58 +0 TLS +GLOBAL DEFAULT +11 ie0
+ +20: 0+ +0 TLS +LOCAL +DEFAULT +10 gd4
+ +21: 0+8 +0 TLS +LOCAL +DEFAULT +10 ld4
+ +22: 0+10 +0 TLS +LOCAL +DEFAULT +10 ld5
+ +23: 0+18 +0 TLS +LOCAL +DEFAULT +10 ld6
+ +24: 0+20 +0 TLS +LOCAL +DEFAULT +10 ie4
+ +25: 0+28 +0 TLS +LOCAL +DEFAULT +10 le4
+ +26: 0+30 +0 TLS +LOCAL +DEFAULT +10 le5
+ +27: 0+100104c0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +28: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
+ +29: 0+60 +0 TLS +GLOBAL DEFAULT +11 le0
+ +30: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +31: 0+ +0 FUNC +GLOBAL DEFAULT +UND \.__tls_get_addr
+ +32: 0+40 +0 TLS +GLOBAL DEFAULT +11 ld0
+ +33: 0+68 +0 TLS +GLOBAL DEFAULT +11 le1
+ +34: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
+ +35: 0+100003a4 +0 NOTYPE +GLOBAL DEFAULT +7 _start
+ +36: 0+50 +0 TLS +GLOBAL DEFAULT +11 ld2
+ +37: 0+48 +0 TLS +GLOBAL DEFAULT +11 ld1
+ +38: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +39: 0+10010640 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +40: 0+10010670 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +41: 0+38 +0 TLS +GLOBAL DEFAULT +11 gd0
+ +42: 0+58 +0 TLS +GLOBAL DEFAULT +11 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.d b/ld/testsuite/ld-powerpc/tlsexetoc.d
index d5e053f..590a4db 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.d
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.d
@@ -8,45 +8,53 @@
 
 Disassembly of section \.text:
 
-0+10000370 <_start-0x1c>:
-    10000370:	3d 82 00 00 	addis	r12,r2,0
-    10000374:	f8 41 00 28 	std	r2,40\(r1\)
-    10000378:	e9 6c 80 70 	ld	r11,-32656\(r12\)
-    1000037c:	e8 4c 80 78 	ld	r2,-32648\(r12\)
-    10000380:	7d 69 03 a6 	mtctr	r11
-    10000384:	e9 6c 80 80 	ld	r11,-32640\(r12\)
-    10000388:	4e 80 04 20 	bctr
+.* <_start-0x1c>:
+.*	3d 82 00 00 	addis	r12,r2,0
+.*	f8 41 00 28 	std	r2,40\(r1\)
+.*	e9 6c 80 70 	ld	r11,-32656\(r12\)
+.*	e8 4c 80 78 	ld	r2,-32648\(r12\)
+.*	7d 69 03 a6 	mtctr	r11
+.*	e9 6c 80 80 	ld	r11,-32640\(r12\)
+.*	4e 80 04 20 	bctr
 
-0+1000038c <_start>:
-    1000038c:	e8 62 80 08 	ld	r3,-32760\(r2\)
-    10000390:	60 00 00 00 	nop
-    10000394:	7c 63 6a 14 	add	r3,r3,r13
-    10000398:	38 62 80 18 	addi	r3,r2,-32744
-    1000039c:	4b ff ff d5 	bl	10000370 <le1\+0x10000308>
-    100003a0:	e8 41 00 28 	ld	r2,40\(r1\)
-    100003a4:	3c 6d 00 00 	addis	r3,r13,0
-    100003a8:	60 00 00 00 	nop
-    100003ac:	38 63 91 90 	addi	r3,r3,-28272
-    100003b0:	3c 6d 00 00 	addis	r3,r13,0
-    100003b4:	60 00 00 00 	nop
-    100003b8:	38 63 10 00 	addi	r3,r3,4096
-    100003bc:	39 23 80 40 	addi	r9,r3,-32704
-    100003c0:	3d 23 00 00 	addis	r9,r3,0
-    100003c4:	81 49 80 48 	lwz	r10,-32696\(r9\)
-    100003c8:	3d 2d 00 00 	addis	r9,r13,0
-    100003cc:	7d 49 18 2a 	ldx	r10,r9,r3
-    100003d0:	3d 2d 00 00 	addis	r9,r13,0
-    100003d4:	a1 49 91 d8 	lhz	r10,-28200\(r9\)
-    100003d8:	89 4d 90 60 	lbz	r10,-28576\(r13\)
-    100003dc:	3d 2d 00 00 	addis	r9,r13,0
-    100003e0:	99 49 90 68 	stb	r10,-28568\(r9\)
-    100003e4:	e8 41 00 28 	ld	r2,40\(r1\)
-    100003e8:	3d 82 00 00 	addis	r12,r2,0
-    100003ec:	e9 6c 80 58 	ld	r11,-32680\(r12\)
-    100003f0:	e8 4c 80 60 	ld	r2,-32672\(r12\)
-    100003f4:	7d 69 03 a6 	mtctr	r11
-    100003f8:	e9 6c 80 68 	ld	r11,-32664\(r12\)
-    100003fc:	4e 80 04 20 	bctr
-    10000400:	60 00 00 00 	nop
-    10000404:	38 00 00 00 	li	r0,0
-    10000408:	4b ff ff dc 	b	100003e4 <_start\+0x58>
+.* <_start>:
+.*	e8 62 80 08 	ld	r3,-32760\(r2\)
+.*	60 00 00 00 	nop
+.*	7c 63 6a 14 	add	r3,r3,r13
+.*	38 62 80 18 	addi	r3,r2,-32744
+.*	4b ff ff d5 	bl	.*
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	3c 6d 00 00 	addis	r3,r13,0
+.*	60 00 00 00 	nop
+.*	38 63 91 90 	addi	r3,r3,-28272
+.*	3c 6d 00 00 	addis	r3,r13,0
+.*	60 00 00 00 	nop
+.*	38 63 10 00 	addi	r3,r3,4096
+.*	39 23 80 40 	addi	r9,r3,-32704
+.*	3d 23 00 00 	addis	r9,r3,0
+.*	81 49 80 48 	lwz	r10,-32696\(r9\)
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	7d 49 18 2a 	ldx	r10,r9,r3
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	a1 49 91 d8 	lhz	r10,-28200\(r9\)
+.*	89 4d 90 60 	lbz	r10,-28576\(r13\)
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	99 49 90 68 	stb	r10,-28568\(r9\)
+.*	7d 89 02 a6 	mfctr	r12
+.*	78 0b 1f 24 	rldicr	r11,r0,3,60
+.*	34 40 80 00 	addic\.	r2,r0,-32768
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7c 42 fe 76 	sradi	r2,r2,63
+.*	78 0b 17 64 	rldicr	r11,r0,2,61
+.*	7c 42 58 38 	and	r2,r2,r11
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7d 8c 12 14 	add	r12,r12,r2
+.*	3d 8c 00 01 	addis	r12,r12,1
+.*	e9 6c 01 ec 	ld	r11,492\(r12\)
+.*	39 8c 01 ec 	addi	r12,r12,492
+.*	e8 4c 00 08 	ld	r2,8\(r12\)
+.*	7d 69 03 a6 	mtctr	r11
+.*	e9 6c 00 10 	ld	r11,16\(r12\)
+.*	4e 80 04 20 	bctr
+.*	38 00 00 00 	li	r0,0
+.*	4b ff ff bc 	b	.*
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
index d18a525..c635f05 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.r
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.r
@@ -5,37 +5,35 @@
 #readelf: -WSsrl
 #target: powerpc64*-*-*
 
-There are 23 section headers.*
+There are 21 section headers.*
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
  +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
  +\[ 1\] \.interp +PROGBITS +0+10000190 0+190 0+11 0+ +A +0 +0 +1
- +\[ 2\] \.hash +HASH +0+100001a8 0+1a8 0+3c 04 +A +3 +0 +8
- +\[ 3\] \.dynsym +DYNSYM +0+100001e8 0+1e8 0+f0 18 +A +4 +1 +8
- +\[ 4\] \.dynstr +STRTAB +0+100002d8 0+2d8 0+4d 0+ +A +0 +0 +1
- +\[ 5\] \.rela\.dyn +RELA +0+10000328 0+328 0+30 18 +A +3 +0 +8
- +\[ 6\] \.rela\.plt +RELA +0+10000358 0+358 0+18 18 +A +3 +12 +8
- +\[ 7\] \.text +PROGBITS +0+10000370 0+370 0+9c 0+ +AX +0 +0 +4
+ +\[ 2\] \.hash +HASH +0+100001a8 0+1a8 0+38 04 +A +3 +0 +8
+ +\[ 3\] \.dynsym +DYNSYM +0+100001e0 0+1e0 0+d8 18 +A +4 +1 +8
+ +\[ 4\] \.dynstr +STRTAB +0+100002b8 0+2b8 0+4c 0+ +A +0 +0 +1
+ +\[ 5\] \.rela\.dyn +RELA +0+10000308 0+308 0+30 18 +A +3 +0 +8
+ +\[ 6\] \.rela\.plt +RELA +0+10000338 0+338 0+18 18 +A +3 +10 +8
+ +\[ 7\] \.text +PROGBITS +0+10000350 0+350 0+bc 0+ +AX +0 +0 +4
  +\[ 8\] \.data +PROGBITS +0+10010410 0+410 0+ 0+ +WA +0 +0 +1
  +\[ 9\] \.branch_lt +PROGBITS +0+10010410 0+410 0+ 0+ +WA +0 +0 +8
  +\[10\] \.tdata +PROGBITS +0+10010410 0+410 0+38 0+ WAT +0 +0 +8
  +\[11\] \.tbss +NOBITS +0+10010448 0+448 0+38 0+ WAT +0 +0 +8
  +\[12\] \.dynamic +DYNAMIC +0+10010448 0+448 0+150 10 +WA +4 +0 +8
- +\[13\] \.ctors +PROGBITS +0+10010598 0+5f0 0+ 0+ +W +0 +0 +1
- +\[14\] \.dtors +PROGBITS +0+10010598 0+5f0 0+ 0+ +W +0 +0 +1
- +\[15\] \.got +PROGBITS +0+10010598 0+598 0+8 08 +WA +0 +0 +8
- +\[16\] \.toc +PROGBITS +0+100105a0 0+5a0 0+50 0+ +WA +0 +0 +1
- +\[17\] \.sbss +PROGBITS +0+100105f0 0+5f0 0+ 0+ +W +0 +0 +1
- +\[18\] \.plt +NOBITS +0+100105f0 0+5f0 0+30 18 +WA +0 +0 +8
- +\[19\] \.bss +NOBITS +0+10010620 0+5f0 0+ 0+ +WA +0 +0 +1
- +\[20\] \.shstrtab +STRTAB +0+ 0+5f0 0+9d 0+ +0 +0 +1
- +\[21\] \.symtab +SYMTAB +0+ 0+c50 0+480 18 +22 +1f +8
- +\[22\] \.strtab +STRTAB +0+ 0+10d0 0+92 0+ +0 +0 +1
+ +\[13\] \.got +PROGBITS +0+10010598 0+598 0+8 08 +WA +0 +0 +8
+ +\[14\] \.toc +PROGBITS +0+100105a0 0+5a0 0+50 0+ +WA +0 +0 +1
+ +\[15\] \.sbss +PROGBITS +0+100105f0 0+5f0 0+ 0+ +W +0 +0 +1
+ +\[16\] \.plt +NOBITS +0+100105f0 0+5f0 0+30 18 +WA +0 +0 +8
+ +\[17\] \.bss +NOBITS +0+10010620 0+5f0 0+ 0+ +WA +0 +0 +1
+ +\[18\] \.shstrtab +STRTAB +0+ 0+5f0 0+8f 0+ +0 +0 +1
+ +\[19\] \.symtab +SYMTAB +0+ 0+bc0 0+438 18 +20 +1d +8
+ +\[20\] \.strtab +STRTAB +0+ 0+ff8 0+8c 0+ +0 +0 +1
 #...
 
 Elf file type is EXEC \(Executable file\)
-Entry point 0x1000038c
+Entry point 0x1000036c
 There are 6 program headers.*
 
 Program Headers:
@@ -66,7 +64,7 @@ Relocation section '\.rela\.plt' at offset .* contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
 0+10010608 +0+300000015 R_PPC64_JMP_SLOT +0+ __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: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+10010448 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
@@ -74,58 +72,54 @@ Symbol table '\.dynsym' contains 10 entries:
  +3: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
  +4: 0+ +0 FUNC +GLOBAL DEFAULT +UND \.__tls_get_addr
  +5: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +6: 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +7: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +8: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +9: 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +6: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +7: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +8: 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '\.symtab' contains 48 entries:
+Symbol table '\.symtab' contains 45 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+10000190 +0 SECTION LOCAL +DEFAULT +1 
  +2: 0+100001a8 +0 SECTION LOCAL +DEFAULT +2 
- +3: 0+100001e8 +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+100002d8 +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+10000328 +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+10000358 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+10000370 +0 SECTION LOCAL +DEFAULT +7 
+ +3: 0+100001e0 +0 SECTION LOCAL +DEFAULT +3 
+ +4: 0+100002b8 +0 SECTION LOCAL +DEFAULT +4 
+ +5: 0+10000308 +0 SECTION LOCAL +DEFAULT +5 
+ +6: 0+10000338 +0 SECTION LOCAL +DEFAULT +6 
+ +7: 0+10000350 +0 SECTION LOCAL +DEFAULT +7 
  +8: 0+10010410 +0 SECTION LOCAL +DEFAULT +8 
  +9: 0+10010410 +0 SECTION LOCAL +DEFAULT +9 
  +10: 0+10010410 +0 SECTION LOCAL +DEFAULT +10 
  +11: 0+10010448 +0 SECTION LOCAL +DEFAULT +11 
  +12: 0+10010448 +0 SECTION LOCAL +DEFAULT +12 
  +13: 0+10010598 +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+10010598 +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+10010598 +0 SECTION LOCAL +DEFAULT +15 
- +16: 0+100105a0 +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+100105f0 +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+100105f0 +0 SECTION LOCAL +DEFAULT +18 
- +19: 0+10010620 +0 SECTION LOCAL +DEFAULT +19 
+ +14: 0+100105a0 +0 SECTION LOCAL +DEFAULT +14 
+ +15: 0+100105f0 +0 SECTION LOCAL +DEFAULT +15 
+ +16: 0+100105f0 +0 SECTION LOCAL +DEFAULT +16 
+ +17: 0+10010620 +0 SECTION LOCAL +DEFAULT +17 
+ +18: 0+ +0 SECTION LOCAL +DEFAULT +18 
+ +19: 0+ +0 SECTION LOCAL +DEFAULT +19 
  +20: 0+ +0 SECTION LOCAL +DEFAULT +20 
- +21: 0+ +0 SECTION LOCAL +DEFAULT +21 
- +22: 0+ +0 SECTION LOCAL +DEFAULT +22 
- +23: 0+ +0 TLS +LOCAL +DEFAULT +10 gd4
- +24: 0+8 +0 TLS +LOCAL +DEFAULT +10 ld4
- +25: 0+10 +0 TLS +LOCAL +DEFAULT +10 ld5
- +26: 0+18 +0 TLS +LOCAL +DEFAULT +10 ld6
- +27: 0+20 +0 TLS +LOCAL +DEFAULT +10 ie4
- +28: 0+28 +0 TLS +LOCAL +DEFAULT +10 le4
- +29: 0+30 +0 TLS +LOCAL +DEFAULT +10 le5
- +30: 0+100105e8 +0 NOTYPE +LOCAL +DEFAULT +16 \.Lie0
- +31: 0+10010448 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +32: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
- +33: 0+60 +0 TLS +GLOBAL DEFAULT +11 le0
- +34: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +35: 0+ +0 FUNC +GLOBAL DEFAULT +UND \.__tls_get_addr
- +36: 0+40 +0 TLS +GLOBAL DEFAULT +11 ld0
- +37: 0+68 +0 TLS +GLOBAL DEFAULT +11 le1
- +38: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
- +39: 0+1000038c +0 NOTYPE +GLOBAL DEFAULT +7 _start
- +40: 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +41: 0+50 +0 TLS +GLOBAL DEFAULT +11 ld2
- +42: 0+48 +0 TLS +GLOBAL DEFAULT +11 ld1
- +43: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +44: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +45: 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +46: 0+38 +0 TLS +GLOBAL DEFAULT +11 gd0
- +47: 0+58 +0 TLS +GLOBAL DEFAULT +11 ie0
+ +21: 0+ +0 TLS +LOCAL +DEFAULT +10 gd4
+ +22: 0+8 +0 TLS +LOCAL +DEFAULT +10 ld4
+ +23: 0+10 +0 TLS +LOCAL +DEFAULT +10 ld5
+ +24: 0+18 +0 TLS +LOCAL +DEFAULT +10 ld6
+ +25: 0+20 +0 TLS +LOCAL +DEFAULT +10 ie4
+ +26: 0+28 +0 TLS +LOCAL +DEFAULT +10 le4
+ +27: 0+30 +0 TLS +LOCAL +DEFAULT +10 le5
+ +28: 0+100105e8 +0 NOTYPE +LOCAL +DEFAULT +14 \.Lie0
+ +29: 0+10010448 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +30: 0+ +0 TLS +GLOBAL DEFAULT +UND gd
+ +31: 0+60 +0 TLS +GLOBAL DEFAULT +11 le0
+ +32: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +33: 0+ +0 FUNC +GLOBAL DEFAULT +UND \.__tls_get_addr
+ +34: 0+40 +0 TLS +GLOBAL DEFAULT +11 ld0
+ +35: 0+68 +0 TLS +GLOBAL DEFAULT +11 le1
+ +36: 0+ +0 TLS +GLOBAL DEFAULT +UND ld
+ +37: 0+1000036c +0 NOTYPE +GLOBAL DEFAULT +7 _start
+ +38: 0+50 +0 TLS +GLOBAL DEFAULT +11 ld2
+ +39: 0+48 +0 TLS +GLOBAL DEFAULT +11 ld1
+ +40: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +41: 0+100105f0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +42: 0+10010620 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +43: 0+38 +0 TLS +GLOBAL DEFAULT +11 gd0
+ +44: 0+58 +0 TLS +GLOBAL DEFAULT +11 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.t b/ld/testsuite/ld-powerpc/tlsexetoc.t
index 22318bb..10bfaa4 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.t
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.t
@@ -7,7 +7,7 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.tdata:
- 10010410 12345678 9abcdef0 23456789 abcdef01  .*
- 10010420 3456789a bcdef012 456789ab cdef0123  .*
- 10010430 56789abc def01234 6789abcd ef012345  .*
- 10010440 789abcde f0123456                    .*
+.* 12345678 9abcdef0 23456789 abcdef01  .*
+.* 3456789a bcdef012 456789ab cdef0123  .*
+.* 56789abc def01234 6789abcd ef012345  .*
+.* 789abcde f0123456                    .*
diff --git a/ld/testsuite/ld-powerpc/tlsso.d b/ld/testsuite/ld-powerpc/tlsso.d
index 07e48ba..814659c 100644
--- a/ld/testsuite/ld-powerpc/tlsso.d
+++ b/ld/testsuite/ld-powerpc/tlsso.d
@@ -8,61 +8,69 @@
 
 Disassembly of section \.text:
 
-0+718 <\.__tls_get_addr>:
- 718:	3d 82 00 00 	addis	r12,r2,0
- 71c:	f8 41 00 28 	std	r2,40\(r1\)
- 720:	e9 6c 80 78 	ld	r11,-32648\(r12\)
- 724:	e8 4c 80 80 	ld	r2,-32640\(r12\)
- 728:	7d 69 03 a6 	mtctr	r11
- 72c:	e9 6c 80 88 	ld	r11,-32632\(r12\)
- 730:	4e 80 04 20 	bctr
+.* <\.__tls_get_addr>:
+.*	3d 82 00 00 	addis	r12,r2,0
+.*	f8 41 00 28 	std	r2,40\(r1\)
+.*	e9 6c 80 78 	ld	r11,-32648\(r12\)
+.*	e8 4c 80 80 	ld	r2,-32640\(r12\)
+.*	7d 69 03 a6 	mtctr	r11
+.*	e9 6c 80 88 	ld	r11,-32632\(r12\)
+.*	4e 80 04 20 	bctr
 
-0+734 <_start>:
- 734:	38 62 80 30 	addi	r3,r2,-32720
- 738:	4b ff ff e1 	bl	718 <\.__tls_get_addr>
- 73c:	e8 41 00 28 	ld	r2,40\(r1\)
- 740:	38 62 80 08 	addi	r3,r2,-32760
- 744:	4b ff ff d5 	bl	718 <\.__tls_get_addr>
- 748:	e8 41 00 28 	ld	r2,40\(r1\)
- 74c:	38 62 80 48 	addi	r3,r2,-32696
- 750:	4b ff ff c9 	bl	718 <\.__tls_get_addr>
- 754:	e8 41 00 28 	ld	r2,40\(r1\)
- 758:	38 62 80 08 	addi	r3,r2,-32760
- 75c:	4b ff ff bd 	bl	718 <\.__tls_get_addr>
- 760:	e8 41 00 28 	ld	r2,40\(r1\)
- 764:	39 23 80 40 	addi	r9,r3,-32704
- 768:	3d 23 00 00 	addis	r9,r3,0
- 76c:	81 49 80 48 	lwz	r10,-32696\(r9\)
- 770:	e9 22 80 40 	ld	r9,-32704\(r2\)
- 774:	7d 49 18 2a 	ldx	r10,r9,r3
- 778:	e9 22 80 58 	ld	r9,-32680\(r2\)
- 77c:	7d 49 6a 2e 	lhzx	r10,r9,r13
- 780:	89 4d 00 00 	lbz	r10,0\(r13\)
- 784:	3d 2d 00 00 	addis	r9,r13,0
- 788:	99 49 00 00 	stb	r10,0\(r9\)
- 78c:	38 62 80 18 	addi	r3,r2,-32744
- 790:	4b ff ff 89 	bl	718 <\.__tls_get_addr>
- 794:	e8 41 00 28 	ld	r2,40\(r1\)
- 798:	38 62 80 08 	addi	r3,r2,-32760
- 79c:	4b ff ff 7d 	bl	718 <\.__tls_get_addr>
- 7a0:	e8 41 00 28 	ld	r2,40\(r1\)
- 7a4:	f9 43 80 08 	std	r10,-32760\(r3\)
- 7a8:	3d 23 00 00 	addis	r9,r3,0
- 7ac:	91 49 80 10 	stw	r10,-32752\(r9\)
- 7b0:	e9 22 80 28 	ld	r9,-32728\(r2\)
- 7b4:	7d 49 19 2a 	stdx	r10,r9,r3
- 7b8:	e9 22 80 58 	ld	r9,-32680\(r2\)
- 7bc:	7d 49 6b 2e 	sthx	r10,r9,r13
- 7c0:	e9 4d 90 2a 	lwa	r10,-28632\(r13\)
- 7c4:	3d 2d 00 00 	addis	r9,r13,0
- 7c8:	a9 49 90 30 	lha	r10,-28624\(r9\)
- 7cc:	e8 41 00 28 	ld	r2,40\(r1\)
- 7d0:	3d 82 00 00 	addis	r12,r2,0
- 7d4:	e9 6c 80 60 	ld	r11,-32672\(r12\)
- 7d8:	e8 4c 80 68 	ld	r2,-32664\(r12\)
- 7dc:	7d 69 03 a6 	mtctr	r11
- 7e0:	e9 6c 80 70 	ld	r11,-32656\(r12\)
- 7e4:	4e 80 04 20 	bctr
- 7e8:	60 00 00 00 	nop
- 7ec:	38 00 00 00 	li	r0,0
- 7f0:	4b ff ff dc 	b	7cc <_start\+0x98>
+.* <_start>:
+.*	38 62 80 30 	addi	r3,r2,-32720
+.*	4b ff ff e1 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 08 	addi	r3,r2,-32760
+.*	4b ff ff d5 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 48 	addi	r3,r2,-32696
+.*	4b ff ff c9 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 08 	addi	r3,r2,-32760
+.*	4b ff ff bd 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	39 23 80 40 	addi	r9,r3,-32704
+.*	3d 23 00 00 	addis	r9,r3,0
+.*	81 49 80 48 	lwz	r10,-32696\(r9\)
+.*	e9 22 80 40 	ld	r9,-32704\(r2\)
+.*	7d 49 18 2a 	ldx	r10,r9,r3
+.*	e9 22 80 58 	ld	r9,-32680\(r2\)
+.*	7d 49 6a 2e 	lhzx	r10,r9,r13
+.*	89 4d 00 00 	lbz	r10,0\(r13\)
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	99 49 00 00 	stb	r10,0\(r9\)
+.*	38 62 80 18 	addi	r3,r2,-32744
+.*	4b ff ff 89 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 08 	addi	r3,r2,-32760
+.*	4b ff ff 7d 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	f9 43 80 08 	std	r10,-32760\(r3\)
+.*	3d 23 00 00 	addis	r9,r3,0
+.*	91 49 80 10 	stw	r10,-32752\(r9\)
+.*	e9 22 80 28 	ld	r9,-32728\(r2\)
+.*	7d 49 19 2a 	stdx	r10,r9,r3
+.*	e9 22 80 58 	ld	r9,-32680\(r2\)
+.*	7d 49 6b 2e 	sthx	r10,r9,r13
+.*	e9 4d 90 2a 	lwa	r10,-28632\(r13\)
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	a9 49 90 30 	lha	r10,-28624\(r9\)
+.*	7d 89 02 a6 	mfctr	r12
+.*	78 0b 1f 24 	rldicr	r11,r0,3,60
+.*	34 40 80 00 	addic\.	r2,r0,-32768
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7c 42 fe 76 	sradi	r2,r2,63
+.*	78 0b 17 64 	rldicr	r11,r0,2,61
+.*	7c 42 58 38 	and	r2,r2,r11
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7d 8c 12 14 	add	r12,r12,r2
+.*	3d 8c 00 01 	addis	r12,r12,1
+.*	e9 6c 01 f4 	ld	r11,500\(r12\)
+.*	39 8c 01 f4 	addi	r12,r12,500
+.*	e8 4c 00 08 	ld	r2,8\(r12\)
+.*	7d 69 03 a6 	mtctr	r11
+.*	e9 6c 00 10 	ld	r11,16\(r12\)
+.*	4e 80 04 20 	bctr
+.*	38 00 00 00 	li	r0,0
+.*	4b ff ff bc 	b	.*
diff --git a/ld/testsuite/ld-powerpc/tlsso.g b/ld/testsuite/ld-powerpc/tlsso.g
index 72d445d..6fb2e4c 100644
--- a/ld/testsuite/ld-powerpc/tlsso.g
+++ b/ld/testsuite/ld-powerpc/tlsso.g
@@ -7,9 +7,9 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.got:
- 10980 00000000 00018980 00000000 00000000  .*
- 10990 00000000 00000000 00000000 00000000  .*
- 109a0 00000000 00000000 00000000 00000000  .*
- 109b0 00000000 00000000 00000000 00000000  .*
- 109c0 00000000 00000000 00000000 00000000  .*
- 109d0 00000000 00000000 00000000 00000000  .*
+ 10948 00000000 00018948 00000000 00000000  .*
+ 10958 00000000 00000000 00000000 00000000  .*
+ 10968 00000000 00000000 00000000 00000000  .*
+ 10978 00000000 00000000 00000000 00000000  .*
+ 10988 00000000 00000000 00000000 00000000  .*
+ 10998 00000000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
index 7b36dea..ee4554b 100644
--- a/ld/testsuite/ld-powerpc/tlsso.r
+++ b/ld/testsuite/ld-powerpc/tlsso.r
@@ -4,43 +4,41 @@
 #readelf: -WSsrl
 #target: powerpc64*-*-*
 
-There are 21 section headers.*
+There are 19 section headers.*
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
  +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash +HASH +0+120 0+120 0+d4 04 +A +2 +0 +8
- +\[ 2\] \.dynsym +DYNSYM +0+1f8 0+1f8 0+330 18 +A +3 +12 +8
- +\[ 3\] \.dynstr +STRTAB +0+528 0+528 0+54 0+ +A +0 +0 +1
- +\[ 4\] \.rela\.dyn +RELA +0+580 0+580 0+180 18 +A +2 +0 +8
- +\[ 5\] \.rela\.plt +RELA +0+700 0+700 0+18 18 +A +2 +10 +8
- +\[ 6\] \.text +PROGBITS +0+718 0+718 0+dc 0+ +AX +0 +0 +4
- +\[ 7\] \.data +PROGBITS +0+107f8 0+7f8 0+ 0+ +WA +0 +0 +1
- +\[ 8\] \.branch_lt +PROGBITS +0+107f8 0+7f8 0+ 0+ +WA +0 +0 +8
- +\[ 9\] \.tdata +PROGBITS +0+107f8 0+7f8 0+38 0+ WAT +0 +0 +8
- +\[10\] \.tbss +NOBITS +0+10830 0+830 0+38 0+ WAT +0 +0 +8
- +\[11\] \.dynamic +DYNAMIC +0+10830 0+830 0+150 10 +WA +3 +0 +8
- +\[12\] \.ctors +PROGBITS +0+10980 0+9e0 0+ 0+ +W +0 +0 +1
- +\[13\] \.dtors +PROGBITS +0+10980 0+9e0 0+ 0+ +W +0 +0 +1
- +\[14\] \.got +PROGBITS +0+10980 0+980 0+60 08 +WA +0 +0 +8
- +\[15\] \.sbss +PROGBITS +0+109e0 0+9e0 0+ 0+ +W +0 +0 +1
- +\[16\] \.plt +NOBITS +0+109e0 0+9e0 0+30 18 +WA +0 +0 +8
- +\[17\] \.bss +NOBITS +0+10a10 0+9e0 0+ 0+ +WA +0 +0 +1
- +\[18\] \.shstrtab +STRTAB +0+ 0+9e0 0+90 0+ +0 +0 +1
- +\[19\] \.symtab +SYMTAB +0+ 0+fb0 0+438 18 +20 +1d +8
- +\[20\] \.strtab +STRTAB +0+ 0+13e8 0+8c 0+ +0 +0 +1
+ +\[ 1\] \.hash +HASH +0+120 0+120 0+c8 04 +A +2 +0 +8
+ +\[ 2\] \.dynsym +DYNSYM +0+1e8 0+1e8 0+2e8 18 +A +3 +10 +8
+ +\[ 3\] \.dynstr +STRTAB +0+4d0 0+4d0 0+53 0+ +A +0 +0 +1
+ +\[ 4\] \.rela\.dyn +RELA +0+528 0+528 0+180 18 +A +2 +0 +8
+ +\[ 5\] \.rela\.plt +RELA +0+6a8 0+6a8 0+18 18 +A +2 +e +8
+ +\[ 6\] \.text +PROGBITS +0+6c0 0+6c0 0+fc 0+ +AX +0 +0 +4
+ +\[ 7\] \.data +PROGBITS +0+107c0 0+7c0 0+ 0+ +WA +0 +0 +1
+ +\[ 8\] \.branch_lt +PROGBITS +0+107c0 0+7c0 0+ 0+ +WA +0 +0 +8
+ +\[ 9\] \.tdata +PROGBITS +0+107c0 0+7c0 0+38 0+ WAT +0 +0 +8
+ +\[10\] \.tbss +NOBITS +0+107f8 0+7f8 0+38 0+ WAT +0 +0 +8
+ +\[11\] \.dynamic +DYNAMIC +0+107f8 0+7f8 0+150 10 +WA +3 +0 +8
+ +\[12\] \.got +PROGBITS +0+10948 0+948 0+60 08 +WA +0 +0 +8
+ +\[13\] \.sbss +PROGBITS +0+109a8 0+9a8 0+ 0+ +W +0 +0 +1
+ +\[14\] \.plt +NOBITS +0+109a8 0+9a8 0+30 18 +WA +0 +0 +8
+ +\[15\] \.bss +NOBITS +0+109d8 0+9a8 0+ 0+ +WA +0 +0 +1
+ +\[16\] \.shstrtab +STRTAB +0+ 0+9a8 0+82 0+ +0 +0 +1
+ +\[17\] \.symtab +SYMTAB +0+ 0+ef0 0+3f0 18 +18 +1b +8
+ +\[18\] \.strtab +STRTAB +0+ 0+12e0 0+86 0+ +0 +0 +1
 #...
 
 Elf file type is DYN \(Shared object file\)
-Entry point 0x734
+Entry point 0x6dc
 There are 4 program headers.*
 
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+7f4 0x0+7f4 R E 0x10000
- +LOAD +0x0+7f8 0x0+107f8 0x0+107f8 0x0+1e8 0x0+218 RW +0x10000
- +DYNAMIC +0x0+830 0x0+10830 0x0+10830 0x0+150 0x0+150 RW +0x8
- +TLS +0x0+7f8 0x0+107f8 0x0+107f8 0x0+38 0x0+70 R +0x8
+ +LOAD +0x0+ 0x0+ 0x0+ 0x0+7bc 0x0+7bc R E 0x10000
+ +LOAD +0x0+7c0 0x0+107c0 0x0+107c0 0x0+1e8 0x0+218 RW +0x10000
+ +DYNAMIC +0x0+7f8 0x0+107f8 0x0+107f8 0x0+150 0x0+150 RW +0x8
+ +TLS +0x0+7c0 0x0+107c0 0x0+107c0 0x0+38 0x0+70 R +0x8
 
  Section to Segment mapping:
  +Segment Sections\.\.\.
@@ -51,108 +49,102 @@ Program Headers:
 
 Relocation section '\.rela\.dyn' at offset .* contains 16 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+782 +0+1400000045 R_PPC64_TPREL16 +0+60 le0 \+ 0
-0+786 +0+1700000048 R_PPC64_TPREL16_HA +0+68 le1 \+ 0
-0+78a +0+1700000046 R_PPC64_TPREL16_LO +0+68 le1 \+ 0
-0+7c2 +0+90000005f R_PPC64_TPREL16_DS +0+107f8 \.tdata \+ 28
-0+7c6 +0+900000048 R_PPC64_TPREL16_HA +0+107f8 \.tdata \+ 30
-0+7ca +0+900000046 R_PPC64_TPREL16_LO +0+107f8 \.tdata \+ 30
-0+10988 +0+44 R_PPC64_DTPMOD64 +0+
-0+10998 +0+44 R_PPC64_DTPMOD64 +0+
-0+109a0 +0+4e R_PPC64_DTPREL64 +0+
-0+109a8 +0+4e R_PPC64_DTPREL64 +0+18
-0+109b0 +0+1300000044 R_PPC64_DTPMOD64 +0+ gd \+ 0
-0+109b8 +0+130000004e R_PPC64_DTPREL64 +0+ gd \+ 0
-0+109c0 +0+1b0000004e R_PPC64_DTPREL64 +0+50 ld2 \+ 0
-0+109c8 +0+2000000044 R_PPC64_DTPMOD64 +0+38 gd0 \+ 0
-0+109d0 +0+200000004e R_PPC64_DTPREL64 +0+38 gd0 \+ 0
-0+109d8 +0+2100000049 R_PPC64_TPREL64 +0+58 ie0 \+ 0
+0+72a +0+1200000045 R_PPC64_TPREL16 +0+60 le0 \+ 0
+0+72e +0+1500000048 R_PPC64_TPREL16_HA +0+68 le1 \+ 0
+0+732 +0+1500000046 R_PPC64_TPREL16_LO +0+68 le1 \+ 0
+0+76a +0+90000005f R_PPC64_TPREL16_DS +0+107c0 \.tdata \+ 28
+0+76e +0+900000048 R_PPC64_TPREL16_HA +0+107c0 \.tdata \+ 30
+0+772 +0+900000046 R_PPC64_TPREL16_LO +0+107c0 \.tdata \+ 30
+0+10950 +0+44 R_PPC64_DTPMOD64 +0+
+0+10960 +0+44 R_PPC64_DTPMOD64 +0+
+0+10968 +0+4e R_PPC64_DTPREL64 +0+
+0+10970 +0+4e R_PPC64_DTPREL64 +0+18
+0+10978 +0+1100000044 R_PPC64_DTPMOD64 +0+ gd \+ 0
+0+10980 +0+110000004e R_PPC64_DTPREL64 +0+ gd \+ 0
+0+10988 +0+180000004e R_PPC64_DTPREL64 +0+50 ld2 \+ 0
+0+10990 +0+1d00000044 R_PPC64_DTPMOD64 +0+38 gd0 \+ 0
+0+10998 +0+1d0000004e R_PPC64_DTPREL64 +0+38 gd0 \+ 0
+0+109a0 +0+1e00000049 R_PPC64_TPREL64 +0+58 ie0 \+ 0
 
 Relocation section '\.rela\.plt' at offset .* contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+109f8 +0+1500000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
+0+109c0 +0+1300000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
 
-Symbol table '\.dynsym' contains 34 entries:
+Symbol table '\.dynsym' contains 31 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+120 +0 SECTION LOCAL +DEFAULT +1 
- +2: 0+1f8 +0 SECTION LOCAL +DEFAULT +2 
- +3: 0+528 +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+580 +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+700 +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+718 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+107f8 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+107f8 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+107f8 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+10830 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+10830 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+10980 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+10980 +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+10980 +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+109e0 +0 SECTION LOCAL +DEFAULT +15 
- +16: 0+109e0 +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+10a10 +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+10830 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +19: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
- +20: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
- +21: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +22: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
- +23: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
- +24: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
- +25: 0+734 +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +26: 0+10a10 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +27: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
- +28: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
- +29: 0+109e0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +30: 0+109e0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +31: 0+10a10 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +32: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
- +33: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
+ +2: 0+1e8 +0 SECTION LOCAL +DEFAULT +2 
+ +3: 0+4d0 +0 SECTION LOCAL +DEFAULT +3 
+ +4: 0+528 +0 SECTION LOCAL +DEFAULT +4 
+ +5: 0+6a8 +0 SECTION LOCAL +DEFAULT +5 
+ +6: 0+6c0 +0 SECTION LOCAL +DEFAULT +6 
+ +7: 0+107c0 +0 SECTION LOCAL +DEFAULT +7 
+ +8: 0+107c0 +0 SECTION LOCAL +DEFAULT +8 
+ +9: 0+107c0 +0 SECTION LOCAL +DEFAULT +9 
+ +10: 0+107f8 +0 SECTION LOCAL +DEFAULT +10 
+ +11: 0+107f8 +0 SECTION LOCAL +DEFAULT +11 
+ +12: 0+10948 +0 SECTION LOCAL +DEFAULT +12 
+ +13: 0+109a8 +0 SECTION LOCAL +DEFAULT +13 
+ +14: 0+109a8 +0 SECTION LOCAL +DEFAULT +14 
+ +15: 0+109d8 +0 SECTION LOCAL +DEFAULT +15 
+ +16: 0+107f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +17: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
+ +18: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
+ +19: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +20: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
+ +21: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
+ +22: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
+ +23: 0+6dc +0 NOTYPE +GLOBAL DEFAULT +6 _start
+ +24: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
+ +25: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
+ +26: 0+109a8 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +27: 0+109a8 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +28: 0+109d8 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +29: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
+ +30: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
 
-Symbol table '\.symtab' contains 45 entries:
+Symbol table '\.symtab' contains 42 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+120 +0 SECTION LOCAL +DEFAULT +1 
- +2: 0+1f8 +0 SECTION LOCAL +DEFAULT +2 
- +3: 0+528 +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+580 +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+700 +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+718 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+107f8 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+107f8 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+107f8 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+10830 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+10830 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+10980 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+10980 +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+10980 +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+109e0 +0 SECTION LOCAL +DEFAULT +15 
- +16: 0+109e0 +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+10a10 +0 SECTION LOCAL +DEFAULT +17 
+ +2: 0+1e8 +0 SECTION LOCAL +DEFAULT +2 
+ +3: 0+4d0 +0 SECTION LOCAL +DEFAULT +3 
+ +4: 0+528 +0 SECTION LOCAL +DEFAULT +4 
+ +5: 0+6a8 +0 SECTION LOCAL +DEFAULT +5 
+ +6: 0+6c0 +0 SECTION LOCAL +DEFAULT +6 
+ +7: 0+107c0 +0 SECTION LOCAL +DEFAULT +7 
+ +8: 0+107c0 +0 SECTION LOCAL +DEFAULT +8 
+ +9: 0+107c0 +0 SECTION LOCAL +DEFAULT +9 
+ +10: 0+107f8 +0 SECTION LOCAL +DEFAULT +10 
+ +11: 0+107f8 +0 SECTION LOCAL +DEFAULT +11 
+ +12: 0+10948 +0 SECTION LOCAL +DEFAULT +12 
+ +13: 0+109a8 +0 SECTION LOCAL +DEFAULT +13 
+ +14: 0+109a8 +0 SECTION LOCAL +DEFAULT +14 
+ +15: 0+109d8 +0 SECTION LOCAL +DEFAULT +15 
+ +16: 0+ +0 SECTION LOCAL +DEFAULT +16 
+ +17: 0+ +0 SECTION LOCAL +DEFAULT +17 
  +18: 0+ +0 SECTION LOCAL +DEFAULT +18 
- +19: 0+ +0 SECTION LOCAL +DEFAULT +19 
- +20: 0+ +0 SECTION LOCAL +DEFAULT +20 
- +21: 0+ +0 TLS +LOCAL +DEFAULT +9 gd4
- +22: 0+8 +0 TLS +LOCAL +DEFAULT +9 ld4
- +23: 0+10 +0 TLS +LOCAL +DEFAULT +9 ld5
- +24: 0+18 +0 TLS +LOCAL +DEFAULT +9 ld6
- +25: 0+20 +0 TLS +LOCAL +DEFAULT +9 ie4
- +26: 0+28 +0 TLS +LOCAL +DEFAULT +9 le4
- +27: 0+30 +0 TLS +LOCAL +DEFAULT +9 le5
- +28: 0+718 +0 NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
- +29: 0+10830 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +30: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
- +31: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
- +32: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +33: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
- +34: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
- +35: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
- +36: 0+734 +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +37: 0+10a10 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +38: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
- +39: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
- +40: 0+109e0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +41: 0+109e0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +42: 0+10a10 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +43: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
- +44: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
+ +19: 0+ +0 TLS +LOCAL +DEFAULT +9 gd4
+ +20: 0+8 +0 TLS +LOCAL +DEFAULT +9 ld4
+ +21: 0+10 +0 TLS +LOCAL +DEFAULT +9 ld5
+ +22: 0+18 +0 TLS +LOCAL +DEFAULT +9 ld6
+ +23: 0+20 +0 TLS +LOCAL +DEFAULT +9 ie4
+ +24: 0+28 +0 TLS +LOCAL +DEFAULT +9 le4
+ +25: 0+30 +0 TLS +LOCAL +DEFAULT +9 le5
+ +26: 0+6c0 +0 NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
+ +27: 0+107f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +28: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
+ +29: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
+ +30: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +31: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
+ +32: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
+ +33: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
+ +34: 0+6dc +0 NOTYPE +GLOBAL DEFAULT +6 _start
+ +35: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
+ +36: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
+ +37: 0+109a8 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +38: 0+109a8 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +39: 0+109d8 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +40: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
+ +41: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
diff --git a/ld/testsuite/ld-powerpc/tlsso.t b/ld/testsuite/ld-powerpc/tlsso.t
index 31c7da5..63f92f6 100644
--- a/ld/testsuite/ld-powerpc/tlsso.t
+++ b/ld/testsuite/ld-powerpc/tlsso.t
@@ -7,7 +7,7 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.tdata:
- 107f8 12345678 9abcdef0 23456789 abcdef01  .*
- 10808 3456789a bcdef012 456789ab cdef0123  .*
- 10818 56789abc def01234 6789abcd ef012345  .*
- 10828 789abcde f0123456                    .*
+.* 12345678 9abcdef0 23456789 abcdef01  .*
+.* 3456789a bcdef012 456789ab cdef0123  .*
+.* 56789abc def01234 6789abcd ef012345  .*
+.* 789abcde f0123456                    .*
diff --git a/ld/testsuite/ld-powerpc/tlstocso.d b/ld/testsuite/ld-powerpc/tlstocso.d
index 174ef23..20501ab 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.d
+++ b/ld/testsuite/ld-powerpc/tlstocso.d
@@ -8,45 +8,53 @@
 
 Disassembly of section \.text:
 
-0+6b8 <\.__tls_get_addr>:
- 6b8:	3d 82 00 00 	addis	r12,r2,0
- 6bc:	f8 41 00 28 	std	r2,40\(r1\)
- 6c0:	e9 6c 80 70 	ld	r11,-32656\(r12\)
- 6c4:	e8 4c 80 78 	ld	r2,-32648\(r12\)
- 6c8:	7d 69 03 a6 	mtctr	r11
- 6cc:	e9 6c 80 80 	ld	r11,-32640\(r12\)
- 6d0:	4e 80 04 20 	bctr
+.* <\.__tls_get_addr>:
+.*	3d 82 00 00 	addis	r12,r2,0
+.*	f8 41 00 28 	std	r2,40\(r1\)
+.*	e9 6c 80 70 	ld	r11,-32656\(r12\)
+.*	e8 4c 80 78 	ld	r2,-32648\(r12\)
+.*	7d 69 03 a6 	mtctr	r11
+.*	e9 6c 80 80 	ld	r11,-32640\(r12\)
+.*	4e 80 04 20 	bctr
 
-0+6d4 <_start>:
- 6d4:	38 62 80 08 	addi	r3,r2,-32760
- 6d8:	4b ff ff e1 	bl	6b8 <\.__tls_get_addr>
- 6dc:	e8 41 00 28 	ld	r2,40\(r1\)
- 6e0:	38 62 80 18 	addi	r3,r2,-32744
- 6e4:	4b ff ff d5 	bl	6b8 <\.__tls_get_addr>
- 6e8:	e8 41 00 28 	ld	r2,40\(r1\)
- 6ec:	38 62 80 28 	addi	r3,r2,-32728
- 6f0:	4b ff ff c9 	bl	6b8 <\.__tls_get_addr>
- 6f4:	e8 41 00 28 	ld	r2,40\(r1\)
- 6f8:	38 62 80 38 	addi	r3,r2,-32712
- 6fc:	4b ff ff bd 	bl	6b8 <\.__tls_get_addr>
- 700:	e8 41 00 28 	ld	r2,40\(r1\)
- 704:	39 23 80 40 	addi	r9,r3,-32704
- 708:	3d 23 00 00 	addis	r9,r3,0
- 70c:	81 49 80 48 	lwz	r10,-32696\(r9\)
- 710:	3d 2d 00 00 	addis	r9,r13,0
- 714:	7d 49 18 2a 	ldx	r10,r9,r3
- 718:	e9 22 80 50 	ld	r9,-32688\(r2\)
- 71c:	7d 49 6a 2e 	lhzx	r10,r9,r13
- 720:	89 4d 00 00 	lbz	r10,0\(r13\)
- 724:	3d 2d 00 00 	addis	r9,r13,0
- 728:	99 49 00 00 	stb	r10,0\(r9\)
- 72c:	e8 41 00 28 	ld	r2,40\(r1\)
- 730:	3d 82 00 00 	addis	r12,r2,0
- 734:	e9 6c 80 58 	ld	r11,-32680\(r12\)
- 738:	e8 4c 80 60 	ld	r2,-32672\(r12\)
- 73c:	7d 69 03 a6 	mtctr	r11
- 740:	e9 6c 80 68 	ld	r11,-32664\(r12\)
- 744:	4e 80 04 20 	bctr
- 748:	60 00 00 00 	nop
- 74c:	38 00 00 00 	li	r0,0
- 750:	4b ff ff dc 	b	72c <_start\+0x58>
+.* <_start>:
+.*	38 62 80 08 	addi	r3,r2,-32760
+.*	4b ff ff e1 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 18 	addi	r3,r2,-32744
+.*	4b ff ff d5 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 28 	addi	r3,r2,-32728
+.*	4b ff ff c9 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	38 62 80 38 	addi	r3,r2,-32712
+.*	4b ff ff bd 	bl	.* <\.__tls_get_addr>
+.*	e8 41 00 28 	ld	r2,40\(r1\)
+.*	39 23 80 40 	addi	r9,r3,-32704
+.*	3d 23 00 00 	addis	r9,r3,0
+.*	81 49 80 48 	lwz	r10,-32696\(r9\)
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	7d 49 18 2a 	ldx	r10,r9,r3
+.*	e9 22 80 50 	ld	r9,-32688\(r2\)
+.*	7d 49 6a 2e 	lhzx	r10,r9,r13
+.*	89 4d 00 00 	lbz	r10,0\(r13\)
+.*	3d 2d 00 00 	addis	r9,r13,0
+.*	99 49 00 00 	stb	r10,0\(r9\)
+.*	7d 89 02 a6 	mfctr	r12
+.*	78 0b 1f 24 	rldicr	r11,r0,3,60
+.*	34 40 80 00 	addic\.	r2,r0,-32768
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7c 42 fe 76 	sradi	r2,r2,63
+.*	78 0b 17 64 	rldicr	r11,r0,2,61
+.*	7c 42 58 38 	and	r2,r2,r11
+.*	7d 8b 60 50 	subf	r12,r11,r12
+.*	7d 8c 12 14 	add	r12,r12,r2
+.*	3d 8c 00 01 	addis	r12,r12,1
+.*	e9 6c 01 ec 	ld	r11,492\(r12\)
+.*	39 8c 01 ec 	addi	r12,r12,492
+.*	e8 4c 00 08 	ld	r2,8\(r12\)
+.*	7d 69 03 a6 	mtctr	r11
+.*	e9 6c 00 10 	ld	r11,16\(r12\)
+.*	4e 80 04 20 	bctr
+.*	38 00 00 00 	li	r0,0
+.*	4b ff ff bc 	b	.*
diff --git a/ld/testsuite/ld-powerpc/tlstocso.g b/ld/testsuite/ld-powerpc/tlstocso.g
index 5842aac..d23aed3 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.g
+++ b/ld/testsuite/ld-powerpc/tlstocso.g
@@ -7,8 +7,8 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.toc:
+ 108b8 00000000 00000000 00000000 00000000  .*
+ 108c8 00000000 00000000 00000000 00000000  .*
+ 108d8 00000000 00000000 00000000 00000000  .*
  108e8 00000000 00000000 00000000 00000000  .*
  108f8 00000000 00000000 00000000 00000000  .*
- 10908 00000000 00000000 00000000 00000000  .*
- 10918 00000000 00000000 00000000 00000000  .*
- 10928 00000000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
index 05e45cb..a6f60c28 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.r
+++ b/ld/testsuite/ld-powerpc/tlstocso.r
@@ -4,44 +4,42 @@
 #readelf: -WSsrl
 #target: powerpc64*-*-*
 
-There are 22 section headers.*
+There are 20 section headers.*
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
  +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash +HASH +0+120 0+120 0+d8 04 +A +2 +0 +8
- +\[ 2\] \.dynsym +DYNSYM +0+1f8 0+1f8 0+348 18 +A +3 +13 +8
- +\[ 3\] \.dynstr +STRTAB +0+540 0+540 0+54 0+ +A +0 +0 +1
- +\[ 4\] \.rela\.dyn +RELA +0+598 0+598 0+108 18 +A +2 +0 +8
- +\[ 5\] \.rela\.plt +RELA +0+6a0 0+6a0 0+18 18 +A +2 +11 +8
- +\[ 6\] \.text +PROGBITS +0+6b8 0+6b8 0+9c 0+ +AX +0 +0 +4
- +\[ 7\] \.data +PROGBITS +0+10758 0+758 0+ 0+ +WA +0 +0 +1
- +\[ 8\] \.branch_lt +PROGBITS +0+10758 0+758 0+ 0+ +WA +0 +0 +8
- +\[ 9\] \.tdata +PROGBITS +0+10758 0+758 0+38 0+ WAT +0 +0 +8
- +\[10\] \.tbss +NOBITS +0+10790 0+790 0+38 0+ WAT +0 +0 +8
- +\[11\] \.dynamic +DYNAMIC +0+10790 0+790 0+150 10 +WA +3 +0 +8
- +\[12\] \.ctors +PROGBITS +0+108e0 0+938 0+ 0+ +W +0 +0 +1
- +\[13\] \.dtors +PROGBITS +0+108e0 0+938 0+ 0+ +W +0 +0 +1
- +\[14\] \.got +PROGBITS +0+108e0 0+8e0 0+8 08 +WA +0 +0 +8
- +\[15\] \.toc +PROGBITS +0+108e8 0+8e8 0+50 0+ +WA +0 +0 +1
- +\[16\] \.sbss +PROGBITS +0+10938 0+938 0+ 0+ +W +0 +0 +1
- +\[17\] \.plt +NOBITS +0+10938 0+938 0+30 18 +WA +0 +0 +8
- +\[18\] \.bss +NOBITS +0+10968 0+938 0+ 0+ +WA +0 +0 +1
- +\[19\] \.shstrtab +STRTAB +0+ 0+938 0+95 0+ +0 +0 +1
- +\[20\] \.symtab +SYMTAB +0+ 0+f50 0+468 18 +21 +1f +8
- +\[21\] \.strtab +STRTAB +0+ 0+13b8 0+92 0+ +0 +0 +1
+ +\[ 1\] \.hash +HASH +0+120 0+120 0+cc 04 +A +2 +0 +8
+ +\[ 2\] \.dynsym +DYNSYM +0+1f0 0+1f0 0+300 18 +A +3 +11 +8
+ +\[ 3\] \.dynstr +STRTAB +0+4f0 0+4f0 0+53 0+ +A +0 +0 +1
+ +\[ 4\] \.rela\.dyn +RELA +0+548 0+548 0+108 18 +A +2 +0 +8
+ +\[ 5\] \.rela\.plt +RELA +0+650 0+650 0+18 18 +A +2 +f +8
+ +\[ 6\] \.text +PROGBITS +0+668 0+668 0+bc 0+ +AX +0 +0 +4
+ +\[ 7\] \.data +PROGBITS +0+10728 0+728 0+ 0+ +WA +0 +0 +1
+ +\[ 8\] \.branch_lt +PROGBITS +0+10728 0+728 0+ 0+ +WA +0 +0 +8
+ +\[ 9\] \.tdata +PROGBITS +0+10728 0+728 0+38 0+ WAT +0 +0 +8
+ +\[10\] \.tbss +NOBITS +0+10760 0+760 0+38 0+ WAT +0 +0 +8
+ +\[11\] \.dynamic +DYNAMIC +0+10760 0+760 0+150 10 +WA +3 +0 +8
+ +\[12\] \.got +PROGBITS +0+108b0 0+8b0 0+8 08 +WA +0 +0 +8
+ +\[13\] \.toc +PROGBITS +0+108b8 0+8b8 0+50 0+ +WA +0 +0 +1
+ +\[14\] \.sbss +PROGBITS +0+10908 0+908 0+ 0+ +W +0 +0 +1
+ +\[15\] \.plt +NOBITS +0+10908 0+908 0+30 18 +WA +0 +0 +8
+ +\[16\] \.bss +NOBITS +0+10938 0+908 0+ 0+ +WA +0 +0 +1
+ +\[17\] \.shstrtab +STRTAB +0+ 0+908 0+87 0+ +0 +0 +1
+ +\[18\] \.symtab +SYMTAB +0+ 0+e90 0+420 18 +19 +1d +8
+ +\[19\] \.strtab +STRTAB +0+ 0+12b0 0+8c 0+ +0 +0 +1
 #...
 
 Elf file type is DYN \(Shared object file\)
-Entry point 0x6d4
+Entry point 0x684
 There are 4 program headers.*
 
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+754 0x0+754 R E 0x10000
- +LOAD +0x0+758 0x0+10758 0x0+10758 0x0+1e0 0x0+210 RW +0x10000
- +DYNAMIC +0x0+790 0x0+10790 0x0+10790 0x0+150 0x0+150 RW +0x8
- +TLS +0x0+758 0x0+10758 0x0+10758 0x0+38 0x0+70 R +0x8
+ +LOAD +0x0+ 0x0+ 0x0+ 0x0+724 0x0+724 R E 0x10000
+ +LOAD +0x0+728 0x0+10728 0x0+10728 0x0+1e0 0x0+210 RW +0x10000
+ +DYNAMIC +0x0+760 0x0+10760 0x0+10760 0x0+150 0x0+150 RW +0x8
+ +TLS +0x0+728 0x0+10728 0x0+10728 0x0+38 0x0+70 R +0x8
 
  Section to Segment mapping:
  +Segment Sections\.\.\.
@@ -52,106 +50,100 @@ Program Headers:
 
 Relocation section '\.rela\.dyn' at offset .* contains 11 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+712 +0+f00000048 R_PPC64_TPREL16_HA +0+108e8 \.toc \+ 40
-0+722 +0+1500000045 R_PPC64_TPREL16 +0+60 le0 \+ 0
-0+726 +0+1800000048 R_PPC64_TPREL16_HA +0+68 le1 \+ 0
-0+108e8 +0+1400000044 R_PPC64_DTPMOD64 +0+ gd \+ 0
-0+108f0 +0+140000004e R_PPC64_DTPREL64 +0+ gd \+ 0
-0+108f8 +0+1900000044 R_PPC64_DTPMOD64 +0+ ld \+ 0
-0+10908 +0+2100000044 R_PPC64_DTPMOD64 +0+38 gd0 \+ 0
-0+10910 +0+210000004e R_PPC64_DTPREL64 +0+38 gd0 \+ 0
-0+10918 +0+1700000044 R_PPC64_DTPMOD64 +0+40 ld0 \+ 0
-0+10928 +0+1c0000004e R_PPC64_DTPREL64 +0+50 ld2 \+ 0
-0+10930 +0+2200000049 R_PPC64_TPREL64 +0+58 ie0 \+ 0
+0+6c2 +0+d00000048 R_PPC64_TPREL16_HA +0+108b8 \.toc \+ 40
+0+6d2 +0+1300000045 R_PPC64_TPREL16 +0+60 le0 \+ 0
+0+6d6 +0+1600000048 R_PPC64_TPREL16_HA +0+68 le1 \+ 0
+0+108b8 +0+1200000044 R_PPC64_DTPMOD64 +0+ gd \+ 0
+0+108c0 +0+120000004e R_PPC64_DTPREL64 +0+ gd \+ 0
+0+108c8 +0+1700000044 R_PPC64_DTPMOD64 +0+ ld \+ 0
+0+108d8 +0+1e00000044 R_PPC64_DTPMOD64 +0+38 gd0 \+ 0
+0+108e0 +0+1e0000004e R_PPC64_DTPREL64 +0+38 gd0 \+ 0
+0+108e8 +0+1500000044 R_PPC64_DTPMOD64 +0+40 ld0 \+ 0
+0+108f8 +0+190000004e R_PPC64_DTPREL64 +0+50 ld2 \+ 0
+0+10900 +0+1f00000049 R_PPC64_TPREL64 +0+58 ie0 \+ 0
 
-Relocation section '\.rela\.plt' at offset 0x6a0 contains 1 entries:
+Relocation section '\.rela\.plt' at offset .* contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+10950 +0+1600000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
+0+10920 +0+1400000015 R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0
 
-Symbol table '\.dynsym' contains 35 entries:
+Symbol table '\.dynsym' contains 32 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+120 +0 SECTION LOCAL +DEFAULT +1 
- +2: 0+1f8 +0 SECTION LOCAL +DEFAULT +2 
- +3: 0+540 +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+598 +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+6a0 +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+6b8 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+10758 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+10758 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+10758 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+10790 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+10790 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+108e0 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+108e0 +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+108e0 +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+108e8 +0 SECTION LOCAL +DEFAULT +15 
+ +2: 0+1f0 +0 SECTION LOCAL +DEFAULT +2 
+ +3: 0+4f0 +0 SECTION LOCAL +DEFAULT +3 
+ +4: 0+548 +0 SECTION LOCAL +DEFAULT +4 
+ +5: 0+650 +0 SECTION LOCAL +DEFAULT +5 
+ +6: 0+668 +0 SECTION LOCAL +DEFAULT +6 
+ +7: 0+10728 +0 SECTION LOCAL +DEFAULT +7 
+ +8: 0+10728 +0 SECTION LOCAL +DEFAULT +8 
+ +9: 0+10728 +0 SECTION LOCAL +DEFAULT +9 
+ +10: 0+10760 +0 SECTION LOCAL +DEFAULT +10 
+ +11: 0+10760 +0 SECTION LOCAL +DEFAULT +11 
+ +12: 0+108b0 +0 SECTION LOCAL +DEFAULT +12 
+ +13: 0+108b8 +0 SECTION LOCAL +DEFAULT +13 
+ +14: 0+10908 +0 SECTION LOCAL +DEFAULT +14 
+ +15: 0+10908 +0 SECTION LOCAL +DEFAULT +15 
  +16: 0+10938 +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+10938 +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+10968 +0 SECTION LOCAL +DEFAULT +18 
- +19: 0+10790 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +20: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
- +21: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
- +22: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +23: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
- +24: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
- +25: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
- +26: 0+6d4 +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +27: 0+10968 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +28: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
- +29: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
- +30: 0+10938 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +31: 0+10938 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +32: 0+10968 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +33: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
- +34: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
+ +17: 0+10760 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +18: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
+ +19: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
+ +20: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +21: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
+ +22: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
+ +23: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
+ +24: 0+684 +0 NOTYPE +GLOBAL DEFAULT +6 _start
+ +25: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
+ +26: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
+ +27: 0+10908 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +28: 0+10908 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +29: 0+10938 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +30: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
+ +31: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
 
-Symbol table '\.symtab' contains 47 entries:
+Symbol table '\.symtab' contains 44 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
  +1: 0+120 +0 SECTION LOCAL +DEFAULT +1 
- +2: 0+1f8 +0 SECTION LOCAL +DEFAULT +2 
- +3: 0+540 +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+598 +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+6a0 +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+6b8 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+10758 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+10758 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+10758 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+10790 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+10790 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+108e0 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+108e0 +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+108e0 +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+108e8 +0 SECTION LOCAL +DEFAULT +15 
+ +2: 0+1f0 +0 SECTION LOCAL +DEFAULT +2 
+ +3: 0+4f0 +0 SECTION LOCAL +DEFAULT +3 
+ +4: 0+548 +0 SECTION LOCAL +DEFAULT +4 
+ +5: 0+650 +0 SECTION LOCAL +DEFAULT +5 
+ +6: 0+668 +0 SECTION LOCAL +DEFAULT +6 
+ +7: 0+10728 +0 SECTION LOCAL +DEFAULT +7 
+ +8: 0+10728 +0 SECTION LOCAL +DEFAULT +8 
+ +9: 0+10728 +0 SECTION LOCAL +DEFAULT +9 
+ +10: 0+10760 +0 SECTION LOCAL +DEFAULT +10 
+ +11: 0+10760 +0 SECTION LOCAL +DEFAULT +11 
+ +12: 0+108b0 +0 SECTION LOCAL +DEFAULT +12 
+ +13: 0+108b8 +0 SECTION LOCAL +DEFAULT +13 
+ +14: 0+10908 +0 SECTION LOCAL +DEFAULT +14 
+ +15: 0+10908 +0 SECTION LOCAL +DEFAULT +15 
  +16: 0+10938 +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+10938 +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+10968 +0 SECTION LOCAL +DEFAULT +18 
+ +17: 0+ +0 SECTION LOCAL +DEFAULT +17 
+ +18: 0+ +0 SECTION LOCAL +DEFAULT +18 
  +19: 0+ +0 SECTION LOCAL +DEFAULT +19 
- +20: 0+ +0 SECTION LOCAL +DEFAULT +20 
- +21: 0+ +0 SECTION LOCAL +DEFAULT +21 
- +22: 0+ +0 TLS +LOCAL +DEFAULT +9 gd4
- +23: 0+8 +0 TLS +LOCAL +DEFAULT +9 ld4
- +24: 0+10 +0 TLS +LOCAL +DEFAULT +9 ld5
- +25: 0+18 +0 TLS +LOCAL +DEFAULT +9 ld6
- +26: 0+20 +0 TLS +LOCAL +DEFAULT +9 ie4
- +27: 0+28 +0 TLS +LOCAL +DEFAULT +9 le4
- +28: 0+30 +0 TLS +LOCAL +DEFAULT +9 le5
- +29: 0+10930 +0 NOTYPE +LOCAL +DEFAULT +15 \.Lie0
- +30: 0+6b8 +0 NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
- +31: 0+10790 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +32: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
- +33: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
- +34: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +35: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
- +36: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
- +37: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
- +38: 0+6d4 +0 NOTYPE +GLOBAL DEFAULT +6 _start
- +39: 0+10968 +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +40: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
- +41: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
- +42: 0+10938 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +43: 0+10938 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +44: 0+10968 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +45: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
- +46: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
+ +20: 0+ +0 TLS +LOCAL +DEFAULT +9 gd4
+ +21: 0+8 +0 TLS +LOCAL +DEFAULT +9 ld4
+ +22: 0+10 +0 TLS +LOCAL +DEFAULT +9 ld5
+ +23: 0+18 +0 TLS +LOCAL +DEFAULT +9 ld6
+ +24: 0+20 +0 TLS +LOCAL +DEFAULT +9 ie4
+ +25: 0+28 +0 TLS +LOCAL +DEFAULT +9 le4
+ +26: 0+30 +0 TLS +LOCAL +DEFAULT +9 le5
+ +27: 0+10900 +0 NOTYPE +LOCAL +DEFAULT +13 \.Lie0
+ +28: 0+668 +0 NOTYPE +LOCAL +DEFAULT +6 \.__tls_get_addr
+ +29: 0+10760 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +30: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND gd
+ +31: 0+60 +0 TLS +GLOBAL DEFAULT +10 le0
+ +32: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +33: 0+40 +0 TLS +GLOBAL DEFAULT +10 ld0
+ +34: 0+68 +0 TLS +GLOBAL DEFAULT +10 le1
+ +35: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND ld
+ +36: 0+684 +0 NOTYPE +GLOBAL DEFAULT +6 _start
+ +37: 0+50 +0 TLS +GLOBAL DEFAULT +10 ld2
+ +38: 0+48 +0 TLS +GLOBAL DEFAULT +10 ld1
+ +39: 0+10908 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +40: 0+10908 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +41: 0+10938 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +42: 0+38 +0 TLS +GLOBAL DEFAULT +10 gd0
+ +43: 0+58 +0 TLS +GLOBAL DEFAULT +10 ie0
diff --git a/ld/testsuite/ld-powerpc/tlstocso.t b/ld/testsuite/ld-powerpc/tlstocso.t
index 298a5bc..fe9def4 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.t
+++ b/ld/testsuite/ld-powerpc/tlstocso.t
@@ -7,7 +7,7 @@
 .*: +file format elf64-powerpc
 
 Contents of section \.tdata:
- 10758 12345678 9abcdef0 23456789 abcdef01  .*
- 10768 3456789a bcdef012 456789ab cdef0123  .*
- 10778 56789abc def01234 6789abcd ef012345  .*
- 10788 789abcde f0123456                    .*
+.* 12345678 9abcdef0 23456789 abcdef01  .*
+.* 3456789a bcdef012 456789ab cdef0123  .*
+.* 56789abc def01234 6789abcd ef012345  .*
+.* 789abcde f0123456                    .*