From 35a922ee131210f22da845548d3dcdf812314af1 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 14 Feb 2005 00:15:38 +0000 Subject: [PATCH] * ld-sparc/tlssunnopic32.rd: Adjust for .dynsym changes. * ld-sparc/tlssunpic32.rd: Likewise. --- ld/testsuite/ChangeLog | 5 +++ ld/testsuite/ld-sparc/tlssunnopic32.rd | 76 ++++++++++++++++------------------ ld/testsuite/ld-sparc/tlssunpic32.rd | 13 +++--- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 30a4ade..336b4e5 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2005-02-13 Eric Botcazou + * ld-sparc/tlssunnopic32.rd: Adjust for .dynsym changes. + * ld-sparc/tlssunpic32.rd: Likewise. + +2005-02-13 Eric Botcazou + * ld-elf/warn1.d: Do not run on sparc64-*-solaris2*. 2005-02-11 Paul Brook diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd index 318bb58..1d227db 100644 --- a/ld/testsuite/ld-sparc/tlssunnopic32.rd +++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd @@ -15,11 +15,11 @@ Section Headers: +\[ 3\] .dynstr +.* +\[ 4\] .rela.dyn +.* +\[ 5\] .text +PROGBITS +0+1000 0+1000 0+1000 0+ +AX +0 +0 4096 - +\[ 6\] .data +PROGBITS +0+12000 0+2000 0+ 0+ +WA +0 +0 4096 - +\[ 7\] .tbss +NOBITS +0+12000 0+2000 0+24 0+ WAT +0 +0 +4 - +\[ 8\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4 + +\[ 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\] .plt +.* - +\[10\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4 + +\[10\] .data +PROGBITS +0+13000 0+3000 0+ 0+ +WA +0 +0 4096 +\[11\] .bss +.* +\[12\] .shstrtab +.* +\[13\] .symtab +.* @@ -32,15 +32,15 @@ There are 4 program headers, starting at offset [0-9a-f]+ Program Headers: +Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align +LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000 - +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+9c 0x0+a0 RWE 0x10000 + +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+1000 0x0+1000 RWE 0x10000 +DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+80 0x0+80 RW +0x4 +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+ 0x0+24 R +0x4 #... Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend -0+1004 +0+a09 R_SPARC_HI22 +0+12080 +\.got \+ 12080 -0+1008 +0+a0c R_SPARC_LO10 +0+12080 +\.got \+ 12080 +0+1004 +0+309 R_SPARC_HI22 +0+12080 +\.got \+ 12080 +0+1008 +0+30c R_SPARC_LO10 +0+12080 +\.got \+ 12080 0+10dc +0+48 R_SPARC_TLS_LE_HIX22 +0+9 0+10e0 +0+49 R_SPARC_TLS_LE_LOX10 +0+9 0+10f8 +0+48 R_SPARC_TLS_LE_HIX22 +0+1c @@ -49,31 +49,25 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 12 entries: 0+12088 +0+4e R_SPARC_TLS_TPOFF32 +0+4 0+12094 +0+4e R_SPARC_TLS_TPOFF32 +0+14 0+12098 +0+4e R_SPARC_TLS_TPOFF32 +0+18 -0+1208c +0+f4e R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0 -0+12090 +0+114e R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0 +0+1208c +0+94e R_SPARC_TLS_TPOFF32 +0+ +sg1 \+ 0 +0+12090 +0+b4e R_SPARC_TLS_TPOFF32 +0+ +sg2 \+ 0 -Symbol table '.dynsym' contains 20 entries: +Symbol table '.dynsym' contains 14 entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND * - +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 * - +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 * - +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 * - +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 * - +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 * - +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 * - +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 * - +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 * - +9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 * - +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 * - +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 * - +12: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC - +13: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3 - +14: 0+12080 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_ - +15: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND sg1 - +16: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start - +17: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND sg2 - +18: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata - +19: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end + +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 * + +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 * + +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 * + +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 * + +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 * + +6: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC + +7: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3 + +8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_ + +9: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1 + +10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start + +11: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2 + +12: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata + +13: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end Symbol table '.symtab' contains 33 entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name @@ -92,21 +86,21 @@ Symbol table '.symtab' contains 33 entries: +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 * +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 * +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 * - +15: 0+ +0 TLS +LOCAL +DEFAULT +7 bl1 - +16: 0+4 +0 TLS +LOCAL +DEFAULT +7 bl2 - +17: 0+8 +0 TLS +LOCAL +DEFAULT +7 bl3 - +18: 0+c +0 TLS +LOCAL +DEFAULT +7 bl4 - +19: 0+10 +0 TLS +LOCAL +DEFAULT +7 bl5 - +20: 0+1c +0 TLS +LOCAL +HIDDEN +7 sh3 - +21: 0+20 +0 TLS +LOCAL +HIDDEN +7 sh4 - +22: 0+14 +0 TLS +LOCAL +HIDDEN +7 sh1 + +15: 0+ +0 TLS +LOCAL +DEFAULT +6 bl1 + +16: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2 + +17: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3 + +18: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4 + +19: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5 + +20: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3 + +21: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4 + +22: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1 +23: 0+12080 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_ - +24: 0+18 +0 TLS +LOCAL +HIDDEN +7 sh2 + +24: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2 +25: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC +26: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3 - +27: 0+12080 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_ - +28: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND sg1 + +27: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_ + +28: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1 +29: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start - +30: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND sg2 + +30: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2 +31: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata +32: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd index 7fca80e..a082527 100644 --- a/ld/testsuite/ld-sparc/tlssunpic32.rd +++ b/ld/testsuite/ld-sparc/tlssunpic32.rd @@ -52,21 +52,22 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 14 entries: 0+12130 +0+4e R_SPARC_TLS_TPOFF32 +0+70 0+12138 +0+4a R_SPARC_TLS_DTPMOD32 +0+ 0+12140 +0+4e R_SPARC_TLS_TPOFF32 +0+44 -0+12120 +0+a4e R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0 -0+12124 +0+d4a R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0 -0+12128 +0+d4c R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0 -0+12134 +0+104e R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0 +0+12120 +0+b4e R_SPARC_TLS_TPOFF32 +0+10 +sg5 \+ 0 +0+12124 +0+e4a R_SPARC_TLS_DTPMOD32 +0+ +sg1 \+ 0 +0+12128 +0+e4c R_SPARC_TLS_DTPOFF32 +0+ +sg1 \+ 0 +0+12134 +0+114e R_SPARC_TLS_TPOFF32 +0+4 +sg2 \+ 0 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend -0+12174 +0+c15 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0 +0+12174 +0+d15 R_SPARC_JMP_SLOT +0+ +__tls_get_addr \+ 0 -Symbol table '.dynsym' contains 21 entries: +Symbol table '.dynsym' contains 22 entries: +Num: +Value +Size Type +Bind +Vis +Ndx Name +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 * + +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 * +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 * +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8 -- 2.7.4