* ld-sparc/tlssunpic32.rd: Adjust for section reordering changes

	and removal of unneeded STT_SECTION symbols from .dynsym.
	* ld-sparc/tlssunbin32.rd: Likewise.
	* ld-sparc/tlssunpic32.dd: Likewise.
	* ld-sparc/tlssunpic32.sd: Likewise.
	* ld-sparc/tlssunbin32.dd: Likewise.
	* ld-sparc/tlssunbin32.sd: Likewise.
	* ld-sparc/tlssunbin32.td: Likewise.

8 files changed, 193 insertions, 190 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 5b84ee08..906009e 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-01  Jakub Jelinek  <jakub@redhat.com>
+
+	* ld-sparc/tlssunpic32.rd: Adjust for section reordering changes
+	and removal of unneeded STT_SECTION symbols from .dynsym.
+	* ld-sparc/tlssunbin32.rd: Likewise.
+	* ld-sparc/tlssunpic32.dd: Likewise.
+	* ld-sparc/tlssunpic32.sd: Likewise.
+	* ld-sparc/tlssunbin32.dd: Likewise.
+	* ld-sparc/tlssunbin32.sd: Likewise.
+	* ld-sparc/tlssunbin32.td: Likewise.
+
 2004-07-01  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-discard/extern.d: Update.
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.dd b/ld/testsuite/ld-sparc/tlssunbin32.dd
index 87aee12..7acf66d 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.dd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.dd
@@ -14,9 +14,9 @@ Disassembly of section .text:
 
 0+11008 <fn2>:
  +11008:	9d e3 bf 98 	save  %sp, -104, %sp
- +1100c:	2f 00 00 50 	sethi  %hi\(0x14000\), %l7
+ +1100c:	2f 00 00 48 	sethi  %hi\(0x12000\), %l7
  +11010:	7f ff ff fc 	call  11000 <.*>
- +11014:	ae 05 e0 d0 	add  %l7, 0xd0, %l7	! 140d0 <.*>
+ +11014:	ae 05 e2 68 	add  %l7, 0x268, %l7	! 12268 <.*>
  +11018:	01 00 00 00 	nop *
  +1101c:	01 00 00 00 	nop *
  +11020:	01 00 00 00 	nop *
@@ -171,8 +171,8 @@ Disassembly of section .text:
 
 00012000 <_start>:
  +12000:	9d e3 bf 98 	save  %sp, -104, %sp
- +12004:	29 00 00 94 	sethi  %hi\(0x25000\), %l4
- +12008:	a8 15 20 e0 	or  %l4, 0xe0, %l4	! 250e0 <.*>
+ +12004:	29 00 00 8c 	sethi  %hi\(0x23000\), %l4
+ +12008:	a8 15 22 78 	or  %l4, 0x278, %l4	! 23278 <.*>
  +1200c:	01 00 00 00 	nop *
  +12010:	01 00 00 00 	nop *
  +12014:	01 00 00 00 	nop *
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index 0235237..242b1a3 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -15,12 +15,12 @@ Section Headers:
  +\[ 4\] .dynstr +.*
  +\[ 5\] .rela.dyn +.*
  +\[ 6\] .text +PROGBITS +0+11000 0+1000 0+1194 00 +AX +0 +0 4096
- +\[ 7\] .data +.*
- +\[ 8\] .tdata +PROGBITS +0+24000 0+4000 0+1060 00 WAT +0 +0 +4
- +\[ 9\] .tbss +NOBITS +0+25060 0+5060 0+40 00 WAT +0 +0 +4
- +\[10\] .dynamic +DYNAMIC +0+25060 0+5060 0+80 08 +WA +4 +0 +4
+ +\[ 7\] .tdata +PROGBITS +0+22194 0+2194 0+1060 00 WAT +0 +0 +4
+ +\[ 8\] .tbss +NOBITS +0+231f4 0+31f4 0+40 00 WAT +0 +0 +4
+ +\[ 9\] .dynamic +DYNAMIC +0+231f8 0+31f8 0+80 08 +WA +4 +0 +4
+ +\[10\] .got +PROGBITS +0+23278 0+3278 0+14 04 +WA +0 +0 +4
  +\[11\] .plt +.*
- +\[12\] .got +PROGBITS +0+250e0 0+50e0 0+14 04 +WA +0 +0 +4
+ +\[12\] .data +.*
  +\[13\] .bss +.*
  +\[14\] .shstrtab +.*
  +\[15\] .symtab +.*
