Adjust for dynamic sym changes.

1 files changed, 84 insertions, 85 deletions

diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd
index 2960ae4..7a0c9a0 100644
--- a/ld/testsuite/ld-x86-64/tlsbin.rd
+++ b/ld/testsuite/ld-x86-64/tlsbin.rd
@@ -56,96 +56,95 @@ 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+5013d0  0+100000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0
-0+5013d8  0+300000012 R_X86_64_TPOFF64 +0+ sG2 \+ 0
-0+5013e0  0+600000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0
-0+5013e8  0+700000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG5 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG2 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +0+ sG6 \+ 0
+[0-9a-f ]+R_X86_64_TPOFF64 +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+[0-9a-f]+  0+400000007 R_X86_64_JUMP_SLOT +0+[0-9a-f]+ __tls_get_addr \+ 0
+[0-9a-f ]+R_X86_64_JUMP_SLOT[0-9a-f ]+__tls_get_addr \+ 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 sG5
- +[0-9]+: 0+501290 +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG2
- +[0-9]+: 0+[0-9a-f]+ +0 FUNC +GLOBAL DEFAULT  UND __tls_get_addr
- +[0-9]+: 0+[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+[0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT  ABS _edata
- +[0-9]+: 0+[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 69 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-9a-f]+ +0 SECTION LOCAL  DEFAULT +16 *
- +[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+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+ +0 TLS +GLOBAL DEFAULT  UND sG5
- +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: 0+501290 +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-9a-f]+ +0 FUNC +GLOBAL DEFAULT  UND __tls_get_addr
- +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +[0-9]+: 0+40113c +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+401000 +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+5013f0 +0 OBJECT  GLOBAL HIDDEN   13 _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 *
+.* SECTION LOCAL  DEFAULT +16 *
+.* 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 +9 sg8
+.* TLS +GLOBAL DEFAULT +10 bg8
+.* TLS +GLOBAL DEFAULT +10 bg6
+.* TLS +GLOBAL DEFAULT  UND sG5
+.* 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
+.* FUNC +GLOBAL DEFAULT  UND __tls_get_addr
+.* TLS +GLOBAL HIDDEN +9 sh7
+.* TLS +GLOBAL HIDDEN +9 sh8
+.* 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   13 _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