Adjust for dynamic sym changes.

4 files changed, 415 insertions, 423 deletions

diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
index a9a4267..c4439dc 100644
--- a/ld/testsuite/ld-s390/tlsbin.rd
+++ b/ld/testsuite/ld-s390/tlsbin.rd
@@ -10,21 +10,21 @@ There are 16 section headers, starting at offset 0x[0-9a-f]+:
 Section Headers:
   \[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
   \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1\] .interp +.*
-  \[ 2\] .hash +.*
-  \[ 3\] .dynsym +.*
-  \[ 4\] .dynstr +.*
-  \[ 5\] .rela.dyn +.*
-  \[ 6\] .rela.plt +.*
-  \[ 7\] .plt +.*
-  \[ 8\] .text +PROGBITS +.*
-  \[ 9\] .tdata +PROGBITS +0+401480 0+480 0+60 00 WAT +0 +0 +32
-  \[10\] .tbss +NOBITS +0+4014e0 0+4e0 0+40 00 WAT +0 +0 +1
-  \[11\] .dynamic +DYNAMIC +0+4014e0 0+4e0 0+a0 08 +WA +4 +0 +4
-  \[12\] .got +PROGBITS +0+401580 0+580 0+2c 04 +WA +0 +0 +4
-  \[13\] .shstrtab +.*
-  \[14\] .symtab +.*
-  \[15\] .strtab +.*
+  \[ 1\] .interp .*
+  \[ 2\] .hash .*
+  \[ 3\] .dynsym .*
+  \[ 4\] .dynstr .*
+  \[ 5\] .rela.dyn .*
+  \[ 6\] .rela.plt .*
+  \[ 7\] .plt .*
+  \[ 8\] .text +PROGBITS .*
+  \[ 9\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+  \[10\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1
+  \[11\] .dynamic +DYNAMIC .*
+  \[12\] .got +PROGBITS .*
+  \[13\] .shstrtab .*
+  \[14\] .symtab .*
+  \[15\] .strtab .*
 Key to Flags:
 .*
 .*
@@ -39,10 +39,10 @@ Program Headers:
   PHDR +0x0+34 0x0+400034 0x0+400034 0x0+c0 0x0+c0 R E 0x4
   INTERP +0x0+f4 0x0+4000f4 0x0+4000f4 0x0+11 0x0+11 R +0x1
 .*Requesting program interpreter.*
-  LOAD +0x0+ 0x0+400000 0x0+400000 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
-  LOAD +0x0+480 0x0+401480 0x0+401480 0x0+12c 0x0+12c RW  0x1000
-  DYNAMIC +0x0+4e0 0x0+4014e0 0x0+4014e0 0x0+a0 0x0+a0 RW  0x4
-  TLS +0x0+480 0x0+401480 0x0+401480 0x0+60 0x0+a0 R +0x20
+  LOAD .* R E 0x1000
+  LOAD .* RW  0x1000
+  DYNAMIC .* RW  0x4
+  TLS .* 0x0+60 0x0+a0 R +0x20
 
  Section to Segment mapping:
   Segment Sections...
@@ -53,97 +53,96 @@ Program Headers:
    04 +.dynamic *
    05 +.tdata .tbss *
 
-Relocation section '.rela.dyn' at offset 0x23c contains 4 entries:
+Relocation section '.rela.dyn' at offset .* contains 4 entries:
  Offset +Info +Type +Sym.Value  Sym. Name \+ Addend
-[0-9a-f]+  0+138 R_390_TLS_TPOFF +0+ +sG3 \+ 0
-[0-9a-f]+  0+338 R_390_TLS_TPOFF +0+ +sG2 \+ 0
-[0-9a-f]+  0+638 R_390_TLS_TPOFF +0+ +sG6 \+ 0
-[0-9a-f]+  0+738 R_390_TLS_TPOFF +0+ +sG1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG3 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG2 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG6 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ +sG1 \+ 0
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym.Value  Sym. Name \+ Addend
-[0-9a-f]+  0+40b R_390_JMP_SLOT +0+40+298 +__tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT[0-9a-f ]+__tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG3
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG2
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT  UND __tls_get_offset
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG1
- +[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 
+.* TLS +GLOBAL DEFAULT  UND sG3
+.* TLS +GLOBAL DEFAULT  UND sG2
+.* FUNC +GLOBAL DEFAULT  UND __tls_get_offset
+.* 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:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 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-9a-f]+ +0 SECTION LOCAL  DEFAULT +15 
- +[0-9]+: 0+20 +0 TLS +LOCAL  DEFAULT +9 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL  DEFAULT +9 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL  DEFAULT +9 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL  DEFAULT +9 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL  DEFAULT +9 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL  DEFAULT +9 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL  DEFAULT +9 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL  DEFAULT +9 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL  DEFAULT +10 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL  DEFAULT +10 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL  DEFAULT +10 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL  DEFAULT +10 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL  DEFAULT +10 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL  DEFAULT +10 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL  DEFAULT +10 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL  DEFAULT +10 bl8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG3
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG2
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT  UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +9 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-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 fn2
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL HIDDEN   12 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +10 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 
+.* SECTION LOCAL  DEFAULT +14 
+.* SECTION LOCAL  DEFAULT +15 
+.* TLS +LOCAL  DEFAULT +9 sl1
+.* TLS +LOCAL  DEFAULT +9 sl2
+.* TLS +LOCAL  DEFAULT +9 sl3
+.* TLS +LOCAL  DEFAULT +9 sl4
+.* TLS +LOCAL  DEFAULT +9 sl5
+.* TLS +LOCAL  DEFAULT +9 sl6
+.* TLS +LOCAL  DEFAULT +9 sl7
+.* TLS +LOCAL  DEFAULT +9 sl8
+.* TLS +LOCAL  DEFAULT +10 bl1
+.* TLS +LOCAL  DEFAULT +10 bl2
+.* TLS +LOCAL  DEFAULT +10 bl3
+.* TLS +LOCAL  DEFAULT +10 bl4
+.* TLS +LOCAL  DEFAULT +10 bl5
+.* TLS +LOCAL  DEFAULT +10 bl6
+.* TLS +LOCAL  DEFAULT +10 bl7
+.* TLS +LOCAL  DEFAULT +10 bl8
+.* TLS +GLOBAL DEFAULT  UND sG3
+.* TLS +GLOBAL DEFAULT +9 sg8
+.* TLS +GLOBAL DEFAULT +10 bg8
+.* TLS +GLOBAL DEFAULT +10 bg6
+.* TLS +GLOBAL DEFAULT +10 bg3
+.* OBJECT  GLOBAL HIDDEN +11 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +9 sg3
+.* TLS +GLOBAL HIDDEN +9 sh3
+.* TLS +GLOBAL DEFAULT  UND sG2
+.* TLS +GLOBAL DEFAULT +9 sg4
+.* TLS +GLOBAL DEFAULT +9 sg5
+.* TLS +GLOBAL DEFAULT +10 bg5
+.* TLS +GLOBAL HIDDEN +9 sh7
+.* TLS +GLOBAL HIDDEN +9 sh8
+.* FUNC +GLOBAL DEFAULT  UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +9 sg1
+.* FUNC +GLOBAL DEFAULT +8 _start
+.* TLS +GLOBAL HIDDEN +9 sh4
+.* TLS +GLOBAL DEFAULT +10 bg7
+.* TLS +GLOBAL HIDDEN +9 sh5
+.* NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+.* TLS +GLOBAL DEFAULT  UND sG6
+.* FUNC +GLOBAL DEFAULT +8 fn2
+.* TLS +GLOBAL DEFAULT +9 sg2
+.* TLS +GLOBAL DEFAULT  UND sG1
+.* TLS +GLOBAL HIDDEN +9 sh1
+.* TLS +GLOBAL DEFAULT +9 sg6
+.* TLS +GLOBAL DEFAULT +9 sg7
+.* NOTYPE  GLOBAL DEFAULT  ABS _edata
+.* OBJECT  GLOBAL HIDDEN   12 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE  GLOBAL DEFAULT  ABS _end
+.* TLS +GLOBAL HIDDEN +9 sh2
+.* TLS +GLOBAL HIDDEN +9 sh6
+.* TLS +GLOBAL DEFAULT +10 bg2
+.* TLS +GLOBAL DEFAULT +10 bg1
+.* TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
index 4855b81..aff1eca 100644
--- a/ld/testsuite/ld-s390/tlsbin_64.rd
+++ b/ld/testsuite/ld-s390/tlsbin_64.rd
@@ -10,21 +10,21 @@ There are 16 section headers, starting at offset 0x[0-9a-f]+:
 Section Headers:
   \[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
   \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1\] .interp +.*
-  \[ 2\] .hash +.*
-  \[ 3\] .dynsym +.*
-  \[ 4\] .dynstr +.*
-  \[ 5\] .rela.dyn +.*
-  \[ 6\] .rela.plt +.*
-  \[ 7\] .plt +.*
-  \[ 8\] .text +PROGBITS +.*
-  \[ 9\] .tdata +PROGBITS +0+800016e0 0+6e0 0+60 00 WAT +0 +0 +32
-  \[10\] .tbss +NOBITS +0+80001740 0+740 0+40 00 WAT +0 +0 +1
-  \[11\] .dynamic +DYNAMIC +0+80001740 0+740 0+140 10 +WA +4 +0 +8
-  \[12\] .got +PROGBITS +0+80001880 0+880 0+78 08 +WA +0 +0 +8
-  \[13\] .shstrtab +.*
-  \[14\] .symtab +.*
-  \[15\] .strtab +.*
+  \[ 1\] .interp .*
+  \[ 2\] .hash .*
+  \[ 3\] .dynsym .*
+  \[ 4\] .dynstr .*
+  \[ 5\] .rela.dyn .*
+  \[ 6\] .rela.plt .*
+  \[ 7\] .plt .*
+  \[ 8\] .text +PROGBITS .*
+  \[ 9\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+  \[10\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1
+  \[11\] .dynamic +DYNAMIC .*
+  \[12\] .got +PROGBITS .*
+  \[13\] .shstrtab .*
+  \[14\] .symtab .*
+  \[15\] .strtab .*
 Key to Flags:
 .*
 .*
@@ -39,10 +39,10 @@ Program Headers:
   PHDR +0x0+40 0x0+80000040 0x0+80000040 0x0+150 0x0+150 R E 0x8
   INTERP +0x0+190 0x0+80000190 0x0+80000190 0x0+11 0x0+11 R +0x1
 .*Requesting program interpreter.*
-  LOAD +0x0+ 0x0+80000000 0x0+80000000 0x0+6e0 0x0+6e0 R E 0x1000
-  LOAD +0x0+6e0 0x0+800016e0 0x0+800016e0 0x0+218 0x0+218 RW  0x1000
-  DYNAMIC +0x0+740 0x0+80001740 0x0+80001740 0x0+140 0x0+140 RW  0x8
-  TLS +0x0+6e0 0x0+800016e0 0x0+800016e0 0x0+60 0x0+a0 R +0x20
+  LOAD .* R E 0x1000
+  LOAD .* RW  0x1000
+  DYNAMIC .* RW  0x8
+  TLS .* 0x0+60 0x0+a0 R +0x20
 
  Section to Segment mapping:
   Segment Sections...
@@ -55,95 +55,94 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+10+38 R_390_TLS_TPOFF +0+ sG3 \+ 0
-[0-9a-f]+ +0+30+38 R_390_TLS_TPOFF +0+ sG2 \+ 0
-[0-9a-f]+ +0+60+38 R_390_TLS_TPOFF +0+ sG6 \+ 0
-[0-9a-f]+ +0+70+38 R_390_TLS_TPOFF +0+ sG1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG3 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG2 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG6 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+ sG1 \+ 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-9a-f]+ +0+40+b R_390_JMP_SLOT +0+80+408 __tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT[0-9a-f ]+__tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_offset
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[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 
+.* TLS +GLOBAL DEFAULT +UND sG3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_offset
+.* 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:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 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-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 
- +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +9 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +9 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +9 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +9 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +9 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +9 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +9 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +9 sl8
- +[0-9]+: 0+80 +0 TLS +LOCAL +DEFAULT +10 bl1
- +[0-9]+: 0+84 +0 TLS +LOCAL +DEFAULT +10 bl2
- +[0-9]+: 0+88 +0 TLS +LOCAL +DEFAULT +10 bl3
- +[0-9]+: 0+8c +0 TLS +LOCAL +DEFAULT +10 bl4
- +[0-9]+: 0+90 +0 TLS +LOCAL +DEFAULT +10 bl5
- +[0-9]+: 0+94 +0 TLS +LOCAL +DEFAULT +10 bl6
- +[0-9]+: 0+98 +0 TLS +LOCAL +DEFAULT +10 bl7
- +[0-9]+: 0+9c +0 TLS +LOCAL +DEFAULT +10 bl8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG3
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 _start
- +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +9 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-9a-f]+ +0 FUNC +GLOBAL DEFAULT +8 fn2
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +12 _GLOBAL_OFFSET_TABLE_
- +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +10 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 
+.* SECTION LOCAL +DEFAULT +14 
+.* SECTION LOCAL +DEFAULT +15 
+.* TLS +LOCAL +DEFAULT +9 sl1
+.* TLS +LOCAL +DEFAULT +9 sl2
+.* TLS +LOCAL +DEFAULT +9 sl3
+.* TLS +LOCAL +DEFAULT +9 sl4
+.* TLS +LOCAL +DEFAULT +9 sl5
+.* TLS +LOCAL +DEFAULT +9 sl6
+.* TLS +LOCAL +DEFAULT +9 sl7
+.* TLS +LOCAL +DEFAULT +9 sl8
+.* TLS +LOCAL +DEFAULT +10 bl1
+.* TLS +LOCAL +DEFAULT +10 bl2
+.* TLS +LOCAL +DEFAULT +10 bl3
+.* TLS +LOCAL +DEFAULT +10 bl4
+.* TLS +LOCAL +DEFAULT +10 bl5
+.* TLS +LOCAL +DEFAULT +10 bl6
+.* TLS +LOCAL +DEFAULT +10 bl7
+.* TLS +LOCAL +DEFAULT +10 bl8
+.* TLS +GLOBAL DEFAULT +UND sG3
+.* TLS +GLOBAL DEFAULT +9 sg8
+.* TLS +GLOBAL DEFAULT +10 bg8
+.* TLS +GLOBAL DEFAULT +10 bg6
+.* TLS +GLOBAL DEFAULT +10 bg3
+.* OBJECT +GLOBAL HIDDEN +11 _DYNAMIC
+.* TLS +GLOBAL DEFAULT +9 sg3
+.* TLS +GLOBAL HIDDEN +9 sh3
+.* TLS +GLOBAL DEFAULT +UND sG2
+.* TLS +GLOBAL DEFAULT +9 sg4
+.* TLS +GLOBAL DEFAULT +9 sg5
+.* TLS +GLOBAL DEFAULT +10 bg5
+.* TLS +GLOBAL HIDDEN +9 sh7
+.* TLS +GLOBAL HIDDEN +9 sh8
+.* FUNC +GLOBAL DEFAULT +UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +9 sg1
+.* FUNC +GLOBAL DEFAULT +8 _start
+.* TLS +GLOBAL HIDDEN +9 sh4
+.* TLS +GLOBAL DEFAULT +10 bg7
+.* TLS +GLOBAL HIDDEN +9 sh5
+.* NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+.* TLS +GLOBAL DEFAULT +UND sG6
+.* FUNC +GLOBAL DEFAULT +8 fn2
+.* TLS +GLOBAL DEFAULT +9 sg2
+.* TLS +GLOBAL DEFAULT +UND sG1
+.* TLS +GLOBAL HIDDEN +9 sh1
+.* TLS +GLOBAL DEFAULT +9 sg6
+.* TLS +GLOBAL DEFAULT +9 sg7
+.* NOTYPE +GLOBAL DEFAULT +ABS _edata
+.* OBJECT +GLOBAL HIDDEN +12 _GLOBAL_OFFSET_TABLE_
+.* NOTYPE +GLOBAL DEFAULT +ABS _end
+.* TLS +GLOBAL HIDDEN +9 sh2
+.* TLS +GLOBAL HIDDEN +9 sh6
+.* TLS +GLOBAL DEFAULT +10 bg2
+.* TLS +GLOBAL DEFAULT +10 bg1
+.* TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index fd0a5aa..c8ddd91 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -10,20 +10,20 @@ 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
   \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0  0
-  \[ 1\] .hash +.*
-  \[ 2\] .dynsym +.*
-  \[ 3\] .dynstr +.*
-  \[ 4\] .rela.dyn +.*
-  \[ 5\] .rela.plt +.*
-  \[ 6\] .plt +.*
-  \[ 7\] .text +PROGBITS +.*
-  \[ 8\] .tdata +PROGBITS +0+15c0 0+5c0 0+60 00 WAT  0 +0 32
-  \[ 9\] .tbss +NOBITS +0+1620 0+620 0+20 00 WAT  0 +0  1
-  \[10\] .dynamic +DYNAMIC +0+1620 0+620 0+98 08  WA  3 +0  4
-  \[11\] .got +PROGBITS +0+16b8 0+6b8 0+58 04  WA  0 +0  4
-  \[12\] .shstrtab +.*
-  \[13\] .symtab +.*
-  \[14\] .strtab +.*
+  \[ 1\] .hash .*
+  \[ 2\] .dynsym .*
+  \[ 3\] .dynstr .*
+  \[ 4\] .rela.dyn .*
+  \[ 5\] .rela.plt .*
+  \[ 6\] .plt .*
+  \[ 7\] .text +PROGBITS .*
+  \[ 8\] .tdata +PROGBITS .* 0+60 00 WAT  0 +0 32
+  \[ 9\] .tbss +NOBITS .* 0+20 00 WAT  0 +0  1
+  \[10\] .dynamic +DYNAMIC .*
+  \[11\] .got +PROGBITS .*
+  \[12\] .shstrtab .*
+  \[13\] .symtab .*
+  \[14\] .strtab .*
 Key to Flags:
 .*
 .*
@@ -35,10 +35,10 @@ There are 4 program headers, starting at offset [0-9]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz  Flg Align
-  LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
-  LOAD +0x0+5c0 0x0+15c0 0x0+15c0 0x00150 0x00150 RW  0x1000
-  DYNAMIC +0x0+620 0x0+1620 0x0+1620 0x0+98 0x0+98 RW  0x4
-  TLS +0x0+5c0 0x0+15c0 0x0+15c0 0x0+60 0x0+80 R +0x20
+  LOAD .* R E 0x1000
+  LOAD .* RW  0x1000
+  DYNAMIC .* RW  0x4
+  TLS .* 0x0+60 0x0+80 R +0x20
 
  Section to Segment mapping:
   Segment Sections...
@@ -49,101 +49,98 @@ Program Headers:
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries:
  Offset +Info +Type +Sym.Value  Sym. Name \+ Addend
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+24
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+30
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+64
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+50
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+70
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+44
-[0-9a-f]+  0+a38 R_390_TLS_TPOFF +0+10 +sg5 \+ 0
-[0-9a-f]+  0+c36 R_390_TLS_DTPMOD  0+ +sg1 \+ 0
-[0-9a-f]+  0+c37 R_390_TLS_DTPOFF  0+ +sg1 \+ 0
-[0-9a-f]+  0+f38 R_390_TLS_TPOFF +0+4 +sg2 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+24
+[0-9a-f ]+R_390_TLS_TPOFF +0+30
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+64
+[0-9a-f ]+R_390_TLS_TPOFF +0+50
+[0-9a-f ]+R_390_TLS_TPOFF +0+70
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+44
+[0-9a-f ]+R_390_TLS_TPOFF +0+10 +sg5 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD  0+ +sg1 \+ 0
+[0-9a-f ]+R_390_TLS_DTPOFF  0+ +sg1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +0+4 +sg2 \+ 0
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym.Value  Sym. Name \+ Addend
-[0-9a-f]+  0+b0b R_390_JMP_SLOT +0+ +__tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT +0+ +__tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains 20 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[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+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[0-9]+: 0+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +8 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 +7 
+.* SECTION LOCAL  DEFAULT +8 
+.* SECTION LOCAL  DEFAULT +9 
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE  GLOBAL DEFAULT  ABS _edata
+.* NOTYPE  GLOBAL DEFAULT  ABS _end
 
 Symbol table '.symtab' contains 54 entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 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 +8 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL  DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL  DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL  DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL  DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL  DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL  DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL  DEFAULT +8 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL  HIDDEN +9 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL  HIDDEN +8 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL  HIDDEN +9 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL  HIDDEN +9 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL  HIDDEN +8 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL  HIDDEN +8 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL  HIDDEN +9 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL  HIDDEN +8 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL  HIDDEN +9 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL  HIDDEN +8 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL  HIDDEN +9 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL  HIDDEN +9 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL  HIDDEN +9 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL  HIDDEN +8 sh1
- +[0-9]+: [0-9a-f]+ +0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL  HIDDEN +8 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL  HIDDEN +8 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +8 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 +8 sl1
+.* TLS +LOCAL  DEFAULT +8 sl2
+.* TLS +LOCAL  DEFAULT +8 sl3
+.* TLS +LOCAL  DEFAULT +8 sl4
+.* TLS +LOCAL  DEFAULT +8 sl5
+.* TLS +LOCAL  DEFAULT +8 sl6
+.* TLS +LOCAL  DEFAULT +8 sl7
+.* TLS +LOCAL  DEFAULT +8 sl8
+.* TLS +LOCAL  HIDDEN +9 sH1
+.* OBJECT  LOCAL  HIDDEN  ABS _DYNAMIC
+.* TLS +LOCAL  HIDDEN +8 sh3
+.* TLS +LOCAL  HIDDEN +9 sH2
+.* TLS +LOCAL  HIDDEN +9 sH7
+.* TLS +LOCAL  HIDDEN +8 sh7
+.* TLS +LOCAL  HIDDEN +8 sh8
+.* TLS +LOCAL  HIDDEN +9 sH4
+.* TLS +LOCAL  HIDDEN +8 sh4
+.* TLS +LOCAL  HIDDEN +9 sH3
+.* TLS +LOCAL  HIDDEN +8 sh5
+.* TLS +LOCAL  HIDDEN +9 sH5
+.* TLS +LOCAL  HIDDEN +9 sH6
+.* TLS +LOCAL  HIDDEN +9 sH8
+.* TLS +LOCAL  HIDDEN +8 sh1
+.* OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL  HIDDEN +8 sh2
+.* TLS +LOCAL  HIDDEN +8 sh6
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE  GLOBAL DEFAULT  ABS _edata
+.* NOTYPE  GLOBAL DEFAULT  ABS _end
diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index 6d7cbd8..ec6b5a3 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -10,20 +10,20 @@ 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
   \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] .hash +.*
-  \[ 2\] .dynsym +.*
-  \[ 3\] .dynstr +.*
-  \[ 4\] .rela.dyn +.*
-  \[ 5\] .rela.plt +.*
-  \[ 6\] .plt +.*
-  \[ 7\] .text +PROGBITS +.*
-  \[ 8\] .tdata +PROGBITS +0+18c0 0+8c0 0+60 00 WAT +0 +0 +32
-  \[ 9\] .tbss +NOBITS +0+1920 0+920 0+20 00 WAT +0 +0 +1
-  \[10\] .dynamic +DYNAMIC +0+1920 0+920 0+130 10 +WA +3 +0 +8
-  \[11\] .got +PROGBITS +0+1a50 0+a50 0+b0 08 +WA +0 +0 +8
-  \[12\] .shstrtab +.*
-  \[13\] .symtab +.*
-  \[14\] .strtab +.*
+  \[ 1\] .hash .*
+  \[ 2\] .dynsym .*
+  \[ 3\] .dynstr .*
+  \[ 4\] .rela.dyn .*
+  \[ 5\] .rela.plt .*
+  \[ 6\] .plt .*
+  \[ 7\] .text +PROGBITS .*
+  \[ 8\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+  \[ 9\] .tbss +NOBITS .* 0+20 00 WAT +0 +0 +1
+  \[10\] .dynamic +DYNAMIC .*
+  \[11\] .got +PROGBITS .*
+  \[12\] .shstrtab .*
+  \[13\] .symtab .*
+  \[14\] .strtab .*
 Key to Flags:
 .*
 .*
@@ -35,10 +35,10 @@ There are 4 program headers, starting at offset [0-9]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-  LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
-  LOAD +0x0+8c0 0x0+18c0 0x0+18c0 0x0+240 0x0+240 RW +0x1000
-  DYNAMIC +0x0+920 0x0+1920 0x0+1920 0x0+130 0x0+130 RW +0x8
-  TLS +0x0+8c0 0x0+18c0 0x0+18c0 0x0+60 0x0+80 R +0x20
+  LOAD .* R E 0x1000
+  LOAD .* RW +0x1000
+  DYNAMIC .* RW +0x8
+  TLS .* 0x0+60 0x0+80 R +0x20
 
  Section to Segment mapping:
   Segment Sections...
@@ -49,101 +49,98 @@ 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-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+24
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+30
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+64
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+50
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+70
-[0-9a-f]+  0+36 R_390_TLS_DTPMOD +0+
-[0-9a-f]+  0+38 R_390_TLS_TPOFF +0+44
-[0-9a-f]+  0+a0+38 R_390_TLS_TPOFF +0+10 sg5 \+ 0
-[0-9a-f]+  0+c0+36 R_390_TLS_DTPMOD +0+ sg1 \+ 0
-[0-9a-f]+  0+c0+37 R_390_TLS_DTPOFF +0+ sg1 \+ 0
-[0-9a-f]+  0+f0+38 R_390_TLS_TPOFF +0+4 sg2 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+24
+[0-9a-f ]+R_390_TLS_TPOFF +0+30
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+64
+[0-9a-f ]+R_390_TLS_TPOFF +0+50
+[0-9a-f ]+R_390_TLS_TPOFF +0+70
+[0-9a-f ]+R_390_TLS_DTPMOD +0+
+[0-9a-f ]+R_390_TLS_TPOFF +0+44
+[0-9a-f ]+R_390_TLS_TPOFF +0+10 sg5 \+ 0
+[0-9a-f ]+R_390_TLS_DTPMOD +0+ sg1 \+ 0
+[0-9a-f ]+R_390_TLS_DTPOFF +0+ sg1 \+ 0
+[0-9a-f ]+R_390_TLS_TPOFF +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-9a-f]+  0+b0+b R_390_JMP_SLOT +0+ __tls_get_offset \+ 0
+[0-9a-f ]+R_390_JMP_SLOT +0+ __tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains 20 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 0+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[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+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[0-9]+: 0+ +0 NOTYPE  LOCAL  DEFAULT  UND 
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +8 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 +7 
+.* SECTION LOCAL  DEFAULT +8 
+.* SECTION LOCAL  DEFAULT +9 
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE  GLOBAL DEFAULT  ABS _edata
+.* NOTYPE  GLOBAL DEFAULT  ABS _end
 
 Symbol table '.symtab' contains 54 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +[0-9]+: 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 +8 sl1
- +[0-9]+: 0+24 +0 TLS +LOCAL  DEFAULT +8 sl2
- +[0-9]+: 0+28 +0 TLS +LOCAL  DEFAULT +8 sl3
- +[0-9]+: 0+2c +0 TLS +LOCAL  DEFAULT +8 sl4
- +[0-9]+: 0+30 +0 TLS +LOCAL  DEFAULT +8 sl5
- +[0-9]+: 0+34 +0 TLS +LOCAL  DEFAULT +8 sl6
- +[0-9]+: 0+38 +0 TLS +LOCAL  DEFAULT +8 sl7
- +[0-9]+: 0+3c +0 TLS +LOCAL  DEFAULT +8 sl8
- +[0-9]+: 0+60 +0 TLS +LOCAL  HIDDEN +9 sH1
- +[0-9]+: 0+48 +0 TLS +LOCAL  HIDDEN +8 sh3
- +[0-9]+: 0+64 +0 TLS +LOCAL  HIDDEN +9 sH2
- +[0-9]+: 0+78 +0 TLS +LOCAL  HIDDEN +9 sH7
- +[0-9]+: 0+58 +0 TLS +LOCAL  HIDDEN +8 sh7
- +[0-9]+: 0+5c +0 TLS +LOCAL  HIDDEN +8 sh8
- +[0-9]+: 0+6c +0 TLS +LOCAL  HIDDEN +9 sH4
- +[0-9]+: 0+4c +0 TLS +LOCAL  HIDDEN +8 sh4
- +[0-9]+: 0+68 +0 TLS +LOCAL  HIDDEN +9 sH3
- +[0-9]+: 0+50 +0 TLS +LOCAL  HIDDEN +8 sh5
- +[0-9]+: 0+70 +0 TLS +LOCAL  HIDDEN +9 sH5
- +[0-9]+: 0+74 +0 TLS +LOCAL  HIDDEN +9 sH6
- +[0-9]+: 0+7c +0 TLS +LOCAL  HIDDEN +9 sH8
- +[0-9]+: 0+40 +0 TLS +LOCAL  HIDDEN +8 sh1
- +[0-9]+: [0-9a-f]+ +0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
- +[0-9]+: 0+44 +0 TLS +LOCAL  HIDDEN +8 sh2
- +[0-9]+: 0+54 +0 TLS +LOCAL  HIDDEN +8 sh6
- +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +[0-9]+: 0+ +0 NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +7 fn1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
- +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +8 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 +8 sl1
+.* TLS +LOCAL  DEFAULT +8 sl2
+.* TLS +LOCAL  DEFAULT +8 sl3
+.* TLS +LOCAL  DEFAULT +8 sl4
+.* TLS +LOCAL  DEFAULT +8 sl5
+.* TLS +LOCAL  DEFAULT +8 sl6
+.* TLS +LOCAL  DEFAULT +8 sl7
+.* TLS +LOCAL  DEFAULT +8 sl8
+.* TLS +LOCAL  HIDDEN +9 sH1
+.* OBJECT  LOCAL  HIDDEN  ABS _DYNAMIC
+.* TLS +LOCAL  HIDDEN +8 sh3
+.* TLS +LOCAL  HIDDEN +9 sH2
+.* TLS +LOCAL  HIDDEN +9 sH7
+.* TLS +LOCAL  HIDDEN +8 sh7
+.* TLS +LOCAL  HIDDEN +8 sh8
+.* TLS +LOCAL  HIDDEN +9 sH4
+.* TLS +LOCAL  HIDDEN +8 sh4
+.* TLS +LOCAL  HIDDEN +9 sH3
+.* TLS +LOCAL  HIDDEN +8 sh5
+.* TLS +LOCAL  HIDDEN +9 sH5
+.* TLS +LOCAL  HIDDEN +9 sH6
+.* TLS +LOCAL  HIDDEN +9 sH8
+.* TLS +LOCAL  HIDDEN +8 sh1
+.* OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
+.* TLS +LOCAL  HIDDEN +8 sh2
+.* TLS +LOCAL  HIDDEN +8 sh6
+.* TLS +GLOBAL DEFAULT +8 sg8
+.* TLS +GLOBAL DEFAULT +8 sg3
+.* TLS +GLOBAL DEFAULT +8 sg4
+.* TLS +GLOBAL DEFAULT +8 sg5
+.* NOTYPE  GLOBAL DEFAULT  UND __tls_get_offset
+.* TLS +GLOBAL DEFAULT +8 sg1
+.* FUNC +GLOBAL DEFAULT +7 fn1
+.* NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+.* TLS +GLOBAL DEFAULT +8 sg2
+.* TLS +GLOBAL DEFAULT +8 sg6
+.* TLS +GLOBAL DEFAULT +8 sg7
+.* NOTYPE  GLOBAL DEFAULT  ABS _edata
+.* NOTYPE  GLOBAL DEFAULT  ABS _end