@@ -37,23 +37,23 @@ Program Headers:
  +INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
 .*Requesting program interpreter.*
  +LOAD +0x0+ 0x0+10000 0x0+10000 0x0+2194 0x0+2194 R E 0x10000
- +LOAD +0x0+4000 0x0+24000 0x0+24000 0x0+10f4 0x0+10f8 RWE 0x10000
- +DYNAMIC +0x0+5060 0x0+25060 0x0+25060 0x0+80 0x0+80 RW +0x4
- +TLS +0x0+4000 0x0+24000 0x0+24000 0x0+1060 0x0+10a0 R +0x4
+ +LOAD +0x0+2194 0x0+22194 0x0+22194 0x0+1e6c 0x0+1e6c RWE 0x10000
+ +DYNAMIC +0x0+31f8 0x0+231f8 0x0+231f8 0x0+80 0x0+80 RW +0x4
+ +TLS +0x0+2194 0x0+22194 0x0+22194 0x0+1060 0x0+10a0 R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-000250e4 +0000014e R_SPARC_TLS_TPOFF32 +00000000 +sG5 \+ 0
-000250e8 +0000034e R_SPARC_TLS_TPOFF32 +00000000 +sG2 \+ 0
-000250ec +0000074e R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0
-000250f0 +0000084e R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
+0002327c +0000014e R_SPARC_TLS_TPOFF32 +00000000 +sG5 \+ 0
+00023280 +0000034e R_SPARC_TLS_TPOFF32 +00000000 +sG2 \+ 0
+00023284 +0000074e R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0
+00023288 +0000084e R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
 
 Symbol table '.dynsym' contains 11 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
  +1: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +2: 0+25060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +2: 0+231f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +3: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
  +4: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
  +5: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
@@ -82,56 +82,56 @@ Symbol table '.symtab' contains 70 entries:
  +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
  +15: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
  +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
- +17: 0+1020 +0 TLS +LOCAL +DEFAULT +8 sl1
- +18: 0+1024 +0 TLS +LOCAL +DEFAULT +8 sl2
- +19: 0+1028 +0 TLS +LOCAL +DEFAULT +8 sl3
- +20: 0+102c +0 TLS +LOCAL +DEFAULT +8 sl4
- +21: 0+1030 +0 TLS +LOCAL +DEFAULT +8 sl5
- +22: 0+1034 +0 TLS +LOCAL +DEFAULT +8 sl6
- +23: 0+1038 +0 TLS +LOCAL +DEFAULT +8 sl7
- +24: 0+103c +0 TLS +LOCAL +DEFAULT +8 sl8
- +25: 0+1080 +0 TLS +LOCAL +DEFAULT +9 bl1
- +26: 0+1084 +0 TLS +LOCAL +DEFAULT +9 bl2
- +27: 0+1088 +0 TLS +LOCAL +DEFAULT +9 bl3
- +28: 0+108c +0 TLS +LOCAL +DEFAULT +9 bl4
- +29: 0+1090 +0 TLS +LOCAL +DEFAULT +9 bl5
- +30: 0+1094 +0 TLS +LOCAL +DEFAULT +9 bl6
- +31: 0+1098 +0 TLS +LOCAL +DEFAULT +9 bl7
- +32: 0+109c +0 TLS +LOCAL +DEFAULT +9 bl8
- +33: 0+250e0 +0 OBJECT +LOCAL +HIDDEN +12 _GLOBAL_OFFSET_TABLE_
- +34: 0+101c +0 TLS +GLOBAL DEFAULT +8 sg8
- +35: 0+107c +0 TLS +GLOBAL DEFAULT +9 bg8
- +36: 0+1074 +0 TLS +GLOBAL DEFAULT +9 bg6
+ +17: 0+1020 +0 TLS +LOCAL +DEFAULT +7 sl1
+ +18: 0+1024 +0 TLS +LOCAL +DEFAULT +7 sl2
+ +19: 0+1028 +0 TLS +LOCAL +DEFAULT +7 sl3
+ +20: 0+102c +0 TLS +LOCAL +DEFAULT +7 sl4
+ +21: 0+1030 +0 TLS +LOCAL +DEFAULT +7 sl5
+ +22: 0+1034 +0 TLS +LOCAL +DEFAULT +7 sl6
+ +23: 0+1038 +0 TLS +LOCAL +DEFAULT +7 sl7
+ +24: 0+103c +0 TLS +LOCAL +DEFAULT +7 sl8
+ +25: 0+1080 +0 TLS +LOCAL +DEFAULT +8 bl1
+ +26: 0+1084 +0 TLS +LOCAL +DEFAULT +8 bl2
+ +27: 0+1088 +0 TLS +LOCAL +DEFAULT +8 bl3
+ +28: 0+108c +0 TLS +LOCAL +DEFAULT +8 bl4
+ +29: 0+1090 +0 TLS +LOCAL +DEFAULT +8 bl5
+ +30: 0+1094 +0 TLS +LOCAL +DEFAULT +8 bl6
+ +31: 0+1098 +0 TLS +LOCAL +DEFAULT +8 bl7
+ +32: 0+109c +0 TLS +LOCAL +DEFAULT +8 bl8
+ +33: 0+23278 +0 OBJECT +LOCAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
+ +34: 0+101c +0 TLS +GLOBAL DEFAULT +7 sg8
+ +35: 0+107c +0 TLS +GLOBAL DEFAULT +8 bg8
+ +36: 0+1074 +0 TLS +GLOBAL DEFAULT +8 bg6
  +37: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +38: 0+1068 +0 TLS +GLOBAL DEFAULT +9 bg3
