Adjust for dynamic sym changes.

1 files changed, 88 insertions, 89 deletions

diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd
index e13b04a..286fbf2 100644
--- a/ld/testsuite/ld-x86-64/tlspic.rd
+++ b/ld/testsuite/ld-x86-64/tlspic.rd
@@ -50,100 +50,99 @@ 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+101340  0+10 R_X86_64_DTPMOD64 +0+
-0+101350  0+12 R_X86_64_TPOFF64 +0+24
-0+101358  0+12 R_X86_64_TPOFF64 +0+30
-0+101360  0+10 R_X86_64_DTPMOD64 +0+
-0+101370  0+10 R_X86_64_DTPMOD64 +0+
-0+101380  0+12 R_X86_64_TPOFF64 +0+64
-0+1013a0  0+12 R_X86_64_TPOFF64 +0+50
-0+1013a8  0+12 R_X86_64_TPOFF64 +0+70
-0+1013b8  0+10 R_X86_64_DTPMOD64 +0+
-0+1013c8  0+12 R_X86_64_TPOFF64 +0+44
-0+101388  0+800000012 R_X86_64_TPOFF64 +0+10 sg5 \+ 0
-0+101390  0+a00000010 R_X86_64_DTPMOD64 +0+ sg1 \+ 0
-0+101398  0+a00000011 R_X86_64_DTPOFF64 +0+ sg1 \+ 0
-0+1013b0  0+d00000012 R_X86_64_TPOFF64 +0+4 sg2 \+ 0
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_TPOFF64 +0+24
+[0-9a-f ]+R_X86_64_TPOFF64 +0+30
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_TPOFF64 +0+64
+[0-9a-f ]+R_X86_64_TPOFF64 +0+50
+[0-9a-f ]+R_X86_64_TPOFF64 +0+70
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+
+[0-9a-f ]+R_X86_64_TPOFF64 +0+44
+[0-9a-f ]+R_X86_64_TPOFF64 +0+10 sg5 \+ 0
+[0-9a-f ]+R_X86_64_DTPMOD64 +0+ sg1 \+ 0
+[0-9a-f ]+R_X86_64_DTPOFF64 +0+ sg1 \+ 0
+[0-9a-f ]+R_X86_64_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+[0-9a-f]+  0+900000007 R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
+[0-9a-f ]+R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0
 
-Symbol table '.dynsym' contains 18 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+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[0-9]+: 0+101210 +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_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: 0+1000 +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_addr
+.* 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 55 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 +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+1013d0 +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+101210 +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_addr
- +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +[0-9]+: 0+1000 +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 *
+.* SECTION LOCAL  DEFAULT +15 *
+.* 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_addr
+.* 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