This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] gloss over more output from readelf in TLS tests


the TLS tests run readelf on some objects and use regexes to verify the 
output ... these tend to be pretty fragile though depending on the options 
used to build binutils.  if the gnu hash feature is enabled by default, the 
output will include the .gnu.hash section.  along these lines, ive tweaked 
most of the tls regex files so that things like section/program header count 
as well as their offsets get glossed over.  these tests really just care 
about the tls related output, not what order the sections are in.  this way 
it's much easier to insert/delete lines at will to account for the default 
binutils settings currently in use and to future changes.

2007-09-08  Mike Frysinger  <vapier@gentoo.org>

	* testsuite/ld-alpha/tlsbin.rd: Use [0-9]+ to match section header
	count and 0x[0-9a-f]+ to match section header offset.  Match section
	indexes with \[[ 0-9]+\].  Use [0-9]+ to match program header count
	and 0x[0-9a-f]+ to match program header offset.  Match .dynsym and
	.symtab entry counts with [0-9]+.
	* testsuite/ld-alpha/tlsbinr.rd: Likewise.
	* testsuite/ld-alpha/tlspic.rd: Likewise.
	* testsuite/ld-i386/tlsbin.rd: Likewise.
	* testsuite/ld-i386/tlsbindesc.rd: Likewise.
	* testsuite/ld-i386/tlsdesc.rd: Likewise.
	* testsuite/ld-i386/tlsgdesc.rd: Likewise.
	* testsuite/ld-i386/tlsnopic.rd: Likewise.
	* testsuite/ld-i386/tlspic.rd: Likewise.
	* testsuite/ld-ia64/tlsbin.rd: Likewise.
	* testsuite/ld-ia64/tlspic.rd: Likewise.
	* testsuite/ld-powerpc/tlsexe.r: Likewise.
	* testsuite/ld-powerpc/tlsexe32.r: Likewise.
	* testsuite/ld-powerpc/tlsexetoc.r: Likewise.
	* testsuite/ld-powerpc/tlsso.r: Likewise.
	* testsuite/ld-powerpc/tlsso32.r: Likewise.
	* testsuite/ld-powerpc/tlstocso.r: Likewise.
	* testsuite/ld-s390/tlsbin.rd: Likewise.
	* testsuite/ld-s390/tlsbin_64.rd: Likewise.
	* testsuite/ld-s390/tlspic.rd: Likewise.
	* testsuite/ld-s390/tlspic_64.rd: Likewise.
	* testsuite/ld-sparc/tlssunbin32.rd: Likewise.
	* testsuite/ld-sparc/tlssunbin64.rd: Likewise.
	* testsuite/ld-sparc/tlssunnopic32.rd: Likewise.
	* testsuite/ld-sparc/tlssunnopic64.rd: Likewise.
	* testsuite/ld-sparc/tlssunpic32.rd: Likewise.
	* testsuite/ld-sparc/tlssunpic64.rd: Likewise.
	* testsuite/ld-x86-64/tlsbin.rd: Likewise.
	* testsuite/ld-x86-64/tlsbindesc.rd: Likewise.
	* testsuite/ld-x86-64/tlsdesc.rd: Likewise.
	* testsuite/ld-x86-64/tlsgdesc.rd: Likewise.
	* testsuite/ld-x86-64/tlspic.rd: Likewise.
-mike

Attachment: signature.asc
Description: This is a digitally signed message part.

2007-09-08  Mike Frysinger  <vapier@gentoo.org>

	* testsuite/ld-alpha/tlsbin.rd: Use [0-9]+ to match section header
	count and 0x[0-9a-f]+ to match section header offset.  Match section
	indexes with \[[ 0-9]+\].  Use [0-9]+ to match program header count
	and 0x[0-9a-f]+ to match program header offset.  Match .dynsym and
	.symtab entry counts with [0-9]+.
	* testsuite/ld-alpha/tlsbinr.rd: Likewise.
	* testsuite/ld-alpha/tlspic.rd: Likewise.
	* testsuite/ld-i386/tlsbin.rd: Likewise.
	* testsuite/ld-i386/tlsbindesc.rd: Likewise.
	* testsuite/ld-i386/tlsdesc.rd: Likewise.
	* testsuite/ld-i386/tlsgdesc.rd: Likewise.
	* testsuite/ld-i386/tlsnopic.rd: Likewise.
	* testsuite/ld-i386/tlspic.rd: Likewise.
	* testsuite/ld-ia64/tlsbin.rd: Likewise.
	* testsuite/ld-ia64/tlspic.rd: Likewise.
	* testsuite/ld-powerpc/tlsexe.r: Likewise.
	* testsuite/ld-powerpc/tlsexe32.r: Likewise.
	* testsuite/ld-powerpc/tlsexetoc.r: Likewise.
	* testsuite/ld-powerpc/tlsso.r: Likewise.
	* testsuite/ld-powerpc/tlsso32.r: Likewise.
	* testsuite/ld-powerpc/tlstocso.r: Likewise.
	* testsuite/ld-s390/tlsbin.rd: Likewise.
	* testsuite/ld-s390/tlsbin_64.rd: Likewise.
	* testsuite/ld-s390/tlspic.rd: Likewise.
	* testsuite/ld-s390/tlspic_64.rd: Likewise.
	* testsuite/ld-sparc/tlssunbin32.rd: Likewise.
	* testsuite/ld-sparc/tlssunbin64.rd: Likewise.
	* testsuite/ld-sparc/tlssunnopic32.rd: Likewise.
	* testsuite/ld-sparc/tlssunnopic64.rd: Likewise.
	* testsuite/ld-sparc/tlssunpic32.rd: Likewise.
	* testsuite/ld-sparc/tlssunpic64.rd: Likewise.
	* testsuite/ld-x86-64/tlsbin.rd: Likewise.
	* testsuite/ld-x86-64/tlsbindesc.rd: Likewise.
	* testsuite/ld-x86-64/tlsdesc.rd: Likewise.
	* testsuite/ld-x86-64/tlsgdesc.rd: Likewise.
	* testsuite/ld-x86-64/tlspic.rd: Likewise.

