Tolerate some whitespace differences in readelf output.

8 files changed, 286 insertions, 286 deletions

diff --git a/ld/testsuite/ld-sparc/gotop32.rd b/ld/testsuite/ld-sparc/gotop32.rd
index e4b4295..f4b576f 100644
--- a/ld/testsuite/ld-sparc/gotop32.rd
+++ b/ld/testsuite/ld-sparc/gotop32.rd
@@ -38,33 +38,33 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 [0-9a-f ]+R_SPARC_GLOB_DAT +0+13000 +sym \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION LOCAL +DEFAULT +5 *
-.* SECTION LOCAL +DEFAULT +7 *
-.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* FUNC +GLOBAL DEFAULT +5 foo
-.* NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* NOTYPE +GLOBAL DEFAULT +ABS _end
-.* NOTYPE +GLOBAL DEFAULT +8 sym
+.* SECTION +LOCAL +DEFAULT +5 *
+.* SECTION +LOCAL +DEFAULT +7 *
+.* NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
+.* FUNC +GLOBAL +DEFAULT +5 foo
+.* NOTYPE +GLOBAL +DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL +DEFAULT +ABS _end
+.* NOTYPE +GLOBAL +DEFAULT +8 sym
 
 Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 *
 .* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
 .* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
-.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* FUNC +GLOBAL DEFAULT +5 foo
-.* NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* NOTYPE +GLOBAL DEFAULT +ABS _end
-.* NOTYPE +GLOBAL DEFAULT +8 sym
+.* NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
+.* FUNC +GLOBAL +DEFAULT +5 foo
+.* NOTYPE +GLOBAL +DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL +DEFAULT +ABS _end
+.* NOTYPE +GLOBAL +DEFAULT +8 sym
 
diff --git a/ld/testsuite/ld-sparc/gotop64.rd b/ld/testsuite/ld-sparc/gotop64.rd
index 24cf94f..06f71fe 100644
--- a/ld/testsuite/ld-sparc/gotop64.rd
+++ b/ld/testsuite/ld-sparc/gotop64.rd
@@ -38,33 +38,33 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 [0-9a-f ]+R_SPARC_GLOB_DAT +0+103000 +sym \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION LOCAL +DEFAULT +5 *
-.* SECTION LOCAL +DEFAULT +7 *
-.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* FUNC +GLOBAL DEFAULT +5 foo
-.* NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* NOTYPE +GLOBAL DEFAULT +ABS _end
-.* NOTYPE +GLOBAL DEFAULT +8 sym
+.* SECTION +LOCAL +DEFAULT +5 *
+.* SECTION +LOCAL +DEFAULT +7 *
+.* NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
+.* FUNC +GLOBAL +DEFAULT +5 foo
+.* NOTYPE +GLOBAL +DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL +DEFAULT +ABS _end
+.* NOTYPE +GLOBAL +DEFAULT +8 sym
 
 Symbol table '\.symtab' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 *
 .* OBJECT +LOCAL +HIDDEN +ABS _DYNAMIC
 .* OBJECT +LOCAL +HIDDEN +ABS _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
-.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
-.* FUNC +GLOBAL DEFAULT +5 foo
-.* NOTYPE +GLOBAL DEFAULT +ABS _edata
-.* NOTYPE +GLOBAL DEFAULT +ABS _end
-.* NOTYPE +GLOBAL DEFAULT +8 sym
+.* NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
+.* FUNC +GLOBAL +DEFAULT +5 foo
+.* NOTYPE +GLOBAL +DEFAULT +ABS _edata
+.* NOTYPE +GLOBAL +DEFAULT +ABS _end
+.* NOTYPE +GLOBAL +DEFAULT +8 sym
 
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index 3af973e..e5fbf08 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -47,30 +47,30 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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
+.* 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 [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 *
 .* TLS +LOCAL +DEFAULT +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -90,37 +90,37 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* OBJECT +LOCAL +HIDDEN +9 _DYNAMIC
 .* OBJECT +LOCAL +HIDDEN +10 _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
-.* 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
-.* 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
-.* 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
-.* 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
+.* 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
+.* 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
+.* 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
+.* 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 1738639..50a98c1 100644
--- a/ld/testsuite/ld-sparc/tlssunbin64.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin64.rd
@@ -47,30 +47,30 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG1 \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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
+.* 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 [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 .* 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 +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 *
 .* TLS +LOCAL +DEFAULT +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -90,37 +90,37 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* OBJECT +LOCAL +HIDDEN +9 _DYNAMIC
 .* OBJECT +LOCAL +HIDDEN +10 _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
-.* 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
-.* 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
-.* 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
-.* 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
+.* 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
+.* 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
+.* 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
+.* 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 01876d7..04797b1 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -50,29 +50,29 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries:
 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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
+.* 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 [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 *
 .* TLS +LOCAL +DEFAULT +6 bl1
 .* TLS +LOCAL +DEFAULT +6 bl2
 .* TLS +LOCAL +DEFAULT +6 bl3
@@ -85,9 +85,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* 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
+.* 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 96a426c..44c09e9 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -52,29 +52,29 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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
+.* 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 [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 *
 .* TLS +LOCAL +DEFAULT +6 bl1
 .* TLS +LOCAL +DEFAULT +6 bl2
 .* TLS +LOCAL +DEFAULT +6 bl3
@@ -87,9 +87,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* 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
+.* 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 f947a3c..46f0163 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -60,39 +60,39 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
 [0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION LOCAL +DEFAULT +6 *
-.* SECTION LOCAL +DEFAULT +7 *
-.* 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
+.* SECTION +LOCAL +DEFAULT +6 *
+.* SECTION +LOCAL +DEFAULT +7 *
+.* 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 [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -120,16 +120,16 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* 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
+.* 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 e063358..44d468b 100644
--- a/ld/testsuite/ld-sparc/tlssunpic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -60,39 +60,39 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
 [0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* NOTYPE +LOCAL +DEFAULT +UND *
-.* SECTION LOCAL +DEFAULT +6 *
-.* SECTION LOCAL +DEFAULT +7 *
-.* 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
+.* SECTION +LOCAL +DEFAULT +6 *
+.* SECTION +LOCAL +DEFAULT +7 *
+.* 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 [0-9]+ entries:
- +Num: +Value +Size Type +Bind +Vis +Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 .* 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 +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 +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -117,19 +117,19 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +HIDDEN +8 sH6
 .* TLS +LOCAL +HIDDEN +8 sH8
 .* TLS +LOCAL +HIDDEN +7 sh1
-.* OBJECT +LOCAL  HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+.* 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
+.* 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