diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2007-09-30 01:33:15 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-09-30 01:33:15 +0000 |
| commit | c9ccd0dfa0dbdda5a460ea69ce977b0af31dfc20 (patch) | |
| tree | 734e20bb6d88e7fdc64cc99dd3e1dd7b4d5273cc /ld | |
| parent | 844cacac6e101cf67d5ac5613f400e619f3131e1 (diff) | |
| download | fsf-binutils-gdb-c9ccd0dfa0dbdda5a460ea69ce977b0af31dfc20.zip fsf-binutils-gdb-c9ccd0dfa0dbdda5a460ea69ce977b0af31dfc20.tar.gz fsf-binutils-gdb-c9ccd0dfa0dbdda5a460ea69ce977b0af31dfc20.tar.bz2 | |
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.
Diffstat (limited to 'ld')
33 files changed, 649 insertions, 610 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 519fe24..701cac3 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,42 @@ +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. + 2007-09-25 Alan Modra <amodra@bigpond.net.au> * ld-spu/ovl.d: Adjust for stub relocs. diff --git a/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd index e92e55f..a9a9d34 100644 --- a/ld/testsuite/ld-alpha/tlsbin.rd +++ b/ld/testsuite/ld-alpha/tlsbin.rd @@ -6,32 +6,32 @@ #readelf: -WSsrl #target: alpha*-*-* -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]+: 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\] .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 +.* #... 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 @@ -54,7 +54,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]+ [0-9a-f]+ R_ALPHA_JMP_SLOT +[0-9a-f]+ __tls_get_addr \+ 0 -Symbol table '.dynsym' contains [0-9]+ entries: +Symbol table '\.dynsym' contains [0-9]+ entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name [0-9 ]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND * [0-9 ]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2 @@ -64,7 +64,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: [0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata [0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains [0-9]+ entries: +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 diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd index 4938a14..1eaf7ba 100644 --- a/ld/testsuite/ld-alpha/tlsbinr.rd +++ b/ld/testsuite/ld-alpha/tlsbinr.rd @@ -10,28 +10,28 @@ 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\] \.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 +.* #... 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 @@ -49,7 +49,7 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: [0-9a-f]+ +0+100000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0 [0-9a-f]+ +0+400000026 R_ALPHA_TPREL64 +0+ sG1 \+ 0 -Symbol table '.dynsym' contains [0-9]+ 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+ +0 TLS +GLOBAL DEFAULT +UND sG2 @@ -59,7 +59,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: [0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata [0-9 ]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains [0-9]+ entries: +Symbol table '\.symtab' contains [0-9]+ entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name [0-9 ]+: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND [0-9 ]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd index bed345b..b442f74 100644 --- a/ld/testsuite/ld-alpha/tlspic.rd +++ b/ld/testsuite/ld-alpha/tlspic.rd @@ -6,31 +6,31 @@ #readelf: -WSsrl #target: alpha*-*-* -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]+: 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\] .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 +.* #... Elf file type is DYN \(Shared object file\) 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]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -54,7 +54,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]+ +[0-9a-f]+ R_ALPHA_JMP_SLOT +0+ __tls_get_addr \+ 0 -Symbol table '.dynsym' contains [0-9]+ entries: +Symbol table '\.dynsym' contains [0-9]+ entries: Num: Value Size Type Bind Vis Ndx Name .* [0-9a-f]+ 0 NOTYPE LOCAL DEFAULT UND .* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg8 @@ -71,7 +71,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* [0-9a-f]+ 0 NOTYPE GLOBAL DEFAULT ABS _edata .* [0-9a-f]+ 0 NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains [0-9]+ entries: +Symbol table '\.symtab' contains [0-9]+ entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name .* [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND .* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd index 10934cb..56a0deb 100644 --- a/ld/testsuite/ld-i386/tlsbin.rd +++ b/ld/testsuite/ld-i386/tlsbin.rd @@ -5,27 +5,27 @@ #readelf: -Ssrl #target: i?86-*-* -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]+: Section Headers: \[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al - \[ 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 +.* Key to Flags: .* .* @@ -33,7 +33,7 @@ Key to Flags: Elf file type is EXEC \(Executable file\) Entry point 0x8049188 -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 @@ -70,7 +70,7 @@ 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-9a-f]+ +___tls_get_addr -Symbol table '.dynsym' contains [0-9]+ 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+ +0 TLS +GLOBAL DEFAULT UND sG3 @@ -86,7 +86,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG8 +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND ___tls_get_addr -Symbol table '.symtab' contains 70 entries: +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 * diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd index 65b47a2..29f195b 100644 --- a/ld/testsuite/ld-i386/tlsbindesc.rd +++ b/ld/testsuite/ld-i386/tlsbindesc.rd @@ -5,25 +5,25 @@ #readelf: -Ssrl #target: i?86-*-* -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+ 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 +.* Key to Flags: .* .* @@ -31,7 +31,7 @@ Key to Flags: Elf file type is EXEC \(Executable file\) Entry point 0x8049158 -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 '.rel.dyn' at offset 0x[0-9a-f]+ contains 9 entries: 0+804a0fc 00000825 R_386_TLS_TPOFF32 0+ +sG1 0+804a100 00000b0e R_386_TLS_TPOFF +0+ +sG8 -Symbol table '.dynsym' contains [0-9]+ 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+ +0 TLS +GLOBAL DEFAULT UND sG3 @@ -79,7 +79,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG8 -Symbol table '.symtab' contains 68 entries: +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 * diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd index aca162c..72c9c09 100644 --- a/ld/testsuite/ld-i386/tlsdesc.rd +++ b/ld/testsuite/ld-i386/tlsdesc.rd @@ -5,25 +5,25 @@ #readelf: -Ssrl #target: i?86-*-* -There are [0-9]+ section headers, starting at offset 0x.*: +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+ 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 +.* Key to Flags: .* .* @@ -78,7 +78,7 @@ Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 5 entries: [0-9a-f ]+R_386_TLS_DESC * [0-9a-f ]+R_386_TLS_DESC * -Symbol table '.dynsym' contains [0-9]+ 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+1c +0 TLS +GLOBAL DEFAULT +7 sg8 @@ -94,7 +94,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata +[0-9]+: [0-9a-f]+ +0 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 +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 * diff --git a/ld/testsuite/ld-i386/tlsgdesc.rd b/ld/testsuite/ld-i386/tlsgdesc.rd index 0c5c425..d872dca 100644 --- a/ld/testsuite/ld-i386/tlsgdesc.rd +++ b/ld/testsuite/ld-i386/tlsgdesc.rd @@ -4,24 +4,24 @@ #readelf: -Ssrl #target: i?86-*-* -There are [0-9]+ section headers, starting at offset 0x.*: +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+ 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 +.* Key to Flags: .* .* @@ -60,7 +60,7 @@ Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 3 entries: [0-9a-f ]+R_386_TLS_DESC 0+ sG1 [0-9a-f ]+R_386_TLS_DESC 0+ sG2 -Symbol table '.dynsym' contains [0-9]+ 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+ +0 TLS +GLOBAL DEFAULT UND sG3 @@ -75,7 +75,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[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 24 entries: +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 * diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd index 6ba628b..b67d02a 100644 --- a/ld/testsuite/ld-i386/tlsnopic.rd +++ b/ld/testsuite/ld-i386/tlsnopic.rd @@ -5,23 +5,23 @@ #readelf: -Ssrl #target: i?86-*-* -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]+: Section Headers: \[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al - \[ 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 +.* Key to Flags: .* .* @@ -29,7 +29,7 @@ Key to Flags: Elf file type is DYN \(Shared object file\) Entry point 0x1000 -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 @@ -69,7 +69,7 @@ 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 [0-9]+ 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+ +0 TLS +GLOBAL DEFAULT UND sg3 @@ -82,7 +82,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains 30 entries: +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 * diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd index c902cf3..ac41442 100644 --- a/ld/testsuite/ld-i386/tlspic.rd +++ b/ld/testsuite/ld-i386/tlspic.rd @@ -5,26 +5,26 @@ #readelf: -Ssrl #target: i?86-*-* -There are [0-9]+ section headers, starting at offset 0x.*: +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+ 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 +.* Key to Flags: .* .* @@ -81,7 +81,7 @@ 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 [0-9]+ 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+1c +0 TLS +GLOBAL DEFAULT +8 sg8 @@ -98,7 +98,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[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 52 entries: +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 * diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd index 4834338..7f130a4 100644 --- a/ld/testsuite/ld-ia64/tlsbin.rd +++ b/ld/testsuite/ld-ia64/tlsbin.rd @@ -5,34 +5,34 @@ #readelf: -WSsrl #target: ia64-*-* -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]+: 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.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 +.* #... Elf file type is EXEC \(Executable file\) 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]+ Program Headers: Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -56,7 +56,7 @@ Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries +Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend [0-9a-f ]+R_IA64_IPLTLSB +0+ __tls_get_addr \+ 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 sG2 @@ -66,7 +66,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 66 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-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd index b3123a8..509e598 100644 --- a/ld/testsuite/ld-ia64/tlspic.rd +++ b/ld/testsuite/ld-ia64/tlspic.rd @@ -5,34 +5,34 @@ #readelf: -WSsrl #target: ia64-*-* -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]+: Section Headers: \[Nr\] Name +Type +Address +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.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 +.* Key to Flags: #... Elf file type is DYN \(Shared object file\) Entry point 0x1000 -There are 5 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 @@ -56,7 +56,7 @@ Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend [0-9a-f ]+R_IA64_IPLTLSB +0+ __tls_get_addr \+ 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 +10 sg8 @@ -73,7 +73,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 54 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-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r index 296d814..b73aaf1 100644 --- a/ld/testsuite/ld-powerpc/tlsexe.r +++ b/ld/testsuite/ld-powerpc/tlsexe.r @@ -5,32 +5,32 @@ #readelf: -WSsrl #target: powerpc64*-*-* -There are 17 section headers.* +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\] \.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 +.* #... Elf file type is EXEC \(Executable file\) Entry point .* -There are 6 program headers.* +There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -72,7 +72,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 .* 0+ +0 NOTYPE +LOCAL +DEFAULT +UND .* SECTION LOCAL +DEFAULT +1 diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r index ed388ef..86a0ab8 100644 --- a/ld/testsuite/ld-powerpc/tlsexe32.r +++ b/ld/testsuite/ld-powerpc/tlsexe32.r @@ -5,31 +5,31 @@ #readelf: -WSsrl #target: powerpc*-*-* -There are 16 section headers.* +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\] \.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 +.* #... Elf file type is EXEC \(Executable file\) Entry point .* -There are 6 program headers, starting at offset 52 +There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align @@ -70,7 +70,7 @@ Symbol table '\.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '\.symtab' contains 37 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-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r index 539269a..e16bbf4 100644 --- a/ld/testsuite/ld-powerpc/tlsexetoc.r +++ b/ld/testsuite/ld-powerpc/tlsexetoc.r @@ -5,32 +5,32 @@ #readelf: -WSsrl #target: powerpc64*-*-* -There are 17 section headers.* +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\] \.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 +.* #... Elf file type is EXEC \(Executable file\) Entry point .* -There are 6 program headers.* +There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -71,7 +71,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-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r index e40c78d..7dcf173 100644 --- a/ld/testsuite/ld-powerpc/tlsso.r +++ b/ld/testsuite/ld-powerpc/tlsso.r @@ -4,31 +4,31 @@ #readelf: -WSsrl #target: powerpc64*-*-* -There are 16 section headers.* +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\] \.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 .* #... Elf file type is DYN \(Shared object file\) Entry point 0x[0-9a-f]+ -There are 4 program headers.* +There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -67,7 +67,7 @@ Relocation section '\.rela\.plt' at offset .* contains 1 entries: +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend [0-9a-f ]+R_PPC64_JMP_SLOT +0+ __tls_get_addr \+ 0 -Symbol table '\.dynsym' contains .* entries: +Symbol table '\.dynsym' contains [0-9]+ entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name .* NOTYPE +LOCAL +DEFAULT +UND .* SECTION LOCAL +DEFAULT +6 @@ -87,7 +87,7 @@ Symbol table '\.dynsym' contains .* entries: .* TLS +GLOBAL DEFAULT +8 gd0 .* TLS +GLOBAL DEFAULT +8 ie0 -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-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r index 545c462..b29f2c4 100644 --- a/ld/testsuite/ld-powerpc/tlsso32.r +++ b/ld/testsuite/ld-powerpc/tlsso32.r @@ -4,30 +4,30 @@ #readelf: -WSsrl #target: powerpc*-*-* -There are 15 section headers.* +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+ 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 +.* #... Elf file type is DYN \(Shared object file\) Entry point 0x[0-9a-f]+ -There are 4 program headers.* +There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align @@ -89,7 +89,7 @@ Symbol table '\.dynsym' contains [0-9]+ entries: .* TLS +GLOBAL DEFAULT +8 gd0 .* TLS +GLOBAL DEFAULT +8 ie0 -Symbol table '\.symtab' contains 36 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-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r index ca59f4e..9c9e01c 100644 --- a/ld/testsuite/ld-powerpc/tlstocso.r +++ b/ld/testsuite/ld-powerpc/tlstocso.r @@ -4,31 +4,31 @@ #readelf: -WSsrl #target: powerpc64*-*-* -There are 16 section headers.* +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\] \.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 .* #... Elf file type is DYN \(Shared object file\) Entry point 0x[0-9a-f]+ -There are 4 program headers.* +There are [0-9]+ program headers, starting at offset [0-9]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -82,7 +82,7 @@ Symbol table '\.dynsym' contains [0-9]+ entries: .* TLS +GLOBAL DEFAULT +8 gd0 .* TLS +GLOBAL DEFAULT +8 ie0 -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/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 diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd index cf502c0..3af973e 100644 --- a/ld/testsuite/ld-sparc/tlssunbin32.rd +++ b/ld/testsuite/ld-sparc/tlssunbin32.rd @@ -8,25 +8,25 @@ 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\] .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 +.* #... Elf file type is EXEC \(Executable file\) Entry point 0x12000 -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 @@ -46,7 +46,7 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: [0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG6 \+ 0 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +00000000 +sG1 \+ 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 sG5 @@ -58,7 +58,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 64 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-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd index 6a42c90..1738639 100644 --- a/ld/testsuite/ld-sparc/tlssunbin64.rd +++ b/ld/testsuite/ld-sparc/tlssunbin64.rd @@ -8,25 +8,25 @@ 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\] .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 +.* #... Elf file type is EXEC \(Executable file\) Entry point 0x102000 -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 @@ -46,7 +46,7 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG6 \+ 0 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sG1 \+ 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 sG5 @@ -58,7 +58,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 64 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-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd index 7b3c84c..01876d7 100644 --- a/ld/testsuite/ld-sparc/tlssunnopic32.rd +++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd @@ -9,22 +9,22 @@ Section Headers: +\[Nr\] Name +Type +Addr +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\] .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 +.* #... Elf file type is DYN \(Shared object file\) 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]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align @@ -49,7 +49,7 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: [0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0 [0-9a-f ]+R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 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 +5 * @@ -62,7 +62,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 27 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-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd index 7c53027..96a426c 100644 --- a/ld/testsuite/ld-sparc/tlssunnopic64.rd +++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd @@ -9,22 +9,22 @@ 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\] .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 +.* #... Elf file type is DYN \(Shared object file\) 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]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align @@ -51,7 +51,7 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg1 \+ 0 [0-9a-f ]+R_SPARC_TLS_TPOFF64 +0+ +sg2 \+ 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 +5 * @@ -64,7 +64,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 27 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-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd index 0f99170..f947a3c 100644 --- a/ld/testsuite/ld-sparc/tlssunpic32.rd +++ b/ld/testsuite/ld-sparc/tlssunpic32.rd @@ -5,30 +5,30 @@ #readelf: -WSsrl #target: sparc*-*-* -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+ 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 +.* #... Elf file type is DYN \(Shared object file\) Entry point 0x1000 -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 @@ -59,7 +59,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend [0-9a-f ]+R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 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 +6 * @@ -79,7 +79,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 52 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-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd index 0a94292..e063358 100644 --- a/ld/testsuite/ld-sparc/tlssunpic64.rd +++ b/ld/testsuite/ld-sparc/tlssunpic64.rd @@ -5,30 +5,30 @@ #readelf: -WSsrl #target: sparc*-*-* -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\] .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 +.* #... Elf file type is DYN \(Shared object file\) Entry point 0x1000 -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 @@ -59,7 +59,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_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 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 +6 * @@ -79,7 +79,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE +GLOBAL DEFAULT +ABS _edata .* NOTYPE +GLOBAL DEFAULT +ABS _end -Symbol table '.symtab' contains 52 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-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd index 915208a..cf47b4e 100644 --- a/ld/testsuite/ld-x86-64/tlsbin.rd +++ b/ld/testsuite/ld-x86-64/tlsbin.rd @@ -5,27 +5,27 @@ #readelf: -WSsrl #target: x86_64-*-* -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]+: 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 +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 +.* Key to Flags: .* .* @@ -33,7 +33,7 @@ Key to Flags: Elf file type is EXEC \(Executable file\) Entry point 0x40113c -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 @@ -65,7 +65,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_X86_64_JUMP_SLOT[0-9a-f ]+__tls_get_addr \+ 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 sG5 @@ -77,7 +77,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE GLOBAL DEFAULT ABS _edata .* NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains 66 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-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd index ae2e80f..e90a061 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.rd +++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd @@ -5,25 +5,25 @@ #readelf: -WSsrl #target: x86_64-*-* -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+ 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 +.* Key to Flags: .* .* @@ -31,7 +31,7 @@ Key to Flags: Elf file type is EXEC \(Executable file\) Entry point 0x401108 -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 @@ -59,7 +59,7 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries: 0+601368 0+400000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0 0+601370 0+500000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0 -Symbol table '.dynsym' contains 8 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+ +0 TLS +GLOBAL DEFAULT UND sG5 @@ -70,7 +70,7 @@ Symbol table '.dynsym' contains 8 entries: +[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata +[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains 64 entries: +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 * diff --git a/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd index 20aa075..a69bde1 100644 --- a/ld/testsuite/ld-x86-64/tlsdesc.rd +++ b/ld/testsuite/ld-x86-64/tlsdesc.rd @@ -5,26 +5,26 @@ #readelf: -WSsrld #target: x86_64-*-* -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\] .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 +.* Key to Flags: .* .* @@ -32,7 +32,7 @@ Key to Flags: Elf file type is DYN \(Shared object file\) Entry point 0x1000 -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 @@ -86,7 +86,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 5 entries: 0+201378 [0-9a-f]+ R_X86_64_TLSDESC +0+60 0+201388 [0-9a-f]+ R_X86_64_TLSDESC +0+ -Symbol table '.dynsym' contains [0-9]+ 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 * @@ -104,7 +104,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains 52 entries: +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 * diff --git a/ld/testsuite/ld-x86-64/tlsgdesc.rd b/ld/testsuite/ld-x86-64/tlsgdesc.rd index c965c95..7806a97 100644 --- a/ld/testsuite/ld-x86-64/tlsgdesc.rd +++ b/ld/testsuite/ld-x86-64/tlsgdesc.rd @@ -4,24 +4,24 @@ #readelf: -WSsrl #target: x86_64-*-* -There are [0-9]+ section headers, starting at offset 0x.*: +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 +.* - \[ 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 +.* Key to Flags: .* .* @@ -60,7 +60,7 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 3 entries: [0-9a-f]+ 0+a00000024 R_X86_64_TLSDESC +0+ sG1 \+ 0 [0-9a-f]+ 0+400000024 R_X86_64_TLSDESC +0+ sG2 \+ 0 -Symbol table '.dynsym' contains 13 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 * @@ -76,7 +76,7 @@ Symbol table '.dynsym' contains 13 entries: +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains 24 entries: +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 * diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd index 492cf6f..f62901c 100644 --- a/ld/testsuite/ld-x86-64/tlspic.rd +++ b/ld/testsuite/ld-x86-64/tlspic.rd @@ -5,26 +5,26 @@ #readelf: -WSsrl #target: x86_64-*-* -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\] .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 +.* Key to Flags: .* .* @@ -32,7 +32,7 @@ Key to Flags: Elf file type is DYN \(Shared object file\) Entry point 0x1000 -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 @@ -69,7 +69,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_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 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 * @@ -88,7 +88,7 @@ Symbol table '.dynsym' contains [0-9]+ entries: .* NOTYPE GLOBAL DEFAULT ABS _edata .* NOTYPE GLOBAL DEFAULT ABS _end -Symbol table '.symtab' contains 52 entries: +Symbol table '\.symtab' contains [0-9]+ entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name .* NOTYPE LOCAL DEFAULT UND * .* SECTION LOCAL DEFAULT +1 * |