--- ld/testsuite/ld-alpha/tlsbin.rd
+++ ld/testsuite/ld-alpha/tlsbin.rd
@@ -9 +9 @@
-There are [0-9]* section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -13,17 +13,17 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1] .interp +.*
-  \[ 2\] .hash +.*
-  \[ 3\] .dynsym +.*
-  \[ 4\] .dynstr +.*
-  \[ 5\] .rela.dyn +.*
-  \[ 6\] .rela.plt +.*
-  \[ 7\] .text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +AX +0 +0 4096
-  \[ 8\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
-  \[ 9\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +4
-  \[10\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +1
-  \[11\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
-  \[12\] .plt +.*
-  \[13\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +WA +0 +0 +8
-  \[14\] .shstrtab +.*
-  \[15\] .symtab +.*
-  \[16\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp +.*
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+ +\[[ 0-9]+\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -34 +34 @@ Entry point 0x[0-9a-f]+
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -57 +57 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -67 +67 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-alpha/tlsbinr.rd
+++ ld/testsuite/ld-alpha/tlsbinr.rd
@@ -13,17 +13,17 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.interp +.*
- +\[ 2\] \.hash +.*
- +\[ 3\] \.dynsym +.*
- +\[ 4\] \.dynstr +.*
- +\[ 5\] \.rela\.dyn +.*
- +\[ 6\] \.rela\.plt +.*
- +\[ 7\] \.text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +AX +0 +0 4096
- +\[ 8\] \.eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
- +\[ 9\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4
- +\[10\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
- +\[11\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
- +\[12\] \.plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAX +0 +0 +16
- +\[13\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
- +\[14\] \.shstrtab +.*
- +\[15\] \.symtab +.*
- +\[16\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.interp +.*
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rela\.dyn +.*
+ +\[[ 0-9]+\] \.rela\.plt +.*
+ +\[[ 0-9]+\] \.text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +AX +0 +0 4096
+ +\[[ 0-9]+\] \.eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+ +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] \.plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAX +0 +0 +16
+ +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -34 +34 @@ Entry point 0x[0-9a-f]+
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -52 +52 @@ Relocation section '.rela.dyn' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -62 +62 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-alpha/tlspic.rd
+++ ld/testsuite/ld-alpha/tlspic.rd
@@ -9 +9 @@
-There are [0-9]* section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -13,16 +13,16 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] .hash +.*
- +\[ 2\] .dynsym +.*
- +\[ 3\] .dynstr +.*
- +\[ 4\] .rela.dyn +.*
- +\[ 5\] .rela.plt +.*
- +\[ 6\] .text +PROGBITS +0+1000 0+1000 0+ac 0+ +AX +0 +0 4096
- +\[ 7\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
- +\[ 8\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4
- +\[ 9\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
- +\[10\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +3 +0 +8
- +\[11\] .plt +.*
- +\[12\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
- +\[13\] .shstrtab +.*
- +\[14\] .symtab +.*
- +\[15\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+ac 0+ +AX +0 +0 4096
+ +\[[ 0-9]+\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+ +\[[ 0-9]+\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +3 +0 +8
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -33 +33 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9a-f]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -57 +57 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -74 +74 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-i386/tlsbin.rd
+++ ld/testsuite/ld-i386/tlsbin.rd
@@ -8 +8 @@
-There are 17 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,17 +12,17 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] \.interp +.*
-  \[ 2\] \.hash +.*
-  \[ 3\] \.dynsym +.*
-  \[ 4\] \.dynstr +.*
-  \[ 5\] \.rel.dyn +.*
-  \[ 6\] \.rel.plt +.*
-  \[ 7\] \.plt +.*
-  \[ 8\] \.text +PROGBITS +0+8049000 .*
-  \[ 9\] \.tdata +PROGBITS +0+804a000 [0-9a-f]+ 000060 00 WAT  0   0 4096
-  \[10\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT  0   0  1
-  \[11\] \.dynamic +DYNAMIC +0+804a060 .*
-  \[12\] \.got +PROGBITS +0+804a100 .*
-  \[13\] \.got\.plt +PROGBITS +0+804a124 .*
-  \[14\] \.shstrtab +.*
-  \[15\] \.symtab +.*
-  \[16\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.interp +.*
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rel.dyn +.*
+ +\[[ 0-9]+\] \.rel.plt +.*
+ +\[[ 0-9]+\] \.plt +.*
+ +\[[ 0-9]+\] \.text +PROGBITS +0+8049000 .*
+ +\[[ 0-9]+\] \.tdata +PROGBITS +0+804a000 [0-9a-f]+ 000060 00 WAT  0   0 4096
+ +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT  0   0  1
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+804a060 .*
+ +\[[ 0-9]+\] \.got +PROGBITS +0+804a100 .*
+ +\[[ 0-9]+\] \.got\.plt +PROGBITS +0+804a124 .*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -36 +36 @@ Entry point 0x8049188
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -73 +73 @@ Relocation section '.rel.plt' at offset 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -89 +89 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 70 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-i386/tlsbindesc.rd
+++ ld/testsuite/ld-i386/tlsbindesc.rd
@@ -8 +8 @@
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] \.interp +.*
-  \[ 2\] \.hash +.*
-  \[ 3\] \.dynsym +.*
-  \[ 4\] \.dynstr +.*
-  \[ 5\] \.rel.dyn +.*
-  \[ 6\] \.text +PROGBITS +0+8049000 .*
-  \[ 7\] \.tdata +PROGBITS +0+804a000 [0-9a-f]+ 000060 00 WAT  0   0 4096
-  \[ 8\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT  0   0  1
-  \[ 9\] \.dynamic +DYNAMIC +0+804a060 .*
-  \[10\] \.got +PROGBITS +0+804a0e0 .*
-  \[11\] \.got\.plt +PROGBITS +0+804a104 .*
-  \[12\] \.shstrtab +.*
-  \[13\] \.symtab +.*
-  \[14\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.interp +.*
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rel.dyn +.*
+ +\[[ 0-9]+\] \.text +PROGBITS +0+8049000 .*
+ +\[[ 0-9]+\] \.tdata +PROGBITS +0+804a000 [0-9a-f]+ 000060 00 WAT  0   0 4096
+ +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000040 00 WAT  0   0  1
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+804a060 .*
+ +\[[ 0-9]+\] \.got +PROGBITS +0+804a0e0 .*
+ +\[[ 0-9]+\] \.got\.plt +PROGBITS +0+804a104 .*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -34 +34 @@ Entry point 0x8049158
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -67 +67 @@ Relocation section '.rel.dyn' at offset 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -82 +82 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 68 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-i386/tlsdesc.rd
+++ ld/testsuite/ld-i386/tlsdesc.rd
@@ -8 +8 @@
-There are [0-9]+ section headers, starting at offset 0x.*:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] \.hash +.*
-  \[ 2\] \.dynsym +.*
-  \[ 3\] \.dynstr +.*
-  \[ 4\] \.rel.dyn +.*
-  \[ 5\] \.rel.plt +.*
-  \[ 6\] \.text +.*
-  \[ 7\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT  0   0  1
-  \[ 8\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT  0   0  1
-  \[ 9\] \.dynamic +.*
-  \[10\] \.got +.*
-  \[11\] \.got.plt +.*
-  \[12\] \.shstrtab +.*
-  \[13\] \.symtab +.*
-  \[14\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rel.dyn +.*
+ +\[[ 0-9]+\] \.rel.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]+\] \.dynamic +.*
+ +\[[ 0-9]+\] \.got +.*
+ +\[[ 0-9]+\] \.got.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -81 +81 @@ Relocation section '.rel.plt' at offset 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -97 +97 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 51 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-i386/tlsgdesc.rd
+++ ld/testsuite/ld-i386/tlsgdesc.rd
@@ -7 +7 @@
-There are [0-9]+ section headers, starting at offset 0x.*:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -11,14 +11,14 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] \.hash +.*
-  \[ 2\] \.dynsym +.*
-  \[ 3\] \.dynstr +.*
-  \[ 4\] \.rel.dyn +.*
-  \[ 5\] \.rel.plt +.*
-  \[ 6\] \.plt +.*
-  \[ 7\] \.text +.*
-  \[ 8\] \.dynamic +.*
-  \[ 9\] \.got +.*
-  \[10\] \.got.plt +.*
-  \[11\] \.shstrtab +.*
-  \[12\] \.symtab +.*
-  \[13\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rel.dyn +.*
+ +\[[ 0-9]+\] \.rel.plt +.*
+ +\[[ 0-9]+\] \.plt +.*
+ +\[[ 0-9]+\] \.text +.*
+ +\[[ 0-9]+\] \.dynamic +.*
+ +\[[ 0-9]+\] \.got +.*
+ +\[[ 0-9]+\] \.got.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -63 +63 @@ Relocation section '.rel.plt' at offset 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -78 +78 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 24 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-i386/tlsnopic.rd
+++ ld/testsuite/ld-i386/tlsnopic.rd
@@ -8 +8 @@
-There are 13 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,13 +12,13 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] \.hash +.*
-  \[ 2\] \.dynsym +.*
-  \[ 3\] \.dynstr +.*
-  \[ 4\] \.rel.dyn +.*
-  \[ 5\] \.text +PROGBITS +0+1000 .*
-  \[ 6\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000024 00 WAT  0   0  1
-  \[ 7\] \.dynamic +DYNAMIC +0+20f4 .*
-  \[ 8\] \.got +PROGBITS +0+2174 .*
-  \[ 9\] \.got.plt +PROGBITS +0+218c .*
-  \[10\] \.shstrtab +.*
-  \[11\] \.symtab +.*
-  \[12\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rel.dyn +.*
+ +\[[ 0-9]+\] \.text +PROGBITS +0+1000 .*
+ +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000024 00 WAT  0   0  1
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC +0+20f4 .*
+ +\[[ 0-9]+\] \.got +PROGBITS +0+2174 .*
+ +\[[ 0-9]+\] \.got.plt +PROGBITS +0+218c .*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -32 +32 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -72 +72 @@ Relocation section '.rel.dyn' at offset 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -85 +85 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 30 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-i386/tlspic.rd
+++ ld/testsuite/ld-i386/tlspic.rd
@@ -8 +8 @@
-There are [0-9]+ section headers, starting at offset 0x.*:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,16 +12,16 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
-  \[ 1\] \.hash +.*
-  \[ 2\] \.dynsym +.*
-  \[ 3\] \.dynstr +.*
-  \[ 4\] \.rel.dyn +.*
-  \[ 5\] \.rel.plt +.*
-  \[ 6\] \.plt +.*
-  \[ 7\] \.text +.*
-  \[ 8\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000060 00 WAT  0   0  1
-  \[ 9\] \.tbss +NOBITS +[0-9aa-f]+ [0-9a-f]+ 000020 00 WAT  0   0  1
-  \[10\] \.dynamic +.*
-  \[11\] \.got +.*
-  \[12\] \.got.plt +.*
-  \[13\] \.shstrtab +.*
-  \[14\] \.symtab +.*
-  \[15\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rel.dyn +.*
+ +\[[ 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]+\] \.dynamic +.*
+ +\[[ 0-9]+\] \.got +.*
+ +\[[ 0-9]+\] \.got.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -84 +84 @@ Relocation section '.rel.plt' at offset 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -101 +101 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 52 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-ia64/tlsbin.rd
+++ ld/testsuite/ld-ia64/tlsbin.rd
@@ -8 +8 @@
-There are 19 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,19 +12,19 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1\] .interp +.*
-  \[ 2\] .hash +.*
-  \[ 3\] .dynsym +.*
-  \[ 4\] .dynstr +.*
-  \[ 5\] .rela.dyn +.*
-  \[ 6\] .rela.IA_64.pltof +.*
-  \[ 7\] .plt +.*
-  \[ 8\] .text +PROGBITS +40+1000 0+1000 0+140 00 +AX +0 +0 4096
-  \[ 9\] .IA_64.unwind_inf +.*
-  \[10\] .IA_64.unwind +.*
-  \[11\] .tdata +PROGBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4
-  \[12\] .tbss +NOBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+40 00 WAT +0 +0 +1
-  \[13\] .dynamic +DYNAMIC +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+150 10 +WA +4 +0 +8
-  \[14\] .got +PROGBITS +60+1318 0+1318 0+48 00 WAp +0 +0 +8
-  \[15\] .IA_64.pltoff +.*
-  \[16\] .shstrtab +.*
-  \[17\] .symtab +.*
-  \[18\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp +.*
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.IA_64.pltof +.*
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +40+1000 0+1000 0+140 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .IA_64.unwind_inf +.*
+ +\[[ 0-9]+\] .IA_64.unwind +.*
+ +\[[ 0-9]+\] .tdata +PROGBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+40 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+150 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +60+1318 0+1318 0+48 00 WAp +0 +0 +8
+ +\[[ 0-9]+\] .IA_64.pltoff +.*
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -35 +35 @@ Entry point 0x40+10d0
-There are 7 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -59 +59 @@ Relocation section '.rela.IA_64.pltoff' 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -69 +69 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 66 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-ia64/tlspic.rd
+++ ld/testsuite/ld-ia64/tlspic.rd
@@ -8 +8 @@
-There are 18 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,18 +12,18 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1\] .hash +.*
-  \[ 2\] .dynsym +.*
-  \[ 3\] .dynstr +.*
-  \[ 4\] .rela.dyn +.*
-  \[ 5\] .rela.IA_64.pltof +.*
-  \[ 6\] .plt +.*
-  \[ 7\] .text +PROGBITS +0+1000 0+1000 0+110 00 +AX +0 +0 4096
-  \[ 8\] .IA_64.unwind_inf +.*
-  \[ 9\] .IA_64.unwind +.*
-  \[10\] .tdata +PROGBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4
-  \[11\] .tbss +NOBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+20 00 WAT +0 +0 +1
-  \[12\] .dynamic +DYNAMIC +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+140 10 +WA +3 +0 +8
-  \[13\] .got +PROGBITS +0+112d8 0+12d8 0+50 00 WAp +0 +0 +8
-  \[14\] .IA_64.pltoff +.*
-  \[15\] .shstrtab +.*
-  \[16\] .symtab +.*
-  \[17\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.IA_64.pltof +.*
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+110 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .IA_64.unwind_inf +.*
+ +\[[ 0-9]+\] .IA_64.unwind +.*
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+20 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+140 10 +WA +3 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+112d8 0+12d8 0+50 00 WAp +0 +0 +8
+ +\[[ 0-9]+\] .IA_64.pltoff +.*
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -35 +35 @@ Entry point 0x1000
-There are 5 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -59 +59 @@ Relocation section '.rela.IA_64.pltoff' 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -76 +76 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 54 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-powerpc/tlsexe.r
+++ ld/testsuite/ld-powerpc/tlsexe.r
@@ -8 +8 @@
-There are 17 section headers.*
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,17 +12,17 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.interp +.*
- +\[ 2\] \.hash +.*
- +\[ 3\] \.dynsym +.*
- +\[ 4\] \.dynstr +.*
- +\[ 5\] \.rela\.dyn +.*
- +\[ 6\] \.rela\.plt +.*
- +\[ 7\] \.text +PROGBITS .* 0+f8 0+ +AX +0 +0 +8
- +\[ 8\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
- +\[ 9\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
- +\[10\] \.dynamic +DYNAMIC .* 0+150 10 +WA +4 +0 +8
- +\[11\] \.branch_lt + PROGBITS .* 0+ 0+ +WA +0 +0 +8
- +\[12\] \.got +PROGBITS .* 0+30 08 +WA +0 +0 +8
- +\[13\] \.plt +.*
- +\[14\] \.shstrtab +.*
- +\[15\] \.symtab +.*
- +\[16\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.interp +.*
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rela\.dyn +.*
+ +\[[ 0-9]+\] \.rela\.plt +.*
+ +\[[ 0-9]+\] \.text +PROGBITS .* 0+f8 0+ +AX +0 +0 +8
+ +\[[ 0-9]+\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC .* 0+150 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] \.branch_lt + PROGBITS .* 0+ 0+ +WA +0 +0 +8
+ +\[[ 0-9]+\] \.got +PROGBITS .* 0+30 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] \.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -33 +33 @@ Entry point .*
-There are 6 program headers.*
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -75 +75 @@ Symbol table '\.dynsym' contains [0-9]+ 
-Symbol table '\.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-powerpc/tlsexe32.r
+++ ld/testsuite/ld-powerpc/tlsexe32.r
@@ -8 +8 @@
-There are 16 section headers.*
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,16 +12,16 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[ 1\] \.interp +.*
- +\[ 2\] \.hash +.*
- +\[ 3\] \.dynsym +.*
- +\[ 4\] \.dynstr +.*
- +\[ 5\] \.rela\.dyn +.*
- +\[ 6\] \.rela\.plt +.*
- +\[ 7\] \.text +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000070 00 +AX +0 +0 +1
- +\[ 8\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 00001c 00 WAT +0 +0 +4
- +\[ 9\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 00001c 00 WAT +0 +0 +4
- +\[10\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4
- +\[11\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 00001c 04 WAX +0 +0 +4
- +\[12\] \.plt +NOBITS +.*
- +\[13\] \.shstrtab +STRTAB +.*
- +\[14\] \.symtab +SYMTAB +.*
- +\[15\] \.strtab +STRTAB +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] \.interp +.*
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rela\.dyn +.*
+ +\[[ 0-9]+\] \.rela\.plt +.*
+ +\[[ 0-9]+\] \.text +PROGBITS +[0-9a-f]+ [0-9a-f]+ 000070 00 +AX +0 +0 +1
+ +\[[ 0-9]+\] \.tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ 00001c 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 00001c 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 08 +WA +4 +0 +4
+ +\[[ 0-9]+\] \.got +PROGBITS +[0-9a-f]+ [0-9a-f]+ 00001c 04 WAX +0 +0 +4
+ +\[[ 0-9]+\] \.plt +NOBITS +.*
+ +\[[ 0-9]+\] \.shstrtab +STRTAB +.*
+ +\[[ 0-9]+\] \.symtab +SYMTAB +.*
+ +\[[ 0-9]+\] \.strtab +STRTAB +.*
@@ -32 +32 @@ Entry point .*
-There are 6 program headers, starting at offset 52
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -73 +73 @@ Symbol table '\.dynsym' contains [0-9]+ 
-Symbol table '\.symtab' contains 37 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-powerpc/tlsexetoc.r
+++ ld/testsuite/ld-powerpc/tlsexetoc.r
@@ -8 +8 @@
-There are 17 section headers.*
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,17 +12,17 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.interp +.*
- +\[ 2\] \.hash +.*
- +\[ 3\] \.dynsym +.*
- +\[ 4\] \.dynstr +.*
- +\[ 5\] \.rela\.dyn +.*
- +\[ 6\] \.rela\.plt +.*
- +\[ 7\] \.text +PROGBITS .* 0+b8 0+ +AX +0 +0 +8
- +\[ 8\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
- +\[ 9\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
- +\[10\] \.dynamic +DYNAMIC .* 0+150 10 +WA +4 +0 +8
- +\[11\] \.branch_lt +PROGBITS .* 0+ 0+ +WA +0 +0 +8
- +\[12\] \.got +PROGBITS .* 0+58 08 +WA +0 +0 +8
- +\[13\] \.plt +.*
- +\[14\] \.shstrtab +.*
- +\[15\] \.symtab +.*
- +\[16\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.interp +.*
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rela\.dyn +.*
+ +\[[ 0-9]+\] \.rela\.plt +.*
+ +\[[ 0-9]+\] \.text +PROGBITS .* 0+b8 0+ +AX +0 +0 +8
+ +\[[ 0-9]+\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC .* 0+150 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] \.branch_lt +PROGBITS .* 0+ 0+ +WA +0 +0 +8
+ +\[[ 0-9]+\] \.got +PROGBITS .* 0+58 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] \.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -33 +33 @@ Entry point .*
-There are 6 program headers.*
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -74 +74 @@ Symbol table '\.dynsym' contains [0-9]+ 
-Symbol table '\.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-powerpc/tlsso.r
+++ ld/testsuite/ld-powerpc/tlsso.r
@@ -7 +7 @@
-There are 16 section headers.*
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -11,16 +11,16 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash .*
- +\[ 2\] \.dynsym .*
- +\[ 3\] \.dynstr .*
- +\[ 4\] \.rela\.dyn .*
- +\[ 5\] \.rela\.plt .*
- +\[ 6\] \.text .*
- +\[ 7\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
- +\[ 8\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
- +\[ 9\] \.dynamic .*
- +\[10\] \.branch_lt .*
- +\[11\] \.got .*
- +\[12\] \.plt .*
- +\[13\] \.shstrtab .*
- +\[14\] \.symtab .*
- +\[15\] \.strtab .*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash .*
+ +\[[ 0-9]+\] \.dynsym .*
+ +\[[ 0-9]+\] \.dynstr .*
+ +\[[ 0-9]+\] \.rela\.dyn .*
+ +\[[ 0-9]+\] \.rela\.plt .*
+ +\[[ 0-9]+\] \.text .*
+ +\[[ 0-9]+\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.dynamic .*
+ +\[[ 0-9]+\] \.branch_lt .*
+ +\[[ 0-9]+\] \.got .*
+ +\[[ 0-9]+\] \.plt .*
+ +\[[ 0-9]+\] \.shstrtab .*
+ +\[[ 0-9]+\] \.symtab .*
+ +\[[ 0-9]+\] \.strtab .*
@@ -31 +31 @@ Entry point 0x[0-9a-f]+
-There are 4 program headers.*
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -70 +70 @@ Relocation section '\.rela\.plt' at offs
-Symbol table '\.dynsym' contains .* entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -90 +90 @@ Symbol table '\.dynsym' contains .* entr
-Symbol table '\.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-powerpc/tlsso32.r
+++ ld/testsuite/ld-powerpc/tlsso32.r
@@ -7 +7 @@
-There are 15 section headers.*
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -11,15 +11,15 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash +.*
- +\[ 2\] \.dynsym +.*
- +\[ 3\] \.dynstr +.*
- +\[ 4\] \.rela\.dyn +.*
- +\[ 5\] \.rela\.plt +.*
- +\[ 6\] \.text +PROGBITS .* 0+70 0+ +AX +0 +0 +1
- +\[ 7\] \.tdata +PROGBITS .* 0+1c 0+ WAT +0 +0 +4
- +\[ 8\] \.tbss +NOBITS .* 0+1c 0+ WAT +0 +0 +4
- +\[ 9\] \.dynamic +DYNAMIC .* 08 +WA +3 +0 +4
- +\[10\] \.got +PROGBITS .* 0+34 04 WAX +0 +0 +4
- +\[11\] \.plt +.*
- +\[12\] \.shstrtab +.*
- +\[13\] \.symtab +.*
- +\[14\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rela\.dyn +.*
+ +\[[ 0-9]+\] \.rela\.plt +.*
+ +\[[ 0-9]+\] \.text +PROGBITS .* 0+70 0+ +AX +0 +0 +1
+ +\[[ 0-9]+\] \.tdata +PROGBITS .* 0+1c 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] \.tbss +NOBITS .* 0+1c 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] \.dynamic +DYNAMIC .* 08 +WA +3 +0 +4
+ +\[[ 0-9]+\] \.got +PROGBITS .* 0+34 04 WAX +0 +0 +4
+ +\[[ 0-9]+\] \.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -30 +30 @@ Entry point 0x[0-9a-f]+
-There are 4 program headers.*
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -92 +92 @@ Symbol table '\.dynsym' contains [0-9]+ 
-Symbol table '\.symtab' contains 36 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-powerpc/tlstocso.r
+++ ld/testsuite/ld-powerpc/tlstocso.r
@@ -7 +7 @@
-There are 16 section headers.*
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -11,16 +11,16 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] \.hash .*
- +\[ 2\] \.dynsym .*
- +\[ 3\] \.dynstr .*
- +\[ 4\] \.rela\.dyn .*
- +\[ 5\] \.rela\.plt .*
- +\[ 6\] \.text .*
- +\[ 7\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
- +\[ 8\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
- +\[ 9\] \.dynamic .*
- +\[10\] \.branch_lt .*
- +\[11\] \.got .*
- +\[12\] \.plt .*
- +\[13\] \.shstrtab .*
- +\[14\] \.symtab .*
- +\[15\] \.strtab .*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash .*
+ +\[[ 0-9]+\] \.dynsym .*
+ +\[[ 0-9]+\] \.dynstr .*
+ +\[[ 0-9]+\] \.rela\.dyn .*
+ +\[[ 0-9]+\] \.rela\.plt .*
+ +\[[ 0-9]+\] \.text .*
+ +\[[ 0-9]+\] \.tdata +PROGBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.tbss +NOBITS .* 0+38 0+ WAT +0 +0 +8
+ +\[[ 0-9]+\] \.dynamic .*
+ +\[[ 0-9]+\] \.branch_lt .*
+ +\[[ 0-9]+\] \.got .*
+ +\[[ 0-9]+\] \.plt .*
+ +\[[ 0-9]+\] \.shstrtab .*
+ +\[[ 0-9]+\] \.symtab .*
+ +\[[ 0-9]+\] \.strtab .*
@@ -31 +31 @@ Entry point 0x[0-9a-f]+
-There are 4 program headers.*
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -85 +85 @@ Symbol table '\.dynsym' contains [0-9]+ 
-Symbol table '\.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-s390/tlsbin.rd
+++ ld/testsuite/ld-s390/tlsbin.rd
@@ -8 +8 @@
-There are 16 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,16 +12,16 @@ Section Headers:
-  \[ 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+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 .*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp .*
+ +\[[ 0-9]+\] .hash .*
+ +\[[ 0-9]+\] .dynsym .*
+ +\[[ 0-9]+\] .dynstr .*
+ +\[[ 0-9]+\] .rela.dyn .*
+ +\[[ 0-9]+\] .rela.plt .*
+ +\[[ 0-9]+\] .plt .*
+ +\[[ 0-9]+\] .text +PROGBITS .*
+ +\[[ 0-9]+\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+ +\[[ 0-9]+\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC .*
+ +\[[ 0-9]+\] .got +PROGBITS .*
+ +\[[ 0-9]+\] .shstrtab .*
+ +\[[ 0-9]+\] .symtab .*
+ +\[[ 0-9]+\] .strtab .*
@@ -35 +35 @@ Entry point 0x[0-9a-f]+
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -67 +67 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -79 +79 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 65 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-s390/tlsbin_64.rd
+++ ld/testsuite/ld-s390/tlsbin_64.rd
@@ -8 +8 @@
-There are 16 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,16 +12,16 @@ Section Headers:
-  \[ 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+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 .*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp .*
+ +\[[ 0-9]+\] .hash .*
+ +\[[ 0-9]+\] .dynsym .*
+ +\[[ 0-9]+\] .dynstr .*
+ +\[[ 0-9]+\] .rela.dyn .*
+ +\[[ 0-9]+\] .rela.plt .*
+ +\[[ 0-9]+\] .plt .*
+ +\[[ 0-9]+\] .text +PROGBITS .*
+ +\[[ 0-9]+\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+ +\[[ 0-9]+\] .tbss +NOBITS .* 0+40 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC .*
+ +\[[ 0-9]+\] .got +PROGBITS .*
+ +\[[ 0-9]+\] .shstrtab .*
+ +\[[ 0-9]+\] .symtab .*
+ +\[[ 0-9]+\] .strtab .*
@@ -35 +35 @@ Entry point 0x[0-9a-f]+
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -67 +67 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -79 +79 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-s390/tlspic.rd
+++ ld/testsuite/ld-s390/tlspic.rd
@@ -8 +8 @@
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
-  \[ 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+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 .*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0  0
+ +\[[ 0-9]+\] .hash .*
+ +\[[ 0-9]+\] .dynsym .*
+ +\[[ 0-9]+\] .dynstr .*
+ +\[[ 0-9]+\] .rela.dyn .*
+ +\[[ 0-9]+\] .rela.plt .*
+ +\[[ 0-9]+\] .plt .*
+ +\[[ 0-9]+\] .text +PROGBITS .*
+ +\[[ 0-9]+\] .tdata +PROGBITS .* 0+60 00 WAT  0 +0 32
+ +\[[ 0-9]+\] .tbss +NOBITS .* 0+20 00 WAT  0 +0  1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC .*
+ +\[[ 0-9]+\] .got +PROGBITS .*
+ +\[[ 0-9]+\] .shstrtab .*
+ +\[[ 0-9]+\] .symtab .*
+ +\[[ 0-9]+\] .strtab .*
@@ -34 +34 @@ Entry point 0x[0-9a-f]+
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -71 +71 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -90 +90 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 51 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-s390/tlspic_64.rd
+++ ld/testsuite/ld-s390/tlspic_64.rd
@@ -8 +8 @@
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
-  \[ 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+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 .*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] .hash .*
+ +\[[ 0-9]+\] .dynsym .*
+ +\[[ 0-9]+\] .dynstr .*
+ +\[[ 0-9]+\] .rela.dyn .*
+ +\[[ 0-9]+\] .rela.plt .*
+ +\[[ 0-9]+\] .plt .*
+ +\[[ 0-9]+\] .text +PROGBITS .*
+ +\[[ 0-9]+\] .tdata +PROGBITS .* 0+60 00 WAT +0 +0 +32
+ +\[[ 0-9]+\] .tbss +NOBITS .* 0+20 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC .*
+ +\[[ 0-9]+\] .got +PROGBITS .*
+ +\[[ 0-9]+\] .shstrtab .*
+ +\[[ 0-9]+\] .symtab .*
+ +\[[ 0-9]+\] .strtab .*
@@ -34 +34 @@ Entry point 0x[0-9a-f]+
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -71 +71 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -90 +90 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-sparc/tlssunbin32.rd
+++ ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -11,14 +11,14 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[ 1\] .interp +.*
- +\[ 2\] .hash +.*
- +\[ 3\] .dynsym +.*
- +\[ 4\] .dynstr +.*
- +\[ 5\] .rela.dyn +.*
- +\[ 6\] .text +PROGBITS +0+11000 0+1000 0+1194 00 +AX +0 +0 4096
- +\[ 7\] .tdata +PROGBITS +0+22194 0+2194 0+1060 00 WAT +0 +0 +4
- +\[ 8\] .tbss +NOBITS +0+231f4 0+31f4 0+40 00 WAT +0 +0 +4
- +\[ 9\] .dynamic +DYNAMIC +0+231f4 0+31f4 0+80 08 +WA +4 +0 +4
- +\[10\] .got +PROGBITS +0+23274 0+3274 0+14 04 +WA +0 +0 +4
- +\[11\] .shstrtab +.*
- +\[12\] .symtab +.*
- +\[13\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp +.*
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+11000 0+1000 0+1194 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+22194 0+2194 0+1060 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +0+231f4 0+31f4 0+40 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+231f4 0+31f4 0+80 08 +WA +4 +0 +4
+ +\[[ 0-9]+\] .got +PROGBITS +0+23274 0+3274 0+14 04 +WA +0 +0 +4
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -29 +29 @@ Entry point 0x12000
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -49 +49 @@ Relocation section '.rela.dyn' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -61 +61 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 64 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-sparc/tlssunbin64.rd
+++ ld/testsuite/ld-sparc/tlssunbin64.rd
@@ -11,14 +11,14 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
- +\[ 1\] .interp +.*
- +\[ 2\] .hash +.*
- +\[ 3\] .dynsym +.*
- +\[ 4\] .dynstr +.*
- +\[ 5\] .rela.dyn +.*
- +\[ 6\] .text +PROGBITS +0+101000 0+1000 0+11a4 00 +AX +0 +0 4096
- +\[ 7\] .tdata +PROGBITS +0+2021a4 0+21a4 0+0060 00 WAT +0 +0 +4
- +\[ 8\] .tbss +NOBITS +0+202204 0+2204 0+40 00 WAT +0 +0 +4
- +\[ 9\] .dynamic +DYNAMIC +0+202208 0+2208 0+100 10 +WA +4 +0 +8
- +\[10\] .got +PROGBITS +0+202308 0+2308 0+28 08 +WA +0 +0 +8
- +\[11\] .shstrtab +.*
- +\[12\] .symtab +.*
- +\[13\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp +.*
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+101000 0+1000 0+11a4 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+2021a4 0+21a4 0+0060 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +0+202204 0+2204 0+40 00 WAT +0 +0 +4
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+202208 0+2208 0+100 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+202308 0+2308 0+28 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -29 +29 @@ Entry point 0x102000
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -49 +49 @@ Relocation section '.rela.dyn' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -61 +61 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 64 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -12,12 +12,12 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] .hash +.*
- +\[ 2\] .dynsym +.*
- +\[ 3\] .dynstr +.*
- +\[ 4\] .rela.dyn +.*
- +\[ 5\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
- +\[ 6\] .tbss +NOBITS +0+12000 0+2000 0+24 0+ WAT +0 +0 +4
- +\[ 7\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4
- +\[ 8\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4
- +\[ 9\] .shstrtab +.*
- +\[10\] .symtab +.*
- +\[11\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
+ +\[[ 0-9]+\] .tbss +NOBITS +0+12000 0+2000 0+24 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4
+ +\[[ 0-9]+\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -27 +27 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9a-f]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -52 +52 @@ Relocation section '.rela.dyn' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -65 +65 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -12,12 +12,12 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] .hash +.*
- +\[ 2\] .dynsym +.*
- +\[ 3\] .dynstr +.*
- +\[ 4\] .rela.dyn +.*
- +\[ 5\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
- +\[ 6\] .tbss +NOBITS +0+102000 0+2000 0+24 0+ WAT +0 +0 +4
- +\[ 7\] .dynamic +DYNAMIC +0+102000 0+2000 0+100 10 +WA +3 +0 +8
- +\[ 8\] .got +PROGBITS +0+102100 0+2100 0+38 08 +WA +0 +0 +8
- +\[ 9\] .shstrtab +.*
- +\[10\] .symtab +.*
- +\[11\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
+ +\[[ 0-9]+\] .tbss +NOBITS +0+102000 0+2000 0+24 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+102000 0+2000 0+100 10 +WA +3 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+102100 0+2100 0+38 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -27 +27 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9a-f]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -54 +54 @@ Relocation section '.rela.dyn' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -67 +67 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-sparc/tlssunpic32.rd
+++ ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -8 +8 @@
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] .hash +.*
- +\[ 2\] .dynsym +.*
- +\[ 3\] .dynstr +.*
- +\[ 4\] .rela.dyn +.*
- +\[ 5\] .rela.plt +.*
- +\[ 6\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
- +\[ 7\] .tdata +PROGBITS +0+12000 0+2000 0+60 0+ WAT +0 +0 +4
- +\[ 8\] .tbss +NOBITS +0+12060 0+2060 0+20 0+ WAT +0 +0 +4
- +\[ 9\] .dynamic +DYNAMIC +0+12060 0+2060 0+98 08 +WA +3 +0 +4
- +\[10\] .got +PROGBITS +0+120f8 0+20f8 0+4c 04 +WA +0 +0 +4
- +\[11\] .plt +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+12000 0+2000 0+60 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +0+12060 0+2060 0+20 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+12060 0+2060 0+98 08 +WA +3 +0 +4
+ +\[[ 0-9]+\] .got +PROGBITS +0+120f8 0+20f8 0+4c 04 +WA +0 +0 +4
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -31 +31 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -62 +62 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -82 +82 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 52 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-sparc/tlssunpic64.rd
+++ ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -8 +8 @@
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
- +\[ 0\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
- +\[ 1\] .hash +.*
- +\[ 2\] .dynsym +.*
- +\[ 3\] .dynstr +.*
- +\[ 4\] .rela.dyn +.*
- +\[ 5\] .rela.plt +.*
- +\[ 6\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
- +\[ 7\] .tdata +PROGBITS +0+102000 0+2000 0+60 0+ WAT +0 +0 +4
- +\[ 8\] .tbss +NOBITS +0+102060 0+2060 0+20 0+ WAT +0 +0 +4
- +\[ 9\] .dynamic +DYNAMIC +0+102060 0+2060 0+130 10 +WA +3 +0 +8
- +\[10\] .got +PROGBITS +0+102190 0+2190 0+98 08 +WA +0 +0 +8
- +\[11\] .plt +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+102000 0+2000 0+60 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .tbss +NOBITS +0+102060 0+2060 0+20 0+ WAT +0 +0 +4
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+102060 0+2060 0+130 10 +WA +3 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+102190 0+2190 0+98 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -31 +31 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -62 +62 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -82 +82 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 52 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-x86-64/tlsbin.rd
+++ ld/testsuite/ld-x86-64/tlsbin.rd
@@ -8 +8 @@
-There are 17 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,17 +12,17 @@ Section Headers:
-  \[ 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 +0+401000 0+1000 0+22a 00 +AX +0 +0 +4096
-  \[ 9\] .tdata +PROGBITS +0+60122a 0+122a 0+60 00 WAT +0 +0 +1
-  \[10\] .tbss +NOBITS +0+60128a 0+128a 0+40 00 WAT +0 +0 +1
-  \[11\] .dynamic +DYNAMIC +0+601290 0+1290 0+140 10 +WA +4 +0 +8
-  \[12\] .got +PROGBITS +0+6013d0 0+13d0 0+20 08 +WA +0 +0 +8
-  \[13\] .got.plt +PROGBITS +0+6013f0 0+13f0 0+20 08 +WA +0 +0 +8
-  \[14\] .shstrtab +.*
-  \[15\] .symtab +.*
-  \[16\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp +.*
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+401000 0+1000 0+22a 00 +AX +0 +0 +4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+60122a 0+122a 0+60 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .tbss +NOBITS +0+60128a 0+128a 0+40 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601290 0+1290 0+140 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+6013d0 0+13d0 0+20 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .got.plt +PROGBITS +0+6013f0 0+13f0 0+20 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -36 +36 @@ Entry point 0x40113c
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -68 +68 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -80 +80 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 66 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-x86-64/tlsbindesc.rd
+++ ld/testsuite/ld-x86-64/tlsbindesc.rd
@@ -8 +8 @@
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,15 +12,15 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1\] .interp +.*
-  \[ 2\] .hash +.*
-  \[ 3\] .dynsym +.*
-  \[ 4\] .dynstr +.*
-  \[ 5\] .rela.dyn +.*
-  \[ 6\] .text +PROGBITS +0+401000 0+1000 0+1f6 00 +AX +0 +0 +4096
-  \[ 7\] .tdata +PROGBITS +0+6011f6 0+11f6 0+60 00 WAT +0 +0 +1
-  \[ 8\] .tbss +NOBITS +0+601256 0+1256 0+40 00 WAT +0 +0 +1
-  \[ 9\] .dynamic +DYNAMIC +0+601258 0+1258 0+100 10 +WA +4 +0 +8
-  \[10\] .got +PROGBITS +0+601358 0+1358 0+20 08 +WA +0 +0 +8
-  \[11\] .got.plt +PROGBITS +0+601378 0+1378 0+18 08 +WA +0 +0 +8
-  \[12\] .shstrtab +.*
-  \[13\] .symtab +.*
-  \[14\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .interp +.*
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+401000 0+1000 0+1f6 00 +AX +0 +0 +4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+6011f6 0+11f6 0+60 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .tbss +NOBITS +0+601256 0+1256 0+40 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+601258 0+1258 0+100 10 +WA +4 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+601358 0+1358 0+20 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .got.plt +PROGBITS +0+601378 0+1378 0+18 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -34 +34 @@ Entry point 0x401108
-There are 6 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -62 +62 @@ Relocation section '.rela.dyn' at offset
-Symbol table '.dynsym' contains 8 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -73 +73 @@ Symbol table '.dynsym' contains 8 entrie
-Symbol table '.symtab' contains 64 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-x86-64/tlsdesc.rd
+++ ld/testsuite/ld-x86-64/tlsdesc.rd
@@ -8 +8 @@
-There are 16 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,16 +12,16 @@ Section Headers:
-  \[ 0\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
-  \[ 1\] .hash +.*
-  \[ 2\] .dynsym +.*
-  \[ 3\] .dynstr +.*
-  \[ 4\] .rela.dyn +.*
-  \[ 5\] .rela.plt +.*
-  \[ 6\] .plt +PROGBITS +0+450 0+450 0+20 10 +AX +0 +0 +4
-  \[ 7\] .text +PROGBITS +0+1000 0+1000 0+154 00 +AX +0 +0 4096
-  \[ 8\] .tdata +PROGBITS +0+201154 0+1154 0+60 00 WAT +0 +0 +1
-  \[ 9\] .tbss +NOBITS +0+2011b4 0+11b4 0+20 00 WAT +0 +0 +1
-  \[10\] .dynamic +DYNAMIC +0+2011b8 0+11b8 0+150 10 +WA +3 +0 +8
-  \[11\] .got +PROGBITS +0+201308 0+1308 0+48 08 +WA +0 +0 +8
-  \[12\] .got.plt +PROGBITS +0+201350 0+1350 0+68 08 +WA +0 +0 +8
-  \[13\] .shstrtab +.*
-  \[14\] .symtab +.*
-  \[15\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .plt +PROGBITS +0+450 0+450 0+20 10 +AX +0 +0 +4
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+154 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+201154 0+1154 0+60 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .tbss +NOBITS +0+2011b4 0+11b4 0+20 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+2011b8 0+11b8 0+150 10 +WA +3 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+201308 0+1308 0+48 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .got.plt +PROGBITS +0+201350 0+1350 0+68 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -35 +35 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -89 +89 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -107 +107 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 52 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-x86-64/tlsgdesc.rd
+++ ld/testsuite/ld-x86-64/tlsgdesc.rd
@@ -7 +7 @@
-There are [0-9]+ section headers, starting at offset 0x.*:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -11,14 +11,14 @@ Section Headers:
-  \[ 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 +.*
-  \[ 8\] \.dynamic +.*
-  \[ 9\] \.got +.*
-  \[10\] \.got.plt +.*
-  \[11\] \.shstrtab +.*
-  \[12\] \.symtab +.*
-  \[13\] \.strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 0+ +0 +0 +0
+ +\[[ 0-9]+\] \.hash +.*
+ +\[[ 0-9]+\] \.dynsym +.*
+ +\[[ 0-9]+\] \.dynstr +.*
+ +\[[ 0-9]+\] \.rela.dyn +.*
+ +\[[ 0-9]+\] \.rela.plt +.*
+ +\[[ 0-9]+\] \.plt +.*
+ +\[[ 0-9]+\] \.text +.*
+ +\[[ 0-9]+\] \.dynamic +.*
+ +\[[ 0-9]+\] \.got +.*
+ +\[[ 0-9]+\] \.got.plt +.*
+ +\[[ 0-9]+\] \.shstrtab +.*
+ +\[[ 0-9]+\] \.symtab +.*
+ +\[[ 0-9]+\] \.strtab +.*
@@ -63 +63 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains 13 entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -79 +79 @@ Symbol table '.dynsym' contains 13 entri
-Symbol table '.symtab' contains 24 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
--- ld/testsuite/ld-x86-64/tlspic.rd
+++ ld/testsuite/ld-x86-64/tlspic.rd
@@ -8 +8 @@
-There are 16 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
@@ -12,16 +12,16 @@ Section Headers:
-  \[ 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 +0+1000 0+1000 0+1ac 00 +AX +0 +0 4096
-  \[ 8\] .tdata +PROGBITS +0+2011ac 0+11ac 0+60 00 WAT +0 +0 +1
-  \[ 9\] .tbss +NOBITS +0+20120c 0+120c 0+20 00 WAT +0 +0 +1
-  \[10\] .dynamic +DYNAMIC +0+201210 0+1210 0+130 10 +WA +3 +0 +8
-  \[11\] .got +PROGBITS +0+201340 0+1340 0+90 08 +WA +0 +0 +8
-  \[12\] .got.plt +PROGBITS +0+2013d0 0+13d0 0+20 08 +WA +0 +0 +8
-  \[13\] .shstrtab +.*
-  \[14\] .symtab +.*
-  \[15\] .strtab +.*
+ +\[[ 0-9]+\] +NULL +0+ 0+ 0+ 00 +0 +0 +0
+ +\[[ 0-9]+\] .hash +.*
+ +\[[ 0-9]+\] .dynsym +.*
+ +\[[ 0-9]+\] .dynstr +.*
+ +\[[ 0-9]+\] .rela.dyn +.*
+ +\[[ 0-9]+\] .rela.plt +.*
+ +\[[ 0-9]+\] .plt +.*
+ +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+1ac 00 +AX +0 +0 4096
+ +\[[ 0-9]+\] .tdata +PROGBITS +0+2011ac 0+11ac 0+60 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .tbss +NOBITS +0+20120c 0+120c 0+20 00 WAT +0 +0 +1
+ +\[[ 0-9]+\] .dynamic +DYNAMIC +0+201210 0+1210 0+130 10 +WA +3 +0 +8
+ +\[[ 0-9]+\] .got +PROGBITS +0+201340 0+1340 0+90 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .got.plt +PROGBITS +0+2013d0 0+13d0 0+20 08 +WA +0 +0 +8
+ +\[[ 0-9]+\] .shstrtab +.*
+ +\[[ 0-9]+\] .symtab +.*
+ +\[[ 0-9]+\] .strtab +.*
@@ -35 +35 @@ Entry point 0x1000
-There are 4 program headers, starting at offset [0-9]+
+There are [0-9]+ program headers, starting at offset [0-9]+
@@ -72 +72 @@ Relocation section '.rela.plt' at offset
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
@@ -91 +91 @@ Symbol table '.dynsym' contains [0-9]+ e
-Symbol table '.symtab' contains 52 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]