- +39: 0+25060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +40: 0+1008 +0 TLS +GLOBAL DEFAULT +8 sg3
- +41: 0+1048 +0 TLS +GLOBAL HIDDEN +8 sh3
+ +38: 0+1068 +0 TLS +GLOBAL DEFAULT +8 bg3
+ +39: 0+231f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +40: 0+1008 +0 TLS +GLOBAL DEFAULT +7 sg3
+ +41: 0+1048 +0 TLS +GLOBAL HIDDEN +7 sh3
  +42: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +43: 0+100c +0 TLS +GLOBAL DEFAULT +8 sg4
- +44: 0+1010 +0 TLS +GLOBAL DEFAULT +8 sg5
+ +43: 0+100c +0 TLS +GLOBAL DEFAULT +7 sg4
+ +44: 0+1010 +0 TLS +GLOBAL DEFAULT +7 sg5
  +45: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +46: 0+1070 +0 TLS +GLOBAL DEFAULT +9 bg5
+ +46: 0+1070 +0 TLS +GLOBAL DEFAULT +8 bg5
  +47: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +48: 0+1058 +0 TLS +GLOBAL HIDDEN +8 sh7
- +49: 0+105c +0 TLS +GLOBAL HIDDEN +8 sh8
- +50: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
+ +48: 0+1058 +0 TLS +GLOBAL HIDDEN +7 sh7
+ +49: 0+105c +0 TLS +GLOBAL HIDDEN +7 sh8
+ +50: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
  +51: 0+12000 +0 FUNC +GLOBAL DEFAULT +6 _start
- +52: 0+104c +0 TLS +GLOBAL HIDDEN +8 sh4
- +53: 0+1078 +0 TLS +GLOBAL DEFAULT +9 bg7
- +54: 0+1050 +0 TLS +GLOBAL HIDDEN +8 sh5
+ +52: 0+104c +0 TLS +GLOBAL HIDDEN +7 sh4
+ +53: 0+1078 +0 TLS +GLOBAL DEFAULT +8 bg7
+ +54: 0+1050 +0 TLS +GLOBAL HIDDEN +7 sh5
  +55: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
  +56: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
  +57: 0+11008 +0 FUNC +GLOBAL DEFAULT +6 fn2
- +58: 0+1004 +0 TLS +GLOBAL DEFAULT +8 sg2
+ +58: 0+1004 +0 TLS +GLOBAL DEFAULT +7 sg2
  +59: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +60: 0+1040 +0 TLS +GLOBAL HIDDEN +8 sh1
- +61: 0+1014 +0 TLS +GLOBAL DEFAULT +8 sg6
- +62: 0+1018 +0 TLS +GLOBAL DEFAULT +8 sg7
+ +60: 0+1040 +0 TLS +GLOBAL HIDDEN +7 sh1
+ +61: 0+1014 +0 TLS +GLOBAL DEFAULT +7 sg6
+ +62: 0+1018 +0 TLS +GLOBAL DEFAULT +7 sg7
  +63: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
  +64: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +65: 0+1044 +0 TLS +GLOBAL HIDDEN +8 sh2
