From 693c70e0ae35b95b465af90e560950e1ea1ba6b3 Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 18 Aug 2005 16:46:22 +0000 Subject: [PATCH] * ld-mips-elf/multi-got-1.d: Adjust for new ld behavior. * ld-mips-elf/multi-got-no-shared.d: Likewise. * ld-mips-elf/rel32-n32.d: Likewise. * ld-mips-elf/rel32-o32.d: Likewise. * ld-mips-elf/rel64.d: Likewise. --- ld/testsuite/ChangeLog | 8 ++++++++ ld/testsuite/ld-mips-elf/multi-got-1.d | 8 ++++---- ld/testsuite/ld-mips-elf/multi-got-no-shared.d | 8 ++++---- ld/testsuite/ld-mips-elf/rel32-n32.d | 10 +++++----- ld/testsuite/ld-mips-elf/rel32-o32.d | 10 +++++----- ld/testsuite/ld-mips-elf/rel64.d | 10 +++++----- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 61a50e1..84313d3 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2005-08-18 David Daney + + * ld-mips-elf/multi-got-1.d: Adjust for new ld behavior. + * ld-mips-elf/multi-got-no-shared.d: Likewise. + * ld-mips-elf/rel32-n32.d: Likewise. + * ld-mips-elf/rel32-o32.d: Likewise. + * ld-mips-elf/rel64.d: Likewise. + 2005-08-18 Alan Modra * ld-d10v/default_layout.d: Adjust for section removal. diff --git a/ld/testsuite/ld-mips-elf/multi-got-1.d b/ld/testsuite/ld-mips-elf/multi-got-1.d index 42ca3cf..d04f9c4 100644 --- a/ld/testsuite/ld-mips-elf/multi-got-1.d +++ b/ld/testsuite/ld-mips-elf/multi-got-1.d @@ -10,7 +10,7 @@ Dynamic section at offset 0xcc contains 18 entries: 0x00000004 \(HASH\) 0x184 0x00000005 \(STRTAB\) 0x[0-9a-f]+ 0x00000006 \(SYMTAB\) 0x[0-9a-f]+ - 0x0000000a \(STRSZ\) 178090 \(bytes\) + 0x0000000a \(STRSZ\) [0-9]+ \(bytes\) 0x0000000b \(SYMENT\) 16 \(bytes\) 0x00000015 \(DEBUG\) 0x0 0x00000003 \(PLTGOT\) 0x[0-9a-f]+ @@ -21,9 +21,9 @@ Dynamic section at offset 0xcc contains 18 entries: 0x70000005 \(MIPS_FLAGS\) NOTPOT 0x70000006 \(MIPS_BASE_ADDRESS\) 0 0x7000000a \(MIPS_LOCAL_GOTNO\) 12 - 0x70000011 \(MIPS_SYMTABNO\) 16399 - 0x70000012 \(MIPS_UNREFEXTNO\) 14 - 0x70000013 \(MIPS_GOTSYM\) 0xf + 0x70000011 \(MIPS_SYMTABNO\) [0-9]+ + 0x70000012 \(MIPS_UNREFEXTNO\) [0-9]+ + 0x70000013 \(MIPS_GOTSYM\) 0x[0-9a-f]+ 0x00000000 \(NULL\) 0x0 Relocation section '\.rel\.dyn' at offset 0x[0-9a-f]+ contains 8203 entries: diff --git a/ld/testsuite/ld-mips-elf/multi-got-no-shared.d b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d index d072864..927b304 100644 --- a/ld/testsuite/ld-mips-elf/multi-got-no-shared.d +++ b/ld/testsuite/ld-mips-elf/multi-got-no-shared.d @@ -8,11 +8,11 @@ .*: +file format.* Disassembly of section \.text: -004000b0 <[^>]*> 3c1c1000 lui gp,0x1000 -004000b4 <[^>]*> 279c7ff0 addiu gp,gp,32752 +004000b0 <[^>]*> 3c1c0046 lui gp,0x46 +004000b4 <[^>]*> 279c9ff0 addiu gp,gp,-24592 004000b8 <[^>]*> afbc0008 sw gp,8\(sp\) #... -00408d60 <[^>]*> 3c1c1002 lui gp,0x1002 -00408d64 <[^>]*> 279c9960 addiu gp,gp,-26272 +00408d60 <[^>]*> 3c1c0047 lui gp,0x47 +00408d64 <[^>]*> 279cb960 addiu gp,gp,-18080 00408d68 <[^>]*> afbc0008 sw gp,8\(sp\) #pass diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d index cff8b36..3731690 100644 --- a/ld/testsuite/ld-mips-elf/rel32-n32.d +++ b/ld/testsuite/ld-mips-elf/rel32-n32.d @@ -4,12 +4,12 @@ #readelf: -x 5 -r #ld: -shared -melf32btsmipn32 -Relocation section '.rel.dyn' at offset 0x304 contains 2 entries: +Relocation section '.rel.dyn' at offset 0x2c0 contains 2 entries: Offset Info Type Sym.Value Sym. Name 00000000 00000000 R_MIPS_NONE -00000330 00000003 R_MIPS_REL32 +000002e0 00000003 R_MIPS_REL32 Hex dump of section '.text': - 0x00000320 00000000 00000000 00000000 00000000 ................ - 0x00000330 00000330 00000000 00000000 00000000 ................ - 0x00000340 00000000 00000000 00000000 00000000 ................ + 0x000002d0 00000000 00000000 00000000 00000000 ................ + 0x000002e0 000002e0 00000000 00000000 00000000 ................ + 0x000002f0 00000000 00000000 00000000 00000000 ................ diff --git a/ld/testsuite/ld-mips-elf/rel32-o32.d b/ld/testsuite/ld-mips-elf/rel32-o32.d index 982758a..188bf3c 100644 --- a/ld/testsuite/ld-mips-elf/rel32-o32.d +++ b/ld/testsuite/ld-mips-elf/rel32-o32.d @@ -4,12 +4,12 @@ #readelf: -x 6 -r #ld: -shared -melf32btsmip -Relocation section '.rel.dyn' at offset 0x31c contains 2 entries: +Relocation section '.rel.dyn' at offset 0x2d8 contains 2 entries: Offset Info Type Sym.Value Sym. Name 00000000 00000000 R_MIPS_NONE -00000340 00000003 R_MIPS_REL32 +00000300 00000003 R_MIPS_REL32 Hex dump of section '.text': - 0x00000330 00000000 00000000 00000000 00000000 ................ - 0x00000340 00000340 00000000 00000000 00000000 ................ - 0x00000350 00000000 00000000 00000000 00000000 ................ + 0x000002f0 00000000 00000000 00000000 00000000 ................ + 0x00000300 00000300 00000000 00000000 00000000 ................ + 0x00000310 00000000 00000000 00000000 00000000 ................ diff --git a/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d index ead15f0..ea4da77 100644 --- a/ld/testsuite/ld-mips-elf/rel64.d +++ b/ld/testsuite/ld-mips-elf/rel64.d @@ -4,16 +4,16 @@ #readelf: -x 6 -r #ld: -shared -melf64btsmip -Relocation section '.rel.dyn' at offset 0x498 contains 2 entries: +Relocation section '.rel.dyn' at offset 0x440 contains 2 entries: Offset Info Type Sym. Value Sym. Name 000000000000 000000000000 R_MIPS_NONE Type2: R_MIPS_NONE Type3: R_MIPS_NONE -0000000004d0 000000001203 R_MIPS_REL32 +000000000470 000000001203 R_MIPS_REL32 Type2: R_MIPS_64 Type3: R_MIPS_NONE Hex dump of section '.text': - 0x000004c0 00000000 00000000 00000000 00000000 ................ - 0x000004d0 00000000 000004d0 00000000 00000000 ................ - 0x000004e0 00000000 00000000 00000000 00000000 ................ + 0x00000460 00000000 00000000 00000000 00000000 ................ + 0x00000470 00000000 00000470 00000000 00000000 ................ + 0x00000480 00000000 00000000 00000000 00000000 ................ -- 2.7.4