From 3403418e496fa5c0ba46836c83d5045bc152cd11 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <hjl.tools@gmail.com> Date: Fri, 8 Jul 2005 16:20:24 +0000 Subject: [PATCH] 2005-07-08 H.J. Lu <hongjiu.lu@intel.com> * ld-ia64/tlsbin.rd: Update for empty section removal change. * ld-ia64/tlsbin.sd: Likewise. * ld-ia64/tlspic.dd: Likewise. * ld-ia64/tlspic.rd: Likewise. * ld-ia64/tlspic.sd: Likewise. * ld-x86-64/tlspic.dd: Likewise. * ld-x86-64/tlspic.rd: Likewise. --- ld/testsuite/ChangeLog | 10 ++++++++++ ld/testsuite/ld-ia64/tlsbin.rd | 10 +++++----- ld/testsuite/ld-ia64/tlsbin.sd | 10 +++++----- ld/testsuite/ld-ia64/tlspic.dd | 8 ++++---- ld/testsuite/ld-ia64/tlspic.rd | 22 ++++++++++------------ ld/testsuite/ld-ia64/tlspic.sd | 10 +++++----- ld/testsuite/ld-x86-64/tlspic.dd | 14 +++++++------- ld/testsuite/ld-x86-64/tlspic.rd | 14 ++++++-------- 8 files changed, 52 insertions(+), 46 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 8ec79045fd2..bd152a09b65 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2005-07-08 H.J. Lu <hongjiu.lu@intel.com> + + * ld-ia64/tlsbin.rd: Update for empty section removal change. + * ld-ia64/tlsbin.sd: Likewise. + * ld-ia64/tlspic.dd: Likewise. + * ld-ia64/tlspic.rd: Likewise. + * ld-ia64/tlspic.sd: Likewise. + * ld-x86-64/tlspic.dd: Likewise. + * ld-x86-64/tlspic.rd: Likewise. + 2005-07-08 Alan Modra <amodra@bigpond.net.au> * ld-cris/pv32.s: Give expobj a size. diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd index e66777d63c1..fe5683f5e4b 100644 --- a/ld/testsuite/ld-ia64/tlsbin.rd +++ b/ld/testsuite/ld-ia64/tlsbin.rd @@ -23,7 +23,7 @@ Section Headers: \[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+2000 0+2000 0+48 00 WAp +0 +0 +8 + \[14\] .got +PROGBITS +60+1318 0+1318 0+48 00 WAp +0 +0 +8 \[15\] .IA_64.pltoff +.* \[16\] .shstrtab +.* \[17\] .symtab +.* @@ -48,13 +48,13 @@ Program Headers: Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries: +Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend -60+2018 0+200000097 R_IA64_TPREL64LSB +0+ sG2 \+ 0 -60+2020 0+5000000a7 R_IA64_DTPMOD64LSB +0+ sG1 \+ 0 -60+2028 0+5000000b7 R_IA64_DTPREL64LSB +0+ sG1 \+ 0 +60+1330 0+200000097 R_IA64_TPREL64LSB +0+ sG2 \+ 0 +60+1338 0+5000000a7 R_IA64_DTPMOD64LSB +0+ sG1 \+ 0 +60+1340 0+5000000b7 R_IA64_DTPREL64LSB +0+ sG1 \+ 0 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 -60+2050 0+300000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0 +60+1360 0+300000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0 Symbol table '.dynsym' contains 8 entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name diff --git a/ld/testsuite/ld-ia64/tlsbin.sd b/ld/testsuite/ld-ia64/tlsbin.sd index 4ee17c6e0f0..5d8ab659045 100644 --- a/ld/testsuite/ld-ia64/tlsbin.sd +++ b/ld/testsuite/ld-ia64/tlsbin.sd @@ -8,8 +8,8 @@ .*: +file format elf..-ia64-.* Contents of section .got: - (60+)?2000 0+ 0+ 0+ 0+ .* - (60+)?2010 0+ 0+ 0+ 0+ .* - (60+)?2020 0+ 0+ 0+ 0+ .* - (60+)?2030 01000000 0+ 90000000 0+ .* - (60+)?2040 24000000 0+ .* + (60+)?1318 0+ 0+ 0+ 0+ .* + (60+)?1328 0+ 0+ 0+ 0+ .* + (60+)?1338 0+ 0+ 0+ 0+ .* + (60+)?1348 01000000 0+ 90000000 0+ .* + (60+)?1358 24000000 0+ .* diff --git a/ld/testsuite/ld-ia64/tlspic.dd b/ld/testsuite/ld-ia64/tlspic.dd index a8953c5266d..f4e2f800c26 100644 --- a/ld/testsuite/ld-ia64/tlspic.dd +++ b/ld/testsuite/ld-ia64/tlspic.dd @@ -18,25 +18,25 @@ Disassembly of section .text: +101c: 01 0a 00 90[ ]+addl r15=32,r1;; +1020: 19 18 01 1c 18 10[ ]+\[MMB\] +ld8 r35=\[r14\] +1026: 40 02 3c 30 20 00[ ]+ld8 r36=\[r15\] - +102c: 68 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; + +102c: 28 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; +1030: 0d 70 c0 02 00 24[ ]+\[MFI\] +addl r14=48,r1 +1036: 00 00 00 02 00 e0[ ]+nop.f 0x0 +103c: 01 0c 00 90[ ]+addl r15=64,r1;; +1040: 19 18 01 1c 18 10[ ]+\[MMB\] +ld8 r35=\[r14\] +1046: 40 02 3c 30 20 00[ ]+ld8 r36=\[r15\] - +104c: 48 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; + +104c: 08 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; +1050: 0d 70 c0 02 00 24[ ]+\[MFI\] +addl r14=48,r1 +1056: 00 00 00 02 00 80[ ]+nop.f 0x0 +105c: 14 02 00 90[ ]+mov r36=33;; +1060: 1d 18 01 1c 18 10[ ]+\[MFB\] +ld8 r35=\[r14\] +1066: 00 00 00 02 00 00[ ]+nop.f 0x0 - +106c: 28 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; + +106c: e8 f4 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; +1070: 0d 70 c0 02 00 24[ ]+\[MFI\] +addl r14=48,r1 +1076: 00 00 00 02 00 80[ ]+nop.f 0x0 +107c: 04 00 00 84[ ]+mov r36=r0;; +1080: 1d 18 01 1c 18 10[ ]+\[MFB\] +ld8 r35=\[r14\] +1086: 00 00 00 02 00 00[ ]+nop.f 0x0 - +108c: 08 f5 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; + +108c: c8 f4 ff 58[ ]+br.call.sptk.many b0=[0-9a-f]+ <.*>;; +1090: 0b 10 00 10 00 21[ ]+\[MMI\] +mov r2=r8;; +1096: e0 00 0a 00 48 e0[ ]+addl r14=64,r2 +109c: 21 16 00 90[ ]+addl r15=98,r2;; diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd index a5a33701c97..c0e151f80df 100644 --- a/ld/testsuite/ld-ia64/tlspic.rd +++ b/ld/testsuite/ld-ia64/tlspic.rd @@ -22,7 +22,7 @@ Section Headers: \[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+12000 0+2000 0+50 00 WAp +0 +0 +8 + \[13\] .got +PROGBITS +0+112d8 0+12d8 0+50 00 WAp +0 +0 +8 \[14\] .IA_64.pltoff +.* \[15\] .shstrtab +.* \[16\] .symtab +.* @@ -45,18 +45,18 @@ Program Headers: Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 6 entries: +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend -0+12018 +0+f000000a7 R_IA64_DTPMOD64LSB +0+ sg1 \+ 0 -0+12020 +0+f000000b7 R_IA64_DTPREL64LSB +0+ sg1 \+ 0 -0+12028 +0+1200000097 R_IA64_TPREL64LSB +0+4 sg2 \+ 0 -0+12030 +0+a7 R_IA64_DTPMOD64LSB +0+ -0+12038 +0+97 R_IA64_TPREL64LSB +0+44 -0+12048 +0+97 R_IA64_TPREL64LSB +0+24 +0+112f0 +0+d000000a7 R_IA64_DTPMOD64LSB +0+ sg1 \+ 0 +0+112f8 +0+d000000b7 R_IA64_DTPREL64LSB +0+ sg1 \+ 0 +0+11300 +0+1000000097 R_IA64_TPREL64LSB +0+4 sg2 \+ 0 +0+11308 +0+a7 R_IA64_DTPMOD64LSB +0+ +0+11310 +0+97 R_IA64_TPREL64LSB +0+44 +0+11320 +0+97 R_IA64_TPREL64LSB +0+24 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+[0-9a-f]+ +0+e00000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0 +0+[0-9a-f]+ +0+c00000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0 -Symbol table '.dynsym' contains 23 entries: +Symbol table '.dynsym' contains 21 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 * @@ -64,9 +64,7 @@ Symbol table '.dynsym' contains 23 entries: +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 * - +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 * - +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND * +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +10 sg8 +[0-9]+: 0+11[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +10 sg3 @@ -124,7 +122,7 @@ Symbol table '.symtab' contains 57 entries: +[0-9]+: 0+74 +0 TLS +LOCAL +HIDDEN +11 sH6 +[0-9]+: 0+7c +0 TLS +LOCAL +HIDDEN +11 sH8 +[0-9]+: 0+40 +0 TLS +LOCAL +HIDDEN +10 sh1 - +[0-9]+: 0+12000 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_ + +[0-9]+: 0+112d8 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+44 +0 TLS +LOCAL +HIDDEN +10 sh2 +[0-9]+: 0+54 +0 TLS +LOCAL +HIDDEN +10 sh6 +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +10 sg8 diff --git a/ld/testsuite/ld-ia64/tlspic.sd b/ld/testsuite/ld-ia64/tlspic.sd index 0838b0f86e3..7b03a084321 100644 --- a/ld/testsuite/ld-ia64/tlspic.sd +++ b/ld/testsuite/ld-ia64/tlspic.sd @@ -8,8 +8,8 @@ .*: +file format elf..-ia64-.* Contents of section .got: - 12000 0+ 0+ 0+ 0+ .* - 12010 0+ 0+ [0-9a-f]+ [0-9a-f]+ .* - 12020 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ .* - 12030 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ .* - 12040 440+ 0+ [0-9a-f]+ [0-9a-f]+ .* + 112d8 0+ 0+ 0+ 0+ .* + 112e8 0+ 0+ [0-9a-f]+ [0-9a-f]+ .* + 112f8 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ .* + 11308 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ .* + 11318 440+ 0+ [0-9a-f]+ [0-9a-f]+ .* diff --git a/ld/testsuite/ld-x86-64/tlspic.dd b/ld/testsuite/ld-x86-64/tlspic.dd index e49ad4d1776..95e908ef624 100644 --- a/ld/testsuite/ld-x86-64/tlspic.dd +++ b/ld/testsuite/ld-x86-64/tlspic.dd @@ -22,7 +22,7 @@ Disassembly of section .text: # -> R_X86_64_DTPMOD64 sg1 +1010: 66[ ]+data16 +1011: 66[ ]+data16 - +1012: 48 e8 58 f5 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> + +1012: 48 e8 20 f5 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +1018: 90[ ]+nop * +1019: 90[ ]+nop * @@ -43,7 +43,7 @@ Disassembly of section .text: # -> R_X86_64_DTPMOD64 [0 0x2000000000000000] +1038: 66[ ]+data16 +1039: 66[ ]+data16 - +103a: 48 e8 30 f5 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> + +103a: 48 e8 f8 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +1040: 90[ ]+nop * +1041: 90[ ]+nop * @@ -64,7 +64,7 @@ Disassembly of section .text: # -> R_X86_64_DTPMOD64 [0 0x4000000000000000] +1060: 66[ ]+data16 +1061: 66[ ]+data16 - +1062: 48 e8 08 f5 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> + +1062: 48 e8 d0 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +1068: 90[ ]+nop * +1069: 90[ ]+nop * @@ -85,7 +85,7 @@ Disassembly of section .text: # -> R_X86_64_DTPMOD64 [0 0x6000000000000000] +1088: 66[ ]+data16 +1089: 66[ ]+data16 - +108a: 48 e8 e0 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> + +108a: 48 e8 a8 f4 ff ff[ ]+rex64 callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +1090: 90[ ]+nop * +1091: 90[ ]+nop * @@ -103,7 +103,7 @@ Disassembly of section .text: # LD +10a8: 48 8d 3d b1 02 10 00[ ]+lea 1049265\(%rip\),%rdi +# 101360 <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10af: e8 bc f4 ff ff[ ]+callq [0-9a-f]+ <.*> + +10af: e8 84 f4 ff ff[ ]+callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +10b4: 90[ ]+nop * +10b5: 90[ ]+nop * @@ -118,7 +118,7 @@ Disassembly of section .text: # LD against hidden and local variables +10ca: 48 8d 3d 8f 02 10 00[ ]+lea 1049231\(%rip\),%rdi +# 101360 <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10d1: e8 9a f4 ff ff[ ]+callq [0-9a-f]+ <.*> + +10d1: e8 62 f4 ff ff[ ]+callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +10d6: 90[ ]+nop * +10d7: 90[ ]+nop * @@ -133,7 +133,7 @@ Disassembly of section .text: # LD against hidden but not local variables +10ec: 48 8d 3d 6d 02 10 00[ ]+lea 1049197\(%rip\),%rdi +# 101360 <.*> # -> R_X86_64_DTPMOD64 [0 0x000000000000000] - +10f3: e8 78 f4 ff ff[ ]+callq [0-9a-f]+ <.*> + +10f3: e8 40 f4 ff ff[ ]+callq [0-9a-f]+ <.*> # -> R_X86_64_JUMP_SLOT __tls_get_addr +10f8: 90[ ]+nop * +10f9: 90[ ]+nop * diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd index 7a4e6150878..e13b04abc2c 100644 --- a/ld/testsuite/ld-x86-64/tlspic.rd +++ b/ld/testsuite/ld-x86-64/tlspic.rd @@ -60,23 +60,21 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: 0+1013a8 0+12 R_X86_64_TPOFF64 +0+70 0+1013b8 0+10 R_X86_64_DTPMOD64 +0+ 0+1013c8 0+12 R_X86_64_TPOFF64 +0+44 -0+101388 0+a00000012 R_X86_64_TPOFF64 +0+10 sg5 \+ 0 -0+101390 0+c00000010 R_X86_64_DTPMOD64 +0+ sg1 \+ 0 -0+101398 0+c00000011 R_X86_64_DTPOFF64 +0+ sg1 \+ 0 -0+1013b0 0+f00000012 R_X86_64_TPOFF64 +0+4 sg2 \+ 0 +0+101388 0+800000012 R_X86_64_TPOFF64 +0+10 sg5 \+ 0 +0+101390 0+a00000010 R_X86_64_DTPMOD64 +0+ sg1 \+ 0 +0+101398 0+a00000011 R_X86_64_DTPOFF64 +0+ sg1 \+ 0 +0+1013b0 0+d00000012 R_X86_64_TPOFF64 +0+4 sg2 \+ 0 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: +Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend -0+[0-9a-f]+ 0+b00000007 R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0 +0+[0-9a-f]+ 0+900000007 R_X86_64_JUMP_SLOT +0+ __tls_get_addr \+ 0 -Symbol table '.dynsym' contains 20 entries: +Symbol table '.dynsym' contains 18 entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9 * - +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND * - +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND * +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8 +[0-9]+: 0+101210 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3