- +66: 0+1054 +0 TLS +GLOBAL HIDDEN +8 sh6
- +67: 0+1064 +0 TLS +GLOBAL DEFAULT +9 bg2
- +68: 0+1060 +0 TLS +GLOBAL DEFAULT +9 bg1
- +69: 0+106c +0 TLS +GLOBAL DEFAULT +9 bg4
+ +65: 0+1044 +0 TLS +GLOBAL HIDDEN +7 sh2
+ +66: 0+1054 +0 TLS +GLOBAL HIDDEN +7 sh6
+ +67: 0+1064 +0 TLS +GLOBAL DEFAULT +8 bg2
+ +68: 0+1060 +0 TLS +GLOBAL DEFAULT +8 bg1
+ +69: 0+106c +0 TLS +GLOBAL DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.sd b/ld/testsuite/ld-sparc/tlssunbin32.sd
index 9a81309..abbbc02 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.sd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.sd
@@ -7,5 +7,5 @@
 .*: +file format elf32-sparc
 
 Contents of section .got:
- 250e0 00025060 0+ 0+ 0+  .*
- 250f0 0+  .*
+ 23278 00025060 0+ 0+ 0+  .*
+ 23288 0+  .*
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.td b/ld/testsuite/ld-sparc/tlssunbin32.td
index 526f494..f5974e7 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.td
+++ b/ld/testsuite/ld-sparc/tlssunbin32.td
@@ -7,13 +7,13 @@
 .*: +file format elf32-sparc
 
 Contents of section .tdata:
- 24000 00000011 00000000 00000000 00000000  .*
- 24010 00000000 00000000 00000000 00000000  .*
+ 22194 00000011 00000000 00000000 00000000  .*
+ 221a4 00000000 00000000 00000000 00000000  .*
 #...
- 24ff0 00000000 00000000 00000000 00000000  .*
- 25000 00000000 00000012 00000013 00000014  .*
- 25010 00000015 00000016 00000017 00000018  .*
- 25020 00000041 00000042 00000043 00000044  .*
- 25030 00000045 00000046 00000047 00000048  .*
- 25040 00000101 00000102 00000103 00000104  .*
- 25050 00000105 00000106 00000107 00000108  .*
+ 23184 00000000 00000000 00000000 00000000  .*
+ 23194 00000000 00000012 00000013 00000014  .*
+ 231a4 00000015 00000016 00000017 00000018  .*
+ 231b4 00000041 00000042 00000043 00000044  .*
+ 231c4 00000045 00000046 00000047 00000048  .*
+ 231d4 00000101 00000102 00000103 00000104  .*
+ 231e4 00000105 00000106 00000107 00000108  .*
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.dd b/ld/testsuite/ld-sparc/tlssunpic32.dd
index ffc1823..75ad02e 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.dd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.dd
@@ -17,7 +17,7 @@ Disassembly of section .text:
  +1008:	9d e3 bf 98 	save  %sp, -104, %sp
  +100c:	2f 00 00 44 	sethi  %hi\(0x11000\), %l7
  +1010:	7f ff ff fc 	call  1000 <.*>
- +1014:	ae 05 e1 28 	add  %l7, 0x128, %l7	! 11128 <.*>
+ +1014:	ae 05 e0 e8 	add  %l7, 0xe8, %l7	! 110e8 <.*>
  +1018:	01 00 00 00 	nop *
  +101c:	01 00 00 00 	nop *
  +1020:	01 00 00 00 	nop *
@@ -28,7 +28,7 @@ Disassembly of section .text:
  +1034:	01 00 00 00 	nop *
  +1038:	90 05 c0 12 	add  %l7, %l2, %o0
  +103c:	01 00 00 00 	nop *
- +1040:	40 00 44 3a 	call  12128 <.*>
+ +1040:	40 00 44 4d 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +1044:	01 00 00 00 	nop *
  +1048:	01 00 00 00 	nop *
  +104c:	01 00 00 00 	nop *
@@ -46,7 +46,7 @@ Disassembly of section .text:
  +107c:	19 00 00 00 	sethi  %hi\(0\), %o4
  +1080:	98 03 20 04 	add  %o4, 4, %o4	! 4 <.*>
  +1084:	90 05 c0 0c 	add  %l7, %o4, %o0
