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

	* 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]+.
	* ld-alpha/tlsbinr.rd: Likewise.
	* ld-alpha/tlspic.rd: Likewise.
	* ld-i386/tlsbin.rd: Likewise.
	* ld-i386/tlsbindesc.rd: Likewise.
	* ld-i386/tlsdesc.rd: Likewise.
	* ld-i386/tlsgdesc.rd: Likewise.
	* ld-i386/tlsnopic.rd: Likewise.
	* ld-i386/tlspic.rd: Likewise.
	* ld-ia64/tlsbin.rd: Likewise.
	* ld-ia64/tlspic.rd: Likewise.
	* ld-powerpc/tlsexe.r: Likewise.
	* ld-powerpc/tlsexe32.r: Likewise.
	* ld-powerpc/tlsexetoc.r: Likewise.
	* ld-powerpc/tlsso.r: Likewise.
	* ld-powerpc/tlsso32.r: Likewise.
	* ld-powerpc/tlstocso.r: Likewise.
	* ld-s390/tlsbin.rd: Likewise.
	* ld-s390/tlsbin_64.rd: Likewise.
	* ld-s390/tlspic.rd: Likewise.
	* ld-s390/tlspic_64.rd: Likewise.
	* ld-sparc/tlssunbin32.rd: Likewise.
	* ld-sparc/tlssunbin64.rd: Likewise.
	* ld-sparc/tlssunnopic32.rd: Likewise.
	* ld-sparc/tlssunnopic64.rd: Likewise.
	* ld-sparc/tlssunpic32.rd: Likewise.
	* ld-sparc/tlssunpic64.rd: Likewise.
	* ld-x86-64/tlsbin.rd: Likewise.
	* ld-x86-64/tlsbindesc.rd: Likewise.
	* ld-x86-64/tlsdesc.rd: Likewise.
	* ld-x86-64/tlsgdesc.rd: Likewise.
	* ld-x86-64/tlspic.rd: Likewise.

4 files changed, 78 insertions, 78 deletions

diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
index ce98d4f..c6bfc5b 100644
--- a/ld/testsuite/ld-s390/tlsbin.rd
+++ b/ld/testsuite/ld-s390/tlsbin.rd
@@ -5,26 +5,26 @@
 #readelf: -Ssrl
 #target: s390-*-*
 
-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]+:
 
 Section Headers:
   \[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
-  \[ 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 .*
 Key to Flags:
 .*
 .*
@@ -32,7 +32,7 @@ Key to Flags:
 
 Elf file type is EXEC \(Executable file\)
 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]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
@@ -64,7 +64,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym.Value  Sym. Name \+ Addend
 [0-9a-f ]+R_390_JMP_SLOT[0-9a-f ]+__tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
 .* NOTYPE  LOCAL  DEFAULT  UND 
 .* TLS +GLOBAL DEFAULT  UND sG3
@@ -76,7 +76,7 @@ Symbol table '.dynsym' contains [0-9]+ entries:
 .* NOTYPE  GLOBAL DEFAULT  ABS _edata
 .* NOTYPE  GLOBAL DEFAULT  ABS _end
 
-Symbol table '.symtab' contains 65 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
 .* NOTYPE  LOCAL  DEFAULT  UND 
 .* SECTION LOCAL  DEFAULT +1 
diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
index efcb25a..62b240b 100644
--- a/ld/testsuite/ld-s390/tlsbin_64.rd
+++ b/ld/testsuite/ld-s390/tlsbin_64.rd
@@ -5,26 +5,26 @@
 #readelf: -Ssrl
 #target: s390x-*-*
 
-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]+:
 
 Section Headers:
   \[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
-  \[ 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 .*
 Key to Flags:
 .*
 .*
@@ -32,7 +32,7 @@ Key to Flags:
 
 Elf file type is EXEC \(Executable file\)
 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]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
@@ -64,7 +64,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
 [0-9a-f ]+R_390_JMP_SLOT[0-9a-f ]+__tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 .* NOTYPE +LOCAL +DEFAULT +UND 
 .* TLS +GLOBAL DEFAULT +UND sG3
@@ -76,7 +76,7 @@ Symbol table '.dynsym' contains [0-9]+ entries:
 .* NOTYPE +GLOBAL DEFAULT +ABS _edata
 .* NOTYPE +GLOBAL DEFAULT +ABS _end
 
-Symbol table '.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 .* NOTYPE +LOCAL +DEFAULT +UND 
 .* SECTION LOCAL +DEFAULT +1 
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index 2e7ebde..1e79a2e 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -5,25 +5,25 @@
 #readelf: -Ssrl
 #target: s390-*-*
 
-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]+:
 
 Section Headers:
   \[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
-  \[ 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 .*
 Key to Flags:
 .*
 .*
@@ -31,7 +31,7 @@ Key to Flags:
 
 Elf file type is DYN \(Shared object file\)
 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]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz  Flg Align
@@ -68,7 +68,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym.Value  Sym. Name \+ Addend
 [0-9a-f ]+R_390_JMP_SLOT +0+ +__tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
 .* NOTYPE  LOCAL  DEFAULT  UND 
 .* SECTION LOCAL  DEFAULT +7 
@@ -87,7 +87,7 @@ Symbol table '.dynsym' contains [0-9]+ entries:
 .* NOTYPE  GLOBAL DEFAULT  ABS _edata
 .* NOTYPE  GLOBAL DEFAULT  ABS _end
 
-Symbol table '.symtab' contains 51 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value  Size Type +Bind +Vis +Ndx Name
 .* NOTYPE  LOCAL  DEFAULT  UND 
 .* SECTION LOCAL  DEFAULT +1 
diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index 3fef928..62c1a76 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -5,25 +5,25 @@
 #readelf: -WSsrl
 #target: s390x-*-*
 
-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]+:
 
 Section Headers:
   \[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
-  \[ 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 .*
 Key to Flags:
 .*
 .*
@@ -31,7 +31,7 @@ Key to Flags:
 
 Elf file type is DYN \(Shared object file\)
 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]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
@@ -68,7 +68,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value  Symbol's Name \+ Addend
 [0-9a-f ]+R_390_JMP_SLOT +0+ __tls_get_offset \+ 0
 
-Symbol table '.dynsym' contains [0-9]+ entries:
+Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 .* NOTYPE  LOCAL  DEFAULT  UND 
 .* SECTION LOCAL  DEFAULT +7 
@@ -87,7 +87,7 @@ Symbol table '.dynsym' contains [0-9]+ entries:
 .* NOTYPE  GLOBAL DEFAULT  ABS _edata
 .* NOTYPE  GLOBAL DEFAULT  ABS _end
 
-Symbol table '.symtab' contains .* entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
 .* NOTYPE  LOCAL  DEFAULT  UND 
 .* SECTION LOCAL  DEFAULT +1