From f4faf27b482703aacddd4b1366872f44eeefe8f5 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sat, 21 Aug 2004 12:51:41 +0000 Subject: [PATCH] * ld-cris/expdyn1.d, ld-cris/expdyn5.d, ld-cris/expdyn6.d, ld-cris/expdyn7.d, ld-cris/gotplt2.d, ld-cris/gotplt3.d, ld-cris/libdso-1.d, ld-cris/libdso-2.d, ld-cris/locref1.d, ld-cris/nodyn4.d, ld-cris/nodyn5.d: Adjust for reordered sections. --- ld/testsuite/ChangeLog | 8 +++++++ ld/testsuite/ld-cris/expdyn1.d | 2 +- ld/testsuite/ld-cris/expdyn5.d | 4 ++-- ld/testsuite/ld-cris/expdyn6.d | 4 ++-- ld/testsuite/ld-cris/expdyn7.d | 4 ++-- ld/testsuite/ld-cris/gotplt2.d | 24 +++++++++---------- ld/testsuite/ld-cris/gotplt3.d | 26 ++++++++++---------- ld/testsuite/ld-cris/libdso-1.d | 2 +- ld/testsuite/ld-cris/libdso-2.d | 42 +++++++++++++-------------------- ld/testsuite/ld-cris/locref1.d | 8 +++---- ld/testsuite/ld-cris/nodyn4.d | 2 +- ld/testsuite/ld-cris/nodyn5.d | 4 ++-- 12 files changed, 65 insertions(+), 65 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 6a92eeeb11a..fa6fc31c1bb 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2004-08-21 Hans-Peter Nilsson + + * ld-cris/expdyn1.d, ld-cris/expdyn5.d, ld-cris/expdyn6.d, + ld-cris/expdyn7.d, ld-cris/gotplt2.d, ld-cris/gotplt3.d, + ld-cris/libdso-1.d, ld-cris/libdso-2.d, ld-cris/locref1.d, + ld-cris/nodyn4.d, ld-cris/nodyn5.d: Adjust for reordered + sections. + 2004-08-17 Alan Modra * ld-elfvsb/elfvsb.exp: Cope with ppc64 dot symbols. diff --git a/ld/testsuite/ld-cris/expdyn1.d b/ld/testsuite/ld-cris/expdyn1.d index 69218b5cd15..b9717fcd243 100644 --- a/ld/testsuite/ld-cris/expdyn1.d +++ b/ld/testsuite/ld-cris/expdyn1.d @@ -10,5 +10,5 @@ DYNAMIC SYMBOL TABLE: #... 00080206 g DF .text 00000002 expfn -00082220 g DO .data 00000000 expobj +00082... g DO .data 00000000 expobj #pass diff --git a/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d index 6104491a480..d4152c9c365 100644 --- a/ld/testsuite/ld-cris/expdyn5.d +++ b/ld/testsuite/ld-cris/expdyn5.d @@ -9,5 +9,5 @@ .*: file format elf32-cris Contents of section \.got: - 8228c 24220800 00000000 00000000 06020800 .* - 8229c 20220800 .* + 82288 20220800 00000000 00000000 06020800 .* + 82298 9c220800 .* diff --git a/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d index 8dc5c5d396a..6642b1673bb 100644 --- a/ld/testsuite/ld-cris/expdyn6.d +++ b/ld/testsuite/ld-cris/expdyn6.d @@ -9,5 +9,5 @@ .*: file format elf32-cris Contents of section \.got: - 822ec 84220800 00000000 00000000 00000000 .* - 822fc 4e020800 80220800 .* + 822e8 80220800 00000000 00000000 00000000 .* + 822f8 4e020800 00230800 .* diff --git a/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d index e0d945b93bc..cfda8d4a533 100644 --- a/ld/testsuite/ld-cris/expdyn7.d +++ b/ld/testsuite/ld-cris/expdyn7.d @@ -9,5 +9,5 @@ .*: file format elf32-cris Contents of section \.got: - 822ec 84220800 00000000 00000000 04230800 .* - 822fc 4b020800 80220800 .* + 822e8 80220800 00000000 00000000 04230800 .* + 822f8 4b020800 00230800 .* diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d index 82fac09d86e..1f83a68c7ff 100644 --- a/ld/testsuite/ld-cris/gotplt2.d +++ b/ld/testsuite/ld-cris/gotplt2.d @@ -16,22 +16,22 @@ DYNAMIC RELOCATION RECORDS OFFSET TYPE VALUE -0000235c R_CRIS_GLOB_DAT dsofn +000022bc R_CRIS_GLOB_DAT dsofn Contents of section .* #... Contents of section \.rela\.got: - 02a8 5c230000 0a120000 00000000 .* + 01f8 bc220000 0a0c0000 00000000 .* Contents of section \.text: - 02b4 5f1d0c00 30096f1d 0c000000 30090000 .* - 02c4 6f0d0c00 0000611a 6f3e7cdf ffff0000 .* + 0204 5f1d0c00 30096f1d 0c000000 30090000 .* + 0214 6f0d0c00 0000611a 6f3e6cdf ffff0000 .* Contents of section \.dynamic: - 22e0 04000000 94000000 05000000 5c020000 .* - 22f0 06000000 2c010000 0a000000 49000000 .* - 2300 0b000000 10000000 07000000 a8020000 .* - 2310 08000000 0c000000 09000000 0c000000 .* - 2320 00000000 00000000 00000000 00000000 .* - 2330 00000000 00000000 00000000 00000000 .* - 2340 00000000 00000000 00000000 00000000 .* + 2240 04000000 94000000 05000000 ac010000 .* + 2250 06000000 dc000000 0a000000 49000000 .* + 2260 0b000000 10000000 07000000 f8010000 .* + 2270 08000000 0c000000 09000000 0c000000 .* + 2280 00000000 00000000 00000000 00000000 .* + 2290 00000000 00000000 00000000 00000000 .* + 22a0 00000000 00000000 00000000 00000000 .* Contents of section \.got: - 2350 e0220000 00000000 00000000 00000000 .* + 22b0 40220000 00000000 00000000 00000000 .* diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d index a79af505ea3..528ea8cc3fb 100644 --- a/ld/testsuite/ld-cris/gotplt3.d +++ b/ld/testsuite/ld-cris/gotplt3.d @@ -13,23 +13,23 @@ DYNAMIC RELOCATION RECORDS OFFSET TYPE VALUE -0000235c R_CRIS_GLOB_DAT dsofn +000022bc R_CRIS_GLOB_DAT dsofn Contents of section .* #... Contents of section \.rela\.got: - 02a8 5c230000 0a120000 00000000 .* + 01f8 bc220000 0a0c0000 00000000 .* Contents of section \.text: - 02b4 5f1d0c00 30096f1d 0c000000 30090000 .* - 02c4 6f0d0c00 0000611a 6f3e7cdf ffff0000 .* - 02d4 0f050000 .* + 0204 5f1d0c00 30096f1d 0c000000 30090000 .* + 0214 6f0d0c00 0000611a 6f3e6cdf ffff0000 .* + 0224 0f050000 .* Contents of section \.dynamic: - 22e0 04000000 94000000 05000000 5c020000 .* - 22f0 06000000 2c010000 0a000000 49000000 .* - 2300 0b000000 10000000 07000000 a8020000 .* - 2310 08000000 0c000000 09000000 0c000000 .* - 2320 00000000 00000000 00000000 00000000 .* - 2330 00000000 00000000 00000000 00000000 .* - 2340 00000000 00000000 00000000 00000000 .* + 2240 04000000 94000000 05000000 ac010000 .* + 2250 06000000 dc000000 0a000000 49000000 .* + 2260 0b000000 10000000 07000000 f8010000 .* + 2270 08000000 0c000000 09000000 0c000000 .* + 2280 00000000 00000000 00000000 00000000 .* + 2290 00000000 00000000 00000000 00000000 .* + 22a0 00000000 00000000 00000000 00000000 .* Contents of section \.got: - 2350 e0220000 00000000 00000000 00000000 .* + 22b0 40220000 00000000 00000000 00000000 .* diff --git a/ld/testsuite/ld-cris/libdso-1.d b/ld/testsuite/ld-cris/libdso-1.d index 6dda81ed025..91fc98a0732 100644 --- a/ld/testsuite/ld-cris/libdso-1.d +++ b/ld/testsuite/ld-cris/libdso-1.d @@ -9,5 +9,5 @@ DYNAMIC SYMBOL TABLE: #... -000002.[02468ace] g DF .text 00000000 dsofn +00000[12].[02468ace] g DF .text 00000000 dsofn #pass diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d index 93bd1277045..9e9943b52b7 100644 --- a/ld/testsuite/ld-cris/libdso-2.d +++ b/ld/testsuite/ld-cris/libdso-2.d @@ -19,9 +19,9 @@ There are 15 section headers.* \[ 5\] \.gnu\.version_d VERDEF .* \[ 6\] \.rela\.dyn RELA .* \[ 7\] \.text PROGBITS .* - \[ 8\] \.data PROGBITS .* - \[ 9\] \.dynamic DYNAMIC .* - \[10\] \.got PROGBITS .* + \[ 8\] \.dynamic DYNAMIC .* + \[ 9\] \.got PROGBITS .* + \[10\] \.data PROGBITS .* \[11\] \.bss NOBITS .* \[12\] \.shstrtab STRTAB .* \[13\] \.symtab SYMTAB .* @@ -29,24 +29,16 @@ There are 15 section headers.* #... Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries: #... -000022f4 0000000c R_CRIS_RELATIVE 00000234 +00002234 0000000c R_CRIS_RELATIVE 00000184 #... -Symbol table '\.dynsym' contains 14 entries: +Symbol table '\.dynsym' contains 6 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+ 0 OBJECT GLOBAL DEFAULT ABS TST1 - 13: 0+238 0 FUNC GLOBAL DEFAULT 7 export_1@@TST1 + 1: [0-9a-f]+ 0 SECTION LOCAL DEFAULT 7 + 2: [0-9a-f]+ 0 SECTION LOCAL DEFAULT 10 + 3: [0-9a-f]+ 0 SECTION LOCAL DEFAULT 11 + 4: 0+ 0 OBJECT GLOBAL DEFAULT ABS TST1 + 5: 0+188 0 FUNC GLOBAL DEFAULT 7 export_1@@TST1 Symbol table '\.symtab' contains 23 entries: Num: Value Size Type Bind Vis Ndx Name @@ -65,11 +57,11 @@ Symbol table '\.symtab' contains 23 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+2260 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC - 16: 0+22f8 0 NOTYPE LOCAL DEFAULT ABS __bss_start - 17: 0+22f8 0 NOTYPE LOCAL DEFAULT ABS _edata - 18: 0+22e8 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ - 19: 0+2300 0 NOTYPE LOCAL DEFAULT ABS _end - 20: 0+234 0 FUNC LOCAL DEFAULT 7 dsofn + 15: 0+21a0 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC + 16: 0+2238 0 NOTYPE LOCAL DEFAULT ABS __bss_start + 17: 0+2238 0 NOTYPE LOCAL DEFAULT ABS _edata + 18: 0+2228 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ + 19: 0+2240 0 NOTYPE LOCAL DEFAULT ABS _end + 20: 0+184 0 FUNC LOCAL DEFAULT 7 dsofn 21: 0+ 0 OBJECT GLOBAL DEFAULT ABS TST1 - 22: 0+238 0 FUNC GLOBAL DEFAULT 7 export_1 + 22: 0+188 0 FUNC GLOBAL DEFAULT 7 export_1 diff --git a/ld/testsuite/ld-cris/locref1.d b/ld/testsuite/ld-cris/locref1.d index aa8e4c53704..f81fc0a820e 100644 --- a/ld/testsuite/ld-cris/locref1.d +++ b/ld/testsuite/ld-cris/locref1.d @@ -12,12 +12,12 @@ SYMBOL TABLE: #... 0+80076 g F \.text 0+2 expfn -0+820a0 g O \.data 0+ expobj +0+820ac g O \.data 0+ expobj #... -0+820a4 g O \.got 0+ _GLOBAL_OFFSET_TABLE_ +0+820a0 g O \.got 0+ _GLOBAL_OFFSET_TABLE_ #... Disassembly of section \.text: #... 0+80078 : - 80078: 6fae d2df ffff .* - 8007e: 6fbe fcff ffff .* + 80078: 6fae d6df ffff .* + 8007e: 6fbe 0c00 0000 .* diff --git a/ld/testsuite/ld-cris/nodyn4.d b/ld/testsuite/ld-cris/nodyn4.d index 3baa4e11fdc..7d0b5f89128 100644 --- a/ld/testsuite/ld-cris/nodyn4.d +++ b/ld/testsuite/ld-cris/nodyn4.d @@ -15,5 +15,5 @@ There are 2 program headers, .* LOAD [0-9a-fx ]+ RW 0x2000 #... 00 \.text[ ]* - 01 \.data \.got \.bss[ ]* + 01 \.got \.data \.bss[ ]* #pass diff --git a/ld/testsuite/ld-cris/nodyn5.d b/ld/testsuite/ld-cris/nodyn5.d index d1eb7274c58..b090f36a8a9 100644 --- a/ld/testsuite/ld-cris/nodyn5.d +++ b/ld/testsuite/ld-cris/nodyn5.d @@ -9,5 +9,5 @@ .*: file format elf32-cris Contents of section \.got: - 820c4 00000000 00000000 00000000 dc200800 .* - 820d4 76000800 c0200800 .* + 820c0 00000000 00000000 00000000 dc200800 .* + 820d0 76000800 d8200800 .* -- 2.30.2