- +1088:	40 00 44 28 	call  12128 <.*>
+ +1088:	40 00 44 3b 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +108c:	01 00 00 00 	nop *
  +1090:	01 00 00 00 	nop *
  +1094:	01 00 00 00 	nop *
@@ -64,7 +64,7 @@ Disassembly of section .text:
  +10c4:	19 00 00 00 	sethi  %hi\(0\), %o4
  +10c8:	98 03 20 40 	add  %o4, 0x40, %o4	! 40 <.*>
  +10cc:	90 05 c0 0c 	add  %l7, %o4, %o0
- +10d0:	40 00 44 16 	call  12128 <.*>
+ +10d0:	40 00 44 29 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +10d4:	01 00 00 00 	nop *
  +10d8:	01 00 00 00 	nop *
  +10dc:	01 00 00 00 	nop *
@@ -82,7 +82,7 @@ Disassembly of section .text:
  +110c:	19 00 00 00 	sethi  %hi\(0\), %o4
  +1110:	98 03 20 1c 	add  %o4, 0x1c, %o4	! 1c <.*>
  +1114:	90 05 c0 0c 	add  %l7, %o4, %o0
- +1118:	40 00 44 04 	call  12128 <.*>
+ +1118:	40 00 44 17 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +111c:	01 00 00 00 	nop *
  +1120:	01 00 00 00 	nop *
  +1124:	01 00 00 00 	nop *
@@ -103,7 +103,7 @@ Disassembly of section .text:
  +1160:	01 00 00 00 	nop *
  +1164:	90 05 c0 12 	add  %l7, %l2, %o0
  +1168:	01 00 00 00 	nop *
- +116c:	40 00 43 ef 	call  12128 <.*>
+ +116c:	40 00 44 02 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +1170:	01 00 00 00 	nop *
  +1174:	27 3f ff ff 	sethi  %hi\(0xfffffc00\), %l3
  +1178:	01 00 00 00 	nop *
@@ -126,7 +126,7 @@ Disassembly of section .text:
  +11bc:	25 3f ff ff 	sethi  %hi\(0xfffffc00\), %l2
  +11c0:	90 05 c0 0a 	add  %l7, %o2, %o0
  +11c4:	a8 1c fc 40 	xor  %l3, -960, %l4
- +11c8:	40 00 43 d8 	call  12128 <.*>
+ +11c8:	40 00 43 eb 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +11cc:	a6 1c bc 45 	xor  %l2, -955, %l3
  +11d0:	aa 02 00 14 	add  %o0, %l4, %l5
  +11d4:	ec 0a 00 13 	ldub  \[ %o0 \+ %l3 \], %l6
@@ -140,7 +140,7 @@ Disassembly of section .text:
  +11f4:	25 3f ff ff 	sethi  %hi\(0xfffffc00\), %l2
  +11f8:	90 05 c0 0a 	add  %l7, %o2, %o0
  +11fc:	a8 1c fc 63 	xor  %l3, -925, %l4
