* 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.

13 files changed, 57 insertions, 48 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8ed5b46..7e8c199 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2006-10-25  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-spu/ovl.d: New file.
diff --git a/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd
index 859a307..94b1014 100644
--- a/ld/testsuite/ld-sh/sh64/abi32.xd
+++ b/ld/testsuite/ld-sh/sh64/abi32.xd
@@ -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 --git a/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd
index 4fa4897..9af5b47 100644
--- a/ld/testsuite/ld-sh/sh64/abi64.xd
+++ b/ld/testsuite/ld-sh/sh64/abi64.xd
@@ -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 --git a/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd
index b64dc85..41f898e 100644
--- a/ld/testsuite/ld-sh/sh64/cmpct1.xd
+++ b/ld/testsuite/ld-sh/sh64/cmpct1.xd
@@ -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 --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd
index 12096b4..aa080dc 100644
--- a/ld/testsuite/ld-sh/sh64/crange1.rd
+++ b/ld/testsuite/ld-sh/sh64/crange1.rd
@@ -25,16 +25,16 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 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 --git a/ld/testsuite/ld-sh/sh64/crange2.rd b/ld/testsuite/ld-sh/sh64/crange2.rd
index e7931d3..9690276 100644
--- a/ld/testsuite/ld-sh/sh64/crange2.rd
+++ b/ld/testsuite/ld-sh/sh64/crange2.rd
@@ -29,16 +29,16 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 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 --git a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
index bc288e8..4d9197b 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
@@ -45,16 +45,16 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 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 --git a/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd
index 8acacf7..f1ba8e0 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-media.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd
@@ -45,16 +45,16 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 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 --git a/ld/testsuite/ld-sh/sh64/crange3.rd b/ld/testsuite/ld-sh/sh64/crange3.rd
index 4cba81f..7426dab 100644
--- a/ld/testsuite/ld-sh/sh64/crange3.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3.rd
@@ -26,16 +26,16 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 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 --git a/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd
index 6ba38c5..de72ce0 100644
--- a/ld/testsuite/ld-sh/sh64/mix1.xd
+++ b/ld/testsuite/ld-sh/sh64/mix1.xd
@@ -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 --git a/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd
index 96ae9c4..5c72763 100644
--- a/ld/testsuite/ld-sh/sh64/mix2.xd
+++ b/ld/testsuite/ld-sh/sh64/mix2.xd
@@ -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 --git a/ld/testsuite/ld-sh/sh64/shdl32.xd b/ld/testsuite/ld-sh/sh64/shdl32.xd
index c7c46f7..56773e3 100644
--- a/ld/testsuite/ld-sh/sh64/shdl32.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl32.xd
@@ -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 --git a/ld/testsuite/ld-sh/sh64/shdl64.xd b/ld/testsuite/ld-sh/sh64/shdl64.xd
index 691a658..142ca96 100644
--- a/ld/testsuite/ld-sh/sh64/shdl64.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl64.xd
@@ -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