Tolerate some whitespace differences in readelf output.

1 files changed, 89 insertions, 89 deletions

diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
index ac41442..3a264e3 100644
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -8,7 +8,7 @@
 There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
 
 Section Headers:
-  \[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
+ +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
  +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
  +\[[ 0-9]+\] \.hash +.*
  +\[[ 0-9]+\] \.dynsym +.*
@@ -17,8 +17,8 @@ Section Headers:
  +\[[ 0-9]+\] \.rel.plt +.*
  +\[[ 0-9]+\] \.plt +.*
  +\[[ 0-9]+\] \.text +.*
- +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT  0   0  1
- +\[[ 0-9]+\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT  0   0  1
+ +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT +0 +0 +1
  +\[[ 0-9]+\] \.dynamic +.*
  +\[[ 0-9]+\] \.got +.*
  +\[[ 0-9]+\] \.got.plt +.*
@@ -35,18 +35,18 @@ Entry point 0x[0-9a-f]+
 There are [0-9]+ program headers, starting at offset [0-9]+
 
 Program Headers:
-  Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-  LOAD.*
-  LOAD.*
-  DYNAMIC.*
-  TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
+ +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
+ +LOAD.*
+ +LOAD.*
+ +DYNAMIC.*
+ +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+60 0x0+80 R +0x1
 
  Section to Segment mapping:
-  Segment Sections...
-   00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
-   01 +.tdata .dynamic .got .got.plt *
-   02 +.dynamic *
-   03 +.tdata .tbss *
+ +Segment Sections...
+ +00 +.hash .dynsym .dynstr .rel.dyn .rel.plt .plt .text *
+ +01 +.tdata .dynamic .got .got.plt *
+ +02 +.dynamic *
+ +03 +.tdata .tbss *
 
 Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
  Offset +Info +Type +Sym.Value +Sym. Name
@@ -69,86 +69,86 @@ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 26 entries:
 [0-9a-f ]+R_386_TLS_TPOFF *
 [0-9a-f ]+R_386_TLS_DTPMOD3
 [0-9a-f ]+R_386_TLS_TPOFF32
-[0-9a-f ]+R_386_TLS_TPOFF   0+8   sg3
-[0-9a-f ]+R_386_TLS_TPOFF32 0+c   sg4
-[0-9a-f ]+R_386_TLS_TPOFF   0+c   sg4
-[0-9a-f ]+R_386_TLS_TPOFF   0+10   sg5
-[0-9a-f ]+R_386_TLS_DTPMOD3 0+   sg1
-[0-9a-f ]+R_386_TLS_DTPOFF3 0+   sg1
-[0-9a-f ]+R_386_TLS_TPOFF32 0+4   sg2
+[0-9a-f ]+R_386_TLS_TPOFF +0+8 +sg3
+[0-9a-f ]+R_386_TLS_TPOFF32 0+c +sg4
+[0-9a-f ]+R_386_TLS_TPOFF +0+c +sg4
+[0-9a-f ]+R_386_TLS_TPOFF +0+10 +sg5
+[0-9a-f ]+R_386_TLS_DTPMOD3 0+ +sg1
+[0-9a-f ]+R_386_TLS_DTPOFF3 0+ +sg1
+[0-9a-f ]+R_386_TLS_TPOFF32 0+4 +sg2
 
 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
+[0-9a-f ]+R_386_JUMP_SLOT +0+ +___tls_get_addr
 
 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+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +[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 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
- +[0-9]+: 0+ +0 NOTYPE  GLOBAL DEFAULT  UND ___tls_get_addr
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +[0-9]+: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
+ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
+ +[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 +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
+ +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr
 
 Symbol table '\.symtab' 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 +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+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-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
- +[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+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 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
- +[0-9]+: 0+ +0 NOTYPE  GLOBAL DEFAULT  UND ___tls_get_addr
+ +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+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-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
+ +[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+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 +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
+ +[0-9]+: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND ___tls_get_addr