- +1200:	40 00 43 ca 	call  12128 <.*>
+ +1200:	40 00 43 dd 	call  [0-9a-f]+ <__tls_get_addr@plt>
  +1204:	a6 1c bc 64 	xor  %l2, -924, %l3
  +1208:	aa 02 00 14 	add  %o0, %l4, %l5
  +120c:	ec 02 00 13 	ld  \[ %o0 \+ %l3 \], %l6
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index 7e73da6..29c2b89 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -16,12 +16,12 @@ Section Headers:
  +\[ 4\] .rela.dyn +.*
  +\[ 5\] .rela.plt +.*
  +\[ 6\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
- +\[ 7\] .data +PROGBITS +0+12000 0+2000 0+ 0+ +WA +0 +0 4096
- +\[ 8\] .tdata +PROGBITS +0+12000 0+2000 0+60 0+ WAT +0 +0 +4
- +\[ 9\] .tbss +NOBITS +0+12060 0+2060 0+20 0+ WAT +0 +0 +4
- +\[10\] .dynamic +DYNAMIC +0+12060 0+2060 0+98 08 +WA +3 +0 +4
+ +\[ 7\] .tdata +PROGBITS +0+12000 0+2000 0+60 0+ WAT +0 +0 +4
+ +\[ 8\] .tbss +NOBITS +0+12060 0+2060 0+20 0+ WAT +0 +0 +4
+ +\[ 9\] .dynamic +DYNAMIC +0+12060 0+2060 0+98 08 +WA +3 +0 +4
+ +\[10\] .got +PROGBITS +0+120f8 0+20f8 0+4c 04 +WA +0 +0 +4
  +\[11\] .plt +.*
- +\[12\] .got +PROGBITS +0+12138 0+2138 0+4c 04 +WA +0 +0 +4
+ +\[12\] .data +PROGBITS +0+13000 0+3000 0+ 0+ +WA +0 +0 4096
  +\[13\] .bss +.*
  +\[14\] .shstrtab +.*
  +\[15\] .symtab +.*
@@ -35,121 +35,113 @@ There are 4 program headers, starting at offset [0-9]+
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
  +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
- +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+188 RWE 0x10000
+ +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+1000 0x0+1000 RWE 0x10000
  +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
  +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-0+1213c +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+12144 +0+4e R_SPARC_TLS_TPOFF32 +0+24
-0+12148 +0+4e R_SPARC_TLS_TPOFF32 +0+30
-0+1214c +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+12154 +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+1215c +0+4e R_SPARC_TLS_TPOFF32 +0+64
-0+1216c +0+4e R_SPARC_TLS_TPOFF32 +0+50
-0+12170 +0+4e R_SPARC_TLS_TPOFF32 +0+70
-0+12178 +0+4a R_SPARC_TLS_DTPMOD32 +0+
-0+12180 +0+4e R_SPARC_TLS_TPOFF32 +0+44
-0+12160 +0+124e R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
-0+12164 +0+154a R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
-0+12168 +0+154c R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
-0+12174 +0+184e R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0
+0+120fc +0+4a R_SPARC_TLS_DTPMOD32 +0+
+0+12104 +0+4e R_SPARC_TLS_TPOFF32 +0+24
+0+12108 +0+4e R_SPARC_TLS_TPOFF32 +0+30
+0+1210c +0+4a R_SPARC_TLS_DTPMOD32 +0+
+0+12114 +0+4a R_SPARC_TLS_DTPMOD32 +0+
+0+1211c +0+4e R_SPARC_TLS_TPOFF32 +0+64
+0+1212c +0+4e R_SPARC_TLS_TPOFF32 +0+50
+0+12130 +0+4e R_SPARC_TLS_TPOFF32 +0+70
+0+12138 +0+4a R_SPARC_TLS_DTPMOD32 +0+
+0+12140 +0+4e R_SPARC_TLS_TPOFF32 +0+44
+0+12120 +0+a4e R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
+0+12124 +0+d4a R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
+0+12128 +0+d4c R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
+0+12134 +0+104e R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-0+12128 +0+1415 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
+0+12174 +0+c15 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
 
-Symbol table '.dynsym' contains 30 entries:
+Symbol table '.dynsym' contains 22 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +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: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 *
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
- +14: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +15: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +16: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +17: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +18: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +19: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +20: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +21: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +22: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
- +23: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +24: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +25: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +26: 0+18 +0 TLS +GLOBAL DEFAULT +8 sg7
- +27: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +28: 0+12138 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +29: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
+ +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
+ +[0-9]+: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
+ +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +7 sg4
+ +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
+ +[0-9]+: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +7 sg2
+ +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +7 sg6
+ +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +7 sg7
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: 0+120f8 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
 
 Symbol table '.symtab' contains 57 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +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: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 *
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
- +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +15: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
- +17: 0+20 +0 TLS +LOCAL +DEFAULT +8 sl1
- +18: 0+24 +0 TLS +LOCAL +DEFAULT +8 sl2
- +19: 0+28 +0 TLS +LOCAL +DEFAULT +8 sl3
- +20: 0+2c +0 TLS +LOCAL +DEFAULT +8 sl4
- +21: 0+30 +0 TLS +LOCAL +DEFAULT +8 sl5
- +22: 0+34 +0 TLS +LOCAL +DEFAULT +8 sl6
- +23: 0+38 +0 TLS +LOCAL +DEFAULT +8 sl7
- +24: 0+3c +0 TLS +LOCAL +DEFAULT +8 sl8
- +25: 0+60 +0 TLS +LOCAL +HIDDEN +9 sH1
- +26: 0+48 +0 TLS +LOCAL +HIDDEN +8 sh3
- +27: 0+64 +0 TLS +LOCAL +HIDDEN +9 sH2
- +28: 0+78 +0 TLS +LOCAL +HIDDEN +9 sH7
- +29: 0+58 +0 TLS +LOCAL +HIDDEN +8 sh7
- +30: 0+5c +0 TLS +LOCAL +HIDDEN +8 sh8
- +31: 0+6c +0 TLS +LOCAL +HIDDEN +9 sH4
- +32: 0+4c +0 TLS +LOCAL +HIDDEN +8 sh4
- +33: 0+68 +0 TLS +LOCAL +HIDDEN +9 sH3
- +34: 0+50 +0 TLS +LOCAL +HIDDEN +8 sh5
- +35: 0+70 +0 TLS +LOCAL +HIDDEN +9 sH5
- +36: 0+74 +0 TLS +LOCAL +HIDDEN +9 sH6
- +37: 0+7c +0 TLS +LOCAL +HIDDEN +9 sH8
- +38: 0+40 +0 TLS +LOCAL +HIDDEN +8 sh1
- +39: 0+44 +0 TLS +LOCAL +HIDDEN +8 sh2
- +40: 0+54 +0 TLS +LOCAL +HIDDEN +8 sh6
- +41: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +42: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +43: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +44: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +45: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +46: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +47: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +48: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +49: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
- +50: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +51: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +52: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +53: 0+18 +0 TLS +GLOBAL DEFAULT +8 sg7
- +54: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +55: 0+12138 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +56: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
+ +[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-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
+ +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +7 sl1
+ +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +7 sl2
+ +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +7 sl3
+ +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +7 sl4
+ +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +7 sl5
+ +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +7 sl6
+ +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +7 sl7
+ +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +7 sl8
+ +[0-9]+: 0+60 +0 TLS +LOCAL +HIDDEN +8 sH1
+ +[0-9]+: 0+48 +0 TLS +LOCAL +HIDDEN +7 sh3
+ +[0-9]+: 0+64 +0 TLS +LOCAL +HIDDEN +8 sH2
+ +[0-9]+: 0+78 +0 TLS +LOCAL +HIDDEN +8 sH7
+ +[0-9]+: 0+58 +0 TLS +LOCAL +HIDDEN +7 sh7
+ +[0-9]+: 0+5c +0 TLS +LOCAL +HIDDEN +7 sh8
+ +[0-9]+: 0+6c +0 TLS +LOCAL +HIDDEN +8 sH4
+ +[0-9]+: 0+4c +0 TLS +LOCAL +HIDDEN +7 sh4
+ +[0-9]+: 0+68 +0 TLS +LOCAL +HIDDEN +8 sH3
+ +[0-9]+: 0+50 +0 TLS +LOCAL +HIDDEN +7 sh5
+ +[0-9]+: 0+70 +0 TLS +LOCAL +HIDDEN +8 sH5
+ +[0-9]+: 0+74 +0 TLS +LOCAL +HIDDEN +8 sH6
+ +[0-9]+: 0+7c +0 TLS +LOCAL +HIDDEN +8 sH8
+ +[0-9]+: 0+40 +0 TLS +LOCAL +HIDDEN +7 sh1
+ +[0-9]+: 0+44 +0 TLS +LOCAL +HIDDEN +7 sh2
+ +[0-9]+: 0+54 +0 TLS +LOCAL +HIDDEN +7 sh6
+ +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
+ +[0-9]+: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
+ +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +7 sg4
+ +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +7 sg5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +[0-9]+: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
+ +[0-9]+: 0+1008 +0 FUNC +GLOBAL DEFAULT +6 fn1
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +7 sg2
+ +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +7 sg6
+ +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +7 sg7
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: 0+120f8 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.sd b/ld/testsuite/ld-sparc/tlssunpic32.sd
index 80885f5..4aecfd7 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.sd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.sd
@@ -8,8 +8,8 @@
 .*: +file format elf32-sparc
 
 Contents of section .got:
- 12138 00012060 00000000 00000020 00000000  .*
- 12148 00000000 00000000 00000000 00000000  .*
- 12158 00000060 00000000 00000000 00000000  .*
- 12168 00000000 00000000 00000000 00000000  .*
- 12178 00000000 00000040 00000000  .*
+ 120f8 00012060 00000000 00000020 00000000  .*
+ 12108 00000000 00000000 00000000 00000000  .*
+ 12118 00000060 00000000 00000000 00000000  .*
+ 12128 00000000 00000000 00000000 00000000  .*
+ 12138 00000000 00000040 00000000  .*