Adjust for dynamic sym changes.

6 files changed, 484 insertions, 512 deletions

diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index c2abc8f25d9..912d760f8da 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -4,7 +4,7 @@
 #readelf: -WSsrl
 #target: sparc*-*-*
 
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+.*
 
 Section Headers:
  +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -19,10 +19,9 @@ Section Headers:
  +\[ 8\] .tbss +NOBITS +0+231f4 0+31f4 0+40 00 WAT +0 +0 +4
  +\[ 9\] .dynamic +DYNAMIC +0+231f4 0+31f4 0+80 08 +WA +4 +0 +4
  +\[10\] .got +PROGBITS +0+23274 0+3274 0+14 04 +WA +0 +0 +4
- +\[11\] .plt +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[11\] .shstrtab +.*
+ +\[12\] .symtab +.*
+ +\[13\] .strtab +.*
 #...
 
 Elf file type is EXEC \(Executable file\)
@@ -34,100 +33,97 @@ Program Headers:
  +PHDR +0x0+34 0x0+10034 0x0+10034 0x0+c0 0x0+c0 R E 0x4
  +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+2194 0x0+22194 0x0+22194 0x0+10f4 0x0+10f4 RWE 0x10000
- +DYNAMIC +0x0+31f4 0x0+231f4 0x0+231f4 0x0+80 0x0+80 RW +0x4
- +TLS +0x0+2194 0x0+22194 0x0+22194 0x0+1060 0x0+10a0 R +0x4
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x4
+ +TLS .* 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
-00023278 +0000014e R_SPARC_TLS_TPOFF32 +00000000 +sG5 \+ 0
-0002327c +0000034e R_SPARC_TLS_TPOFF32 +00000000 +sG2 \+ 0
-00023280 +0000074e R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0
-00023284 +0000084e R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
 
