Adjust for dynamic sym changes.

3 files changed, 16 insertions, 19 deletions

diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
index 5af0515..544538d 100644
--- a/ld/testsuite/ld-i386/tlsbin.rd
+++ b/ld/testsuite/ld-i386/tlsbin.rd
@@ -56,26 +56,25 @@ Program Headers:
 
 Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries:
  Offset +Info +Type +Sym.Value +Sym. Name
-0+804a100  0000010e R_386_TLS_TPOFF +0+ +sG3
-0+804a104  0000020e R_386_TLS_TPOFF +0+ +sG5
-0+804a108  0000040e R_386_TLS_TPOFF +0+ +sG7
-0+804a10c  00000525 R_386_TLS_TPOFF32 0+ +sG2
-0+804a110  00000625 R_386_TLS_TPOFF32 0+ +sG4
-0+804a114  0000060e R_386_TLS_TPOFF +0+ +sG4
-0+804a118  00000825 R_386_TLS_TPOFF32 0+ +sG6
-0+804a11c  00000925 R_386_TLS_TPOFF32 0+ +sG1
-0+804a120  00000c0e R_386_TLS_TPOFF +0+ +sG8
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG3
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG5
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG7
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG2
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG4
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG4
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG6
+[0-9a-f ]+R_386_TLS_TPOFF32 0+ +sG1
+[0-9a-f ]+R_386_TLS_TPOFF +0+ +sG8
 
 Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym.Value  Sym. Name
-0+804a130  00000d07 R_386_JUMP_SLOT +[0-9a-f]+ +___tls_get_addr
+[0-9a-f ]+R_386_JUMP_SLOT +[0-9a-f]+ +___tls_get_addr
 
-Symbol table '.dynsym' contains 14 entries:
+Symbol table '.dynsym' contains 13 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+ +0 TLS +GLOBAL DEFAULT  UND sG5
- +[0-9]+: 0+804a060 +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG7
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG2
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG4
@@ -128,7 +127,7 @@ Symbol table '.symtab' contains 73 entries:
  +[0-9]+: 00000074 +0 TLS +GLOBAL DEFAULT +10 bg6
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG5
  +[0-9]+: 00000068 +0 TLS +GLOBAL DEFAULT +10 bg3
- +[0-9]+: 0+804a060 +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
+ +[0-9]+: 0+804a060 +0 OBJECT  GLOBAL HIDDEN +11 _DYNAMIC
  +[0-9]+: 00000008 +0 TLS +GLOBAL DEFAULT +9 sg3
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sG7
  +[0-9]+: 00000048 +0 TLS +GLOBAL HIDDEN +9 sh3
diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
index b0e22f6..d8dcc66 100644
--- a/ld/testsuite/ld-i386/tlsnopic.rd
+++ b/ld/testsuite/ld-i386/tlsnopic.rd
@@ -69,12 +69,11 @@ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 20 entries:
 [0-9a-f ]+R_386_TLS_TPOFF   0+   sg2
 
 
-Symbol table '.dynsym' contains 13 entries:
+Symbol table '.dynsym' contains 12 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 +5 *
  +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL  DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sg3
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sg4
  +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
@@ -105,12 +104,12 @@ Symbol table '.symtab' contains 33 entries:
  +[0-9]+: 0+08 +0 TLS +LOCAL  DEFAULT +6 bl3
  +[0-9]+: 0+0c +0 TLS +LOCAL  DEFAULT +6 bl4
  +[0-9]+: 0+10 +0 TLS +LOCAL  DEFAULT +6 bl5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT  LOCAL  HIDDEN  ABS _DYNAMIC
  +[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+218c +0 OBJECT  LOCAL  HIDDEN  ABS _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+18 +0 TLS +LOCAL  HIDDEN +6 sh2
- +[0-9]+: [0-9a-f]+ +0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sg3
  +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT  UND sg4
  +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
index dde6c4d..890a493 100644
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -81,14 +81,13 @@ Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym.Value +Sym. Name
 [0-9a-f ]+R_386_JUMP_SLOT   0+   ___tls_get_addr
 
-Symbol table '.dynsym' contains 18 entries:
+Symbol table '.dynsym' contains 17 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-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
@@ -129,6 +128,7 @@ Symbol table '.symtab' contains 55 entries:
  +[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-9a-f]+ +0 OBJECT  LOCAL  HIDDEN  ABS _DYNAMIC
  +[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
@@ -146,7 +146,6 @@ Symbol table '.symtab' contains 55 entries:
  +[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