[patch committed] Fix some sh64 test cases for empty sections
Kaz Kojima
kkojima@rr.iij4u.or.jp
Mon Oct 30 21:53:00 GMT 2006
Hi,
It turned out that my mechanical tweaks of some test patterns in
ld/testsuite/ld-sh/sh64 were incomplete.
sh*-elf defines ctors/dtors symbols in its script and the section
indices of those symbols are pointless when .ctors/.dtors is removed
as an empty section.
Some sh64 tests don't take account of it. I've applied the patch
below which robustifies those tests with ignoring the section of
ctors/dtors symbols.
Regards,
kaz
--
2006-10-29 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* ld-sh/sh64/abi32.xd, ld-sh/sh64/abi64.xd, ld-sh/sh64/cmpct1.xd,
* ld-sh/sh64/crange1.rd, ld-sh/sh64/crange2.rd,
* ld-sh/sh64/crange3-cmpct.rd, ld-sh/sh64/crange3-media.rd,
* ld-sh/sh64/crange3.rd, ld-sh/sh64/mix1.xd, ld-sh/sh64/mix2.xd,
* ld-sh/sh64/shdl32.xd, ld-sh/sh64/shdl64.xd: Update for removal
of empty sections.
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/abi32.xd LOCAL/src/ld/testsuite/ld-sh/sh64/abi32.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/abi32.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/abi32.xd 2006-10-27 17:31:03.000000000 +0900
@@ -30,16 +30,16 @@ SYMBOL TABLE:
0+1060 l \.text 0+ 0x04 plugh
0+10f8 g \.data 0+ foobar
0+10e8 g \.data 0+ baz
-0+10e8 g \.text 0+ ___dtors
+0+10e8 g .* 0+ ___dtors
0+105c g \.text 0+ 0x04 xyzzy
0+1100 g \*ABS\* 0+ __bss_start
-0+10e8 g \.text 0+ ___ctors_end
+0+10e8 g .* 0+ ___ctors_end
0+10f0 g \.data 0+ baz2
-0+10e8 g \.text 0+ ___ctors
+0+10e8 g .* 0+ ___ctors
0+1000 g \.text 0+ 0x04 foo
0+1100 g \*ABS\* 0+ _edata
0+1100 g \*ABS\* 0+ _end
0+1010 g \.text 0+ 0x04 start
0+100c g \.text 0+ 0x04 bar
0+80000 g \.stack 0+ _stack
-0+10e8 g \.text 0+ ___dtors_end
+0+10e8 g .* 0+ ___dtors_end
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/abi64.xd LOCAL/src/ld/testsuite/ld-sh/sh64/abi64.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/abi64.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/abi64.xd 2006-10-27 17:30:18.000000000 +0900
@@ -29,16 +29,16 @@ SYMBOL TABLE:
00000000000010a8 l \.text 0000000000000000 0x04 plugh
0000000000001140 g \.data 0000000000000000 foobar
0000000000001130 g \.data 0000000000000000 baz
-0000000000001130 g \.text 0000000000000000 ___dtors
+0000000000001130 g .* 0000000000000000 ___dtors
00000000000010a4 g \.text 0000000000000000 0x04 xyzzy
0000000000001148 g \*ABS\* 0000000000000000 __bss_start
-0000000000001130 g \.text 0000000000000000 ___ctors_end
+0000000000001130 g .* 0000000000000000 ___ctors_end
0000000000001138 g \.data 0000000000000000 baz2
-0000000000001130 g \.text 0000000000000000 ___ctors
+0000000000001130 g .* 0000000000000000 ___ctors
0000000000001000 g \.text 0000000000000000 0x04 foo
0000000000001148 g \*ABS\* 0000000000000000 _edata
0000000000001148 g \*ABS\* 0000000000000000 _end
0000000000001018 g \.text 0000000000000000 0x04 start
0000000000001014 g \.text 0000000000000000 0x04 bar
0000000000080000 g \.stack 0000000000000000 _stack
-0000000000001130 g \.text 0000000000000000 ___dtors_end
+0000000000001130 g .* 0000000000000000 ___dtors_end
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/cmpct1.xd LOCAL/src/ld/testsuite/ld-sh/sh64/cmpct1.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/cmpct1.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/cmpct1.xd 2006-10-27 17:29:41.000000000 +0900
@@ -25,12 +25,12 @@ SYMBOL TABLE:
0+80000 l d \.stack 0+ (|\.stack)
0+1004 l \.text 0+ next
0+100c l \.rodata 0+ here
-0+1098 g \.rodata 0+ ___dtors
+0+1098 g .* 0+ ___dtors
0+1098 g \*ABS\* 0+ __bss_start
-0+1098 g \.rodata 0+ ___ctors_end
-0+1098 g \.rodata 0+ ___ctors
+0+1098 g .* 0+ ___ctors_end
+0+1098 g .* 0+ ___ctors
0+1098 g \*ABS\* 0+ _edata
0+1098 g \*ABS\* 0+ _end
0+1000 g \.text 0+ start
0+80000 g \.stack 0+ _stack
-0+1098 g \.rodata 0+ ___dtors_end
+0+1098 g .* 0+ ___dtors_end
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/crange1.rd LOCAL/src/ld/testsuite/ld-sh/sh64/crange1.rd
--- ORIG/src/ld/testsuite/ld-sh/sh64/crange1.rd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/crange1.rd 2006-10-27 17:20:18.000000000 +0900
@@ -25,16 +25,16 @@ Symbol table '\.symtab' contains [0-9]+
.*: 00080000 0 SECTION LOCAL DEFAULT 3
.*: 00000000 0 SECTION LOCAL DEFAULT 4
.*: 00001004 0 NOTYPE LOCAL DEFAULT \[<other>: 4\] 2 start2
-.*: 000010a0 0 NOTYPE GLOBAL DEFAULT 2 ___dtors
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT .* ___dtors
.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
-.*: 000010a0 0 NOTYPE GLOBAL DEFAULT 2 ___ctors_end
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT .* ___ctors_end
.*: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
-.*: 000010a0 0 NOTYPE GLOBAL DEFAULT 2 ___ctors
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT .* ___ctors
.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _edata
.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _end
.*: 00001000 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 1 start
.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
-.*: 000010a0 0 NOTYPE GLOBAL DEFAULT 2 ___dtors_end
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT .* ___dtors_end
Hex dump of section '\.init':
0x00001000 6ff0fff0 .*
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/crange2.rd LOCAL/src/ld/testsuite/ld-sh/sh64/crange2.rd
--- ORIG/src/ld/testsuite/ld-sh/sh64/crange2.rd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/crange2.rd 2006-10-27 17:22:06.000000000 +0900
@@ -29,16 +29,16 @@ Symbol table '\.symtab' contains [0-9]+
.*: 0000102c 0 NOTYPE LOCAL DEFAULT \[<other>: 4\] 2 sec2
.*: 00001040 0 NOTYPE LOCAL DEFAULT 2 sec3
.*: 00001048 0 NOTYPE LOCAL DEFAULT 2 sec4
-.*: 000010e0 0 NOTYPE GLOBAL DEFAULT 2 ___dtors
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT .* ___dtors
.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
-.*: 000010e0 0 NOTYPE GLOBAL DEFAULT 2 ___ctors_end
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT .* ___ctors_end
.*: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
-.*: 000010e0 0 NOTYPE GLOBAL DEFAULT 2 ___ctors
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT .* ___ctors
.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _edata
.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _end
.*: 00001000 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 1 start
.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
-.*: 000010e0 0 NOTYPE GLOBAL DEFAULT 2 ___dtors_end
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT .* ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 0000002a .*
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd LOCAL/src/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
--- ORIG/src/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd 2006-10-27 17:28:30.000000000 +0900
@@ -45,16 +45,16 @@ Symbol table '\.symtab' contains [0-9]+
.*: 000010a4 0 NOTYPE LOCAL DEFAULT \[<other>: 4\] 2 start2
.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
.*: 000010c4 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 2 diversion
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___dtors
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___ctors_end
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___ctors_end
.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___ctors
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
.*: 00001000 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 1 start
.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___dtors_end
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .*
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/crange3-media.rd LOCAL/src/ld/testsuite/ld-sh/sh64/crange3-media.rd
--- ORIG/src/ld/testsuite/ld-sh/sh64/crange3-media.rd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/crange3-media.rd 2006-10-27 17:27:58.000000000 +0900
@@ -45,16 +45,16 @@ Symbol table '\.symtab' contains [0-9]+
.*: 000010a4 0 NOTYPE LOCAL DEFAULT \[<other>: 4\] 2 start2
.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
.*: 000010c4 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 2 diversion
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___dtors
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___ctors_end
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___ctors_end
.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___ctors
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
.*: 00001000 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 1 start
.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___dtors_end
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .*
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/crange3.rd LOCAL/src/ld/testsuite/ld-sh/sh64/crange3.rd
--- ORIG/src/ld/testsuite/ld-sh/sh64/crange3.rd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/crange3.rd 2006-10-27 17:21:07.000000000 +0900
@@ -26,16 +26,16 @@ Symbol table '\.symtab' contains [0-9]+
.*: 000010a4 0 NOTYPE LOCAL DEFAULT \[<other>: 4\] 2 start2
.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
.*: 000010c4 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 2 diversion
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___dtors
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___ctors_end
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___ctors_end
.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___ctors
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
.*: 00001000 0 NOTYPE GLOBAL DEFAULT \[<other>: 4\] 1 start
.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
-.*: 00001160 0 NOTYPE GLOBAL DEFAULT 2 ___dtors_end
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT .* ___dtors_end
Hex dump of section '\.text':
0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .*
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/mix1.xd LOCAL/src/ld/testsuite/ld-sh/sh64/mix1.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/mix1.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/mix1.xd 2006-10-27 17:27:06.000000000 +0900
@@ -31,12 +31,12 @@ SYMBOL TABLE:
0+1004 l \.text 0+ start2
0+1030 l \.text 0+ 0x04 mediacode2
0+1018 l \.text 0+ 0x04 mediacode
-0+10c8 g \.text 0+ ___dtors
+0+10c8 g .* 0+ ___dtors
0+10d8 g \*ABS\* 0+ __bss_start
-0+10c8 g \.text 0+ ___ctors_end
-0+10c8 g \.text 0+ ___ctors
+0+10c8 g .* 0+ ___ctors_end
+0+10c8 g .* 0+ ___ctors
0+10d8 g \*ABS\* 0+ _edata
0+10d8 g \*ABS\* 0+ _end
0+1000 g \.text 0+ start
0+80000 g \.stack 0+ _stack
-0+10c8 g \.text 0+ ___dtors_end
+0+10c8 g .* 0+ ___dtors_end
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/mix2.xd LOCAL/src/ld/testsuite/ld-sh/sh64/mix2.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/mix2.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/mix2.xd 2006-10-27 17:26:29.000000000 +0900
@@ -39,14 +39,14 @@ SYMBOL TABLE:
0+1024 g \.text 0+ compactlabel2
0+1028 g \.text 0+ compactlabel3
0+1010 g \.text 0+ 0x04 medialabel1
-0+10c8 g \.rodata 0+ ___dtors
+0+10c8 g .* 0+ ___dtors
0+10cc g \.data 0+ medialabel4
0+10d8 g \*ABS\* 0+ __bss_start
-0+10c8 g \.rodata 0+ ___ctors_end
+0+10c8 g .* 0+ ___ctors_end
0+10d4 g \.data 0+ compactlabel5
-0+10c8 g \.rodata 0+ ___ctors
+0+10c8 g .* 0+ ___ctors
0+10d8 g \*ABS\* 0+ _edata
0+10d8 g \*ABS\* 0+ _end
0+1000 g \.text 0+ 0x04 start
0+80000 g \.stack 0+ _stack
-0+10c8 g \.rodata 0+ ___dtors_end
+0+10c8 g .* 0+ ___dtors_end
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/shdl32.xd LOCAL/src/ld/testsuite/ld-sh/sh64/shdl32.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/shdl32.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/shdl32.xd 2006-10-27 17:25:18.000000000 +0900
@@ -73,7 +73,7 @@ SYMBOL TABLE:
0+14e0 g \.data 0+ dbar_mixboth2
0+14ec g \.data 0+ dbaz
0+1524 g \.data 0+ dbaz_mix
-0+13c8 g \.rodata 0+ ___dtors
+0+13c8 g .* 0+ ___dtors
0+141c g \.data 0+ dfoo_mixboth2
0+119c g \.text 0+ 0x04 bazboth
0+13f0 g \.data 0+ dfoo_other
@@ -89,13 +89,13 @@ SYMBOL TABLE:
0+14f4 g \.data 0+ dbazboth
0+1038 g \.text 0+ 0x04 foo_otherwithout
0+1190 g \.text 0+ 0x04 bar_mixwithout2
-0+13c8 g \.rodata 0+ ___ctors_end
+0+13c8 g .* 0+ ___ctors_end
0+1064 g \.text 0+ 0x04 foo_mixwithout
0+116c g \.text 0+ 0x04 bar_other
0+13d0 g \.data 0+ dfooboth
0+1034 g \.text 0+ 0x04 foo_otherboth2
0+1400 g \.data 0+ dfoo_mix
-0+13c8 g \.rodata 0+ ___ctors
+0+13c8 g .* 0+ ___ctors
0+14d4 g \.data 0+ dbar_mix
0+100c g \.text 0+ 0x04 fooboth
0+1170 g \.text 0+ 0x04 bar_otherboth
@@ -118,6 +118,6 @@ SYMBOL TABLE:
0+1160 g \.text 0+ 0x04 barboth
0+14b8 g \.data 0+ dbarboth
0+1188 g \.text 0+ 0x04 bar_mixboth2
-0+13c8 g \.rodata 0+ ___dtors_end
+0+13c8 g .* 0+ ___dtors_end
0+151c g \.data 0+ dbaz_otherboth2
0+1500 g \.data 0+ dbazboth2
diff -uprN ORIG/src/ld/testsuite/ld-sh/sh64/shdl64.xd LOCAL/src/ld/testsuite/ld-sh/sh64/shdl64.xd
--- ORIG/src/ld/testsuite/ld-sh/sh64/shdl64.xd 2006-10-22 10:19:06.000000000 +0900
+++ LOCAL/src/ld/testsuite/ld-sh/sh64/shdl64.xd 2006-10-27 17:24:15.000000000 +0900
@@ -73,7 +73,7 @@ SYMBOL TABLE:
0+14e0 g \.data 0+ dbar_mixboth2
0+14ec g \.data 0+ dbaz
0+1524 g \.data 0+ dbaz_mix
-0+13c8 g \.rodata 0+ ___dtors
+0+13c8 g .* 0+ ___dtors
0+141c g \.data 0+ dfoo_mixboth2
0+119c g \.text 0+ 0x04 bazboth
0+13f0 g \.data 0+ dfoo_other
@@ -89,13 +89,13 @@ SYMBOL TABLE:
0+14f4 g \.data 0+ dbazboth
0+1038 g \.text 0+ 0x04 foo_otherwithout
0+1190 g \.text 0+ 0x04 bar_mixwithout2
-0+13c8 g \.rodata 0+ ___ctors_end
+0+13c8 g .* 0+ ___ctors_end
0+1064 g \.text 0+ 0x04 foo_mixwithout
0+116c g \.text 0+ 0x04 bar_other
0+13d0 g \.data 0+ dfooboth
0+1034 g \.text 0+ 0x04 foo_otherboth2
0+1400 g \.data 0+ dfoo_mix
-0+13c8 g \.rodata 0+ ___ctors
+0+13c8 g .* 0+ ___ctors
0+14d4 g \.data 0+ dbar_mix
0+100c g \.text 0+ 0x04 fooboth
0+1170 g \.text 0+ 0x04 bar_otherboth
@@ -118,6 +118,6 @@ SYMBOL TABLE:
0+1160 g \.text 0+ 0x04 barboth
0+14b8 g \.data 0+ dbarboth
0+1188 g \.text 0+ 0x04 bar_mixboth2
-0+13c8 g \.rodata 0+ ___dtors_end
+0+13c8 g .* 0+ ___dtors_end
0+151c g \.data 0+ dbaz_otherboth2
0+1500 g \.data 0+ dbazboth2
More information about the Binutils
mailing list