-Symbol table '.dynsym' contains 11 entries:
+Symbol table '.dynsym' contains [0-9]+ 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+231f4 +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
- +6: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +7: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +8: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '.symtab' contains 68 entries:
+Symbol table '.symtab' contains 67 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 *
- +[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+1020 +0 TLS +LOCAL +DEFAULT +7 sl1
- +[0-9]+: 0+1024 +0 TLS +LOCAL +DEFAULT +7 sl2
- +[0-9]+: 0+1028 +0 TLS +LOCAL +DEFAULT +7 sl3
- +[0-9]+: 0+102c +0 TLS +LOCAL +DEFAULT +7 sl4
- +[0-9]+: 0+1030 +0 TLS +LOCAL +DEFAULT +7 sl5
- +[0-9]+: 0+1034 +0 TLS +LOCAL +DEFAULT +7 sl6
- +[0-9]+: 0+1038 +0 TLS +LOCAL +DEFAULT +7 sl7
- +[0-9]+: 0+103c +0 TLS +LOCAL +DEFAULT +7 sl8
- +[0-9]+: 0+1080 +0 TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 0+1084 +0 TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 0+1088 +0 TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0+108c +0 TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 0+1090 +0 TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 0+1094 +0 TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 0+1098 +0 TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0+109c +0 TLS +LOCAL +DEFAULT +8 bl8
- +[0-9]+: 0+101c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+107c +0 TLS +GLOBAL DEFAULT +8 bg8
- +[0-9]+: 0+1074 +0 TLS +GLOBAL DEFAULT +8 bg6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +[0-9]+: 0+1068 +0 TLS +GLOBAL DEFAULT +8 bg3
- +[0-9]+: 0+231f4 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+1008 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+1048 +0 TLS +GLOBAL HIDDEN +7 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+100c +0 TLS +GLOBAL DEFAULT +7 sg4
- +[0-9]+: 0+1010 +0 TLS +GLOBAL DEFAULT +7 sg5
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+1070 +0 TLS +GLOBAL DEFAULT +8 bg5
- +[0-9]+: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+1058 +0 TLS +GLOBAL HIDDEN +7 sh7
- +[0-9]+: 0+105c +0 TLS +GLOBAL HIDDEN +7 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+12000 +0 FUNC +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+104c +0 TLS +GLOBAL HIDDEN +7 sh4
- +[0-9]+: 0+1078 +0 TLS +GLOBAL DEFAULT +8 bg7
- +[0-9]+: 0+1050 +0 TLS +GLOBAL HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +[0-9]+: 0+11008 +0 FUNC +GLOBAL DEFAULT +6 fn2
- +[0-9]+: 0+1004 +0 TLS +GLOBAL DEFAULT +7 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+1040 +0 TLS +GLOBAL HIDDEN +7 sh1
- +[0-9]+: 0+1014 +0 TLS +GLOBAL DEFAULT +7 sg6
- +[0-9]+: 0+1018 +0 TLS +GLOBAL DEFAULT +7 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: 0+23274 +0 OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+1044 +0 TLS +GLOBAL HIDDEN +7 sh2
- +[0-9]+: 0+1054 +0 TLS +GLOBAL HIDDEN +7 sh6
- +[0-9]+: 0+1064 +0 TLS +GLOBAL DEFAULT +8 bg2
- +[0-9]+: 0+1060 +0 TLS +GLOBAL DEFAULT +8 bg1
- +[0-9]+: 0+106c +0 TLS +GLOBAL DEFAULT +8 bg4
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +DEFAULT +8 bl1
+.* TLS +LOCAL +DEFAULT +8 bl2
+.* TLS +LOCAL +DEFAULT +8 bl3
+.* TLS +LOCAL +DEFAULT +8 bl4
+.* TLS +LOCAL +DEFAULT +8 bl5
+.* TLS +LOCAL +DEFAULT +8 bl6
+.* TLS +LOCAL +DEFAULT +8 bl7
+.* TLS +LOCAL +DEFAULT +8 bl8
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +8 bg8
+.* TLS +GLOBAL DEFAULT +8 bg6
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +8 bg3
+.* OBJECT +GLOBAL HIDDEN +9 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL HIDDEN +7 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* OBJECT +GLOBAL HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +GLOBAL DEFAULT +8 bg5
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +7 sh7
+.* TLS +GLOBAL HIDDEN +7 sh8
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL HIDDEN +7 sh4
+.* TLS +GLOBAL DEFAULT +8 bg7
+.* TLS +GLOBAL HIDDEN +7 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* FUNC +GLOBAL DEFAULT +6 fn2
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +7 sh1
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +7 sh2
+.* TLS +GLOBAL HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +8 bg2
+.* TLS +GLOBAL DEFAULT +8 bg1
+.* TLS +GLOBAL DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd
index ae1f1ccbcaa..8a3a168cde1 100644
--- a/ld/testsuite/ld-sparc/tlssunbin64.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin64.rd
@@ -4,7 +4,7 @@
 #readelf: -WSsrl
 #target: sparc*-*-*
 
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+.*
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -19,10 +19,9 @@ Section Headers:
  +\[ 8\] .tbss +NOBITS +0+202204 0+2204 0+40 00 WAT +0 +0 +4
  +\[ 9\] .dynamic +DYNAMIC +0+202208 0+2208 0+100 10 +WA +4 +0 +8
  +\[10\] .got +PROGBITS +0+202308 0+2308 0+28 08 +WA +0 +0 +8
- +\[11\] .plt +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[11\] .shstrtab +.*
+ +\[12\] .symtab +.*
+ +\[13\] .strtab +.*
 #...
 
 Elf file type is EXEC \(Executable file\)
@@ -34,100 +33,97 @@ Program Headers:
  +PHDR +0x0+40 0x0+100040 0x0+100040 0x0+150 0x0+150 R E 0x8
  +INTERP +0x0+190 0x0+100190 0x0+100190 0x0+19 0x0+19 R +0x1
 .*Requesting program interpreter.*
- +LOAD +0x0+ 0x0+100000 0x0+100000 0x0+21a4 0x0+21a4 R E 0x100000
- +LOAD +0x0+21a4 0x0+2021a4 0x0+2021a4 0x0+25c 0x0+25c RWE 0x100000
- +DYNAMIC +0x0+2208 0x0+202208 0x0+202208 0x0+100 0x0+100 RW +0x8
- +TLS +0x0+21a4 0x0+2021a4 0x0+2021a4 0x0+60 0x0+a0 R +0x4
+ +LOAD .* R E 0x100000
+ +LOAD .* RW +0x100000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+60 0x0+a0 R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+202310 +0+10000004f R_SPARC_TLS_TPOFF64 +0+ +sG5 \+ 0
-0+202318 +0+30000004f R_SPARC_TLS_TPOFF64 +0+ +sG2 \+ 0
-0+202320 +0+70000004f R_SPARC_TLS_TPOFF64 +0+ +sG6 \+ 0
-0+202328 +0+80000004f R_SPARC_TLS_TPOFF64 +0+ +sG1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG6 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG1 \+ 0
 
-Symbol table '.dynsym' contains 11 entries:
+Symbol table '.dynsym' contains [0-9]+ 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+202208 +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
- +6: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +7: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +8: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '.symtab' contains 68 entries:
+Symbol table '.symtab' contains 67 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 *
- +[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+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+80 +0 TLS +LOCAL +DEFAULT +8 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL +DEFAULT +8 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL +DEFAULT +8 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL +DEFAULT +8 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL +DEFAULT +8 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL +DEFAULT +8 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL +DEFAULT +8 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL +DEFAULT +8 bl8
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +8 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +8 bg6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +8 bg3
- +[0-9]+: 0+202208 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+08 +0 TLS +GLOBAL DEFAULT +7 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +7 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+0c +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+70 +0 TLS +GLOBAL DEFAULT +8 bg5
- +[0-9]+: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +7 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +7 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +[0-9]+: 0+102000 +0 FUNC +GLOBAL DEFAULT +6 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +7 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +8 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +7 sh5
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +[0-9]+: 0+101008 +0 FUNC +GLOBAL DEFAULT +6 fn2
- +[0-9]+: 0+04 +0 TLS +GLOBAL DEFAULT +7 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +7 sh1
- +[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+202308 +0 OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +7 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +7 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +8 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +8 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +8 bg4
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +DEFAULT +8 bl1
+.* TLS +LOCAL +DEFAULT +8 bl2
+.* TLS +LOCAL +DEFAULT +8 bl3
+.* TLS +LOCAL +DEFAULT +8 bl4
+.* TLS +LOCAL +DEFAULT +8 bl5
+.* TLS +LOCAL +DEFAULT +8 bl6
+.* TLS +LOCAL +DEFAULT +8 bl7
+.* TLS +LOCAL +DEFAULT +8 bl8
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +8 bg8
+.* TLS +GLOBAL DEFAULT +8 bg6
+.* TLS +GLOBAL DEFAULT +UND sG5
+.* TLS +GLOBAL DEFAULT +8 bg3
+.* OBJECT +GLOBAL HIDDEN +9 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL HIDDEN +7 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* OBJECT +GLOBAL HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +GLOBAL DEFAULT +8 bg5
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +7 sh7
+.* TLS +GLOBAL HIDDEN +7 sh8
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 _start
+.* TLS +GLOBAL HIDDEN +7 sh4
+.* TLS +GLOBAL DEFAULT +8 bg7
+.* TLS +GLOBAL HIDDEN +7 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* FUNC +GLOBAL DEFAULT +6 fn2
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +7 sh1
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +7 sh2
+.* TLS +GLOBAL HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +8 bg2
+.* TLS +GLOBAL DEFAULT +8 bg1
+.* TLS +GLOBAL DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
index 9ffcbd2c372..19fbf559ea2 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -5,7 +5,7 @@
 #readelf: -WSsrl
 #target: sparc-*-*
 
-There are 13 section headers, starting at offset 0x[0-9a-f]+:
+.*
 
 Section Headers:
  +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -18,10 +18,9 @@ Section Headers:
  +\[ 6\] .tbss +NOBITS +0+12000 0+2000 0+24 0+ WAT +0 +0 +4
  +\[ 7\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4
  +\[ 8\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4
- +\[ 9\] .plt +.*
- +\[10\] .shstrtab +.*
- +\[11\] .symtab +.*
- +\[12\] .strtab +.*
+ +\[ 9\] .shstrtab +.*
+ +\[10\] .symtab +.*
+ +\[11\] .strtab +.*
 #...
 Elf file type is DYN \(Shared object file\)
 Entry point 0x1000
@@ -29,74 +28,69 @@ There are 4 program headers, starting at offset [0-9a-f]+
 
 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+9c 0x0+9c RWE 0x10000
- +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+80 0x0+80 RW +0x4
- +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+ 0x0+24 R +0x4
+ +LOAD .* R E 0x10000
+ +LOAD .* RW +0x10000
+ +DYNAMIC .* RW +0x4
+ +TLS .* 0x0+ 0x0+24 R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-0+1004 +0+309 R_SPARC_HI22 +0+12080 +\.got \+ 12080
-0+1008 +0+30c R_SPARC_LO10 +0+12080 +\.got \+ 12080
-0+10dc +0+48 R_SPARC_TLS_LE_HIX22 +0+9
-0+10e0 +0+49 R_SPARC_TLS_LE_LOX10 +0+9
-0+10f8 +0+48 R_SPARC_TLS_LE_HIX22 +0+1c
-0+10fc +0+49 R_SPARC_TLS_LE_LOX10 +0+1c
-0+12084 +0+4e R_SPARC_TLS_TPOFF32 +0+
-0+12088 +0+4e R_SPARC_TLS_TPOFF32 +0+4
-0+12094 +0+4e R_SPARC_TLS_TPOFF32 +0+14
-0+12098 +0+4e R_SPARC_TLS_TPOFF32 +0+18
-0+1208c +0+94e R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0
-0+12090 +0+b4e R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0
+[0-9a-f ]+R_SPARC_HI22 +0+12080 +\.got \+ 12080
+[0-9a-f ]+R_SPARC_LO10 +0+12080 +\.got \+ 12080
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+1c
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+1c
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+4
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+14
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+18
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0
 
-Symbol table '.dynsym' contains 14 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +4: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +5: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +6: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +7: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +9: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +11: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +12: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +13: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '.symtab' contains 31 entries:
+Symbol table '.symtab' contains 30 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 *
- +[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+ +0 TLS +LOCAL +DEFAULT +6 bl1
- +[0-9]+: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3
- +[0-9]+: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5
- +[0-9]+: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3
- +[0-9]+: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4
- +[0-9]+: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1
- +[0-9]+: 0+12080 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2
- +[0-9]+: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* TLS +LOCAL +DEFAULT +6 bl1
+.* TLS +LOCAL +DEFAULT +6 bl2
+.* TLS +LOCAL +DEFAULT +6 bl3
+.* TLS +LOCAL +DEFAULT +6 bl4
+.* TLS +LOCAL +DEFAULT +6 bl5
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +6 sh3
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh4
+.* TLS +LOCAL +HIDDEN +6 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh2
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd
index c12918e09fd..ce375efe135 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -5,7 +5,7 @@
 #readelf: -WSsrl
 #target: sparc-*-*
 
-There are 13 section headers, starting at offset 0x[0-9a-f]+:
+.*
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -18,10 +18,9 @@ Section Headers:
  +\[ 6\] .tbss +NOBITS +0+102000 0+2000 0+24 0+ WAT +0 +0 +4
  +\[ 7\] .dynamic +DYNAMIC +0+102000 0+2000 0+100 10 +WA +3 +0 +8
  +\[ 8\] .got +PROGBITS +0+102100 0+2100 0+38 08 +WA +0 +0 +8
- +\[ 9\] .plt +.*
- +\[10\] .shstrtab +.*
- +\[11\] .symtab +.*
- +\[12\] .strtab +.*
+ +\[ 9\] .shstrtab +.*
+ +\[10\] .symtab +.*
+ +\[11\] .strtab +.*
 #...
 Elf file type is DYN \(Shared object file\)
 Entry point 0x1000
@@ -29,76 +28,71 @@ There are 4 program headers, starting at offset [0-9a-f]+
 
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x100000
- +LOAD +0x0+2000 0x0+102000 0x0+102000 0x0+200 0x0+200 RWE 0x100000
- +DYNAMIC +0x0+2000 0x0+102000 0x0+102000 0x0+100 0x0+100 RW +0x8
- +TLS +0x0+2000 0x0+102000 0x0+102000 0x0+ 0x0+24 R +0x4
+ +LOAD .* R E 0x100000
+ +LOAD .* RW +0x100000
+ +DYNAMIC .* RW +0x8
+ +TLS .* 0x0+ 0x0+24 R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+1004 +0+300000022 R_SPARC_HH22 +0+102100 +\.got \+ 102100
-0+1008 +0+300000024 R_SPARC_LM22 +0+102100 +\.got \+ 102100
-0+100c +0+300000023 R_SPARC_HM10 +0+102100 +\.got \+ 102100
-0+1010 +0+30000000c R_SPARC_LO10 +0+102100 +\.got \+ 102100
-0+10ec +0+48 R_SPARC_TLS_LE_HIX22 +0+9
-0+10f0 +0+49 R_SPARC_TLS_LE_LOX10 +0+9
-0+1108 +0+48 R_SPARC_TLS_LE_HIX22 +0+1c
-0+110c +0+49 R_SPARC_TLS_LE_LOX10 +0+1c
-0+102108 +0+4f R_SPARC_TLS_TPOFF64 +0+
-0+102110 +0+4f R_SPARC_TLS_TPOFF64 +0+4
-0+102128 +0+4f R_SPARC_TLS_TPOFF64 +0+14
-0+102130 +0+4f R_SPARC_TLS_TPOFF64 +0+18
-0+102118 +0+90000004f R_SPARC_TLS_TPOFF64 +0+ +sg1 \+ 0
-0+102120 +0+b0000004f R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 0
+[0-9a-f ]+R_SPARC_HH22 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_LM22 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_HM10 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_LO10 +0+102100 +\.got \+ 102100
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+9
+[0-9a-f ]+R_SPARC_TLS_LE_HIX22 +0+1c
+[0-9a-f ]+R_SPARC_TLS_LE_LOX10 +0+1c
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+4
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+14
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+18
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 0
 
-Symbol table '.dynsym' contains 14 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +4: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +5: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +6: 0+102000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +7: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +9: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +11: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +12: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +13: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '.symtab' contains 31 entries:
+Symbol table '.symtab' contains 30 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 *
- +[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+ +0 TLS +LOCAL +DEFAULT +6 bl1
- +[0-9]+: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2
- +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3
- +[0-9]+: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4
- +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5
- +[0-9]+: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3
- +[0-9]+: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4
- +[0-9]+: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1
- +[0-9]+: 0+102100 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2
- +[0-9]+: 0+102000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* TLS +LOCAL +DEFAULT +6 bl1
+.* TLS +LOCAL +DEFAULT +6 bl2
+.* TLS +LOCAL +DEFAULT +6 bl3
+.* TLS +LOCAL +DEFAULT +6 bl4
+.* TLS +LOCAL +DEFAULT +6 bl5
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +6 sh3
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh4
+.* TLS +LOCAL +HIDDEN +6 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +6 sh2
+.* FUNC +GLOBAL DEFAULT +5 fn3
+.* TLS +GLOBAL DEFAULT +UND sg1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sg2
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index 80d2873af53..818d859e738 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -40,104 +40,100 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend
-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+b4e R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
-0+12124 +0+e4a R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
-0+12128 +0+e4c R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
-0+12134 +0+114e R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+24
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+30
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+64
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+50
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+70
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+44
+[0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0
+[0-9a-f ]+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+12174 +0+d15 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
+[0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
 
-Symbol table '.dynsym' contains 22 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[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 +10 *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[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-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
 
 Symbol table '.symtab' contains 55 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[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+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+120f8 +0 OBJECT +LOCAL  HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[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-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +HIDDEN +8 sH1
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +7 sh3
+.* TLS +LOCAL +HIDDEN +8 sH2
+.* TLS +LOCAL +HIDDEN +8 sH7
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh7
+.* TLS +LOCAL +HIDDEN +7 sh8
+.* TLS +LOCAL +HIDDEN +8 sH4
+.* TLS +LOCAL +HIDDEN +7 sh4
+.* TLS +LOCAL +HIDDEN +8 sH3
+.* TLS +LOCAL +HIDDEN +7 sh5
+.* TLS +LOCAL +HIDDEN +8 sH5
+.* TLS +LOCAL +HIDDEN +8 sH6
+.* TLS +LOCAL +HIDDEN +8 sH8
+.* TLS +LOCAL +HIDDEN +7 sh1
+.* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh2
+.* TLS +LOCAL +HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd
index 6b395a989a1..0033426c4f2 100644
--- a/ld/testsuite/ld-sparc/tlssunpic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -40,104 +40,100 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+102198 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+1021a8 +0+4f R_SPARC_TLS_TPOFF64 +0+24
-0+1021b0 +0+4f R_SPARC_TLS_TPOFF64 +0+30
-0+1021b8 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+1021c8 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+1021d8 +0+4f R_SPARC_TLS_TPOFF64 +0+64
-0+1021f8 +0+4f R_SPARC_TLS_TPOFF64 +0+50
-0+102200 +0+4f R_SPARC_TLS_TPOFF64 +0+70
-0+102210 +0+4b R_SPARC_TLS_DTPMOD64 +0+
-0+102220 +0+4f R_SPARC_TLS_TPOFF64 +0+44
-0+1021e0 +0+b0000004f R_SPARC_TLS_TPOFF64 +0+10 +sg5 \+ 0
-0+1021e8 +0+e0000004b R_SPARC_TLS_DTPMOD64 +0+ +sg1 \+ 0
-0+1021f0 +0+e0000004d R_SPARC_TLS_DTPOFF64 +0+ +sg1 \+ 0
-0+102208 +0+110000004f R_SPARC_TLS_TPOFF64 +0+4 +sg2 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+24
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+30
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+64
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+50
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+70
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+44
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+10 +sg5 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPMOD64 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_DTPOFF64 +0+ +sg1 \+ 0
+[0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+4 +sg2 \+ 0
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+102380 +0+d00000015 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
+[0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
 
-Symbol table '.dynsym' contains 22 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[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 +10 *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
- +[0-9]+: 0+102060 +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-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
 
 Symbol table '.symtab' contains 55 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +[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+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+102190 +0 OBJECT +LOCAL  HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +[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+102060 +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-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+.* NOTYPE +LOCAL +DEFAULT +UND *
+.* SECTION LOCAL +DEFAULT +1 *
+.* SECTION LOCAL +DEFAULT +2 *
+.* SECTION LOCAL +DEFAULT +3 *
+.* SECTION LOCAL +DEFAULT +4 *
+.* SECTION LOCAL +DEFAULT +5 *
+.* SECTION LOCAL +DEFAULT +6 *
+.* SECTION LOCAL +DEFAULT +7 *
+.* SECTION LOCAL +DEFAULT +8 *
+.* SECTION LOCAL +DEFAULT +9 *
+.* SECTION LOCAL +DEFAULT +10 *
+.* SECTION LOCAL +DEFAULT +11 *
+.* SECTION LOCAL +DEFAULT +12 *
+.* SECTION LOCAL +DEFAULT +13 *
+.* SECTION LOCAL +DEFAULT +14 *
+.* TLS +LOCAL +DEFAULT +7 sl1
+.* TLS +LOCAL +DEFAULT +7 sl2
+.* TLS +LOCAL +DEFAULT +7 sl3
+.* TLS +LOCAL +DEFAULT +7 sl4
+.* TLS +LOCAL +DEFAULT +7 sl5
+.* TLS +LOCAL +DEFAULT +7 sl6
+.* TLS +LOCAL +DEFAULT +7 sl7
+.* TLS +LOCAL +DEFAULT +7 sl8
+.* TLS +LOCAL +HIDDEN +8 sH1
+.* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
+.* TLS +LOCAL +HIDDEN +7 sh3
+.* TLS +LOCAL +HIDDEN +8 sH2
+.* TLS +LOCAL +HIDDEN +8 sH7
+.* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh7
+.* TLS +LOCAL +HIDDEN +7 sh8
+.* TLS +LOCAL +HIDDEN +8 sH4
+.* TLS +LOCAL +HIDDEN +7 sh4
+.* TLS +LOCAL +HIDDEN +8 sH3
+.* TLS +LOCAL +HIDDEN +7 sh5
+.* TLS +LOCAL +HIDDEN +8 sH5
+.* TLS +LOCAL +HIDDEN +8 sH6
+.* TLS +LOCAL +HIDDEN +8 sH8
+.* TLS +LOCAL +HIDDEN +7 sh1
+.* OBJECT +LOCAL  HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL +HIDDEN +7 sh2
+.* TLS +LOCAL +HIDDEN +7 sh6
+.* TLS +GLOBAL DEFAULT +7 sg8
+.* TLS +GLOBAL DEFAULT +7 sg3
+.* TLS +GLOBAL DEFAULT +7 sg4
+.* TLS +GLOBAL DEFAULT +7 sg5
+.* NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+.* TLS +GLOBAL DEFAULT +7 sg1
+.* FUNC +GLOBAL DEFAULT +6 fn1
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +7 sg2
+.* TLS +GLOBAL DEFAULT +7 sg6
+.* TLS +GLOBAL DEFAULT +7 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL DEFAULT +ABS _end