From a11310fc0d0e8d691f30a67af35b1dfad2a3be24 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Mon, 12 Aug 2002 08:51:10 +0000 Subject: [PATCH] * ld-sh/sh64/abi32.xd: Adjust as type of linker-script-symbols is no longer set to object. * 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: Likewise. --- ld/testsuite/ChangeLog | 10 ++++++++++ ld/testsuite/ld-sh/sh64/abi32.xd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/abi64.xd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/cmpct1.xd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/crange1.rd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/crange2.rd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/crange3-cmpct.rd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/crange3-media.rd | 16 ++++++++-------- ld/testsuite/ld-sh/sh64/crange3.rd | 16 ++++++++-------- 9 files changed, 74 insertions(+), 64 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 3c1d7dbc0..7b8b6f7dc 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2002-08-12 Stephen Clarke + + * ld-sh/sh64/abi32.xd: Adjust as type of linker-script-symbols + is no longer set to object. + * 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: Likewise. + 2002-08-10 Alan Modra * ld-discard/discard.exp: Don't run on linuxaout or linuxoldld. diff --git a/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd index bd918ff50..6d6a8e8ab 100644 --- a/ld/testsuite/ld-sh/sh64/abi32.xd +++ b/ld/testsuite/ld-sh/sh64/abi32.xd @@ -43,16 +43,16 @@ SYMBOL TABLE: 0+1060 l \.text 0+ 0x04 plugh 0+10f8 g \.data 0+ foobar 0+10e8 g \.data 0+ baz -0+1100 g O \.dtors 0+ ___dtors +0+1100 g \.dtors 0+ ___dtors 0+105c g \.text 0+ 0x04 xyzzy -0+1100 g O \*ABS\* 0+ __bss_start -0+1100 g O \.ctors 0+ ___ctors_end +0+1100 g \*ABS\* 0+ __bss_start +0+1100 g \.ctors 0+ ___ctors_end 0+10f0 g \.data 0+ baz2 -0+1100 g O \.ctors 0+ ___ctors +0+1100 g \.ctors 0+ ___ctors 0+1000 g \.text 0+ 0x04 foo -0+1100 g O \*ABS\* 0+ _edata -0+1100 g O \*ABS\* 0+ _end +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 O \.stack 0+ _stack -0+1100 g O \.dtors 0+ ___dtors_end +0+80000 g \.stack 0+ _stack +0+1100 g \.dtors 0+ ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd index 1b9e9044d..4a1ba0d76 100644 --- a/ld/testsuite/ld-sh/sh64/abi64.xd +++ b/ld/testsuite/ld-sh/sh64/abi64.xd @@ -42,16 +42,16 @@ SYMBOL TABLE: 00000000000010a8 l \.text 0000000000000000 0x04 plugh 0000000000001140 g \.data 0000000000000000 foobar 0000000000001130 g \.data 0000000000000000 baz -0000000000001148 g O \.dtors 0000000000000000 ___dtors +0000000000001148 g \.dtors 0000000000000000 ___dtors 00000000000010a4 g \.text 0000000000000000 0x04 xyzzy -0000000000001148 g O \*ABS\* 0000000000000000 __bss_start -0000000000001148 g O \.ctors 0000000000000000 ___ctors_end +0000000000001148 g \*ABS\* 0000000000000000 __bss_start +0000000000001148 g \.ctors 0000000000000000 ___ctors_end 0000000000001138 g \.data 0000000000000000 baz2 -0000000000001148 g O \.ctors 0000000000000000 ___ctors +0000000000001148 g \.ctors 0000000000000000 ___ctors 0000000000001000 g \.text 0000000000000000 0x04 foo -0000000000001148 g O \*ABS\* 0000000000000000 _edata -0000000000001148 g O \*ABS\* 0000000000000000 _end +0000000000001148 g \*ABS\* 0000000000000000 _edata +0000000000001148 g \*ABS\* 0000000000000000 _end 0000000000001018 g \.text 0000000000000000 0x04 start 0000000000001014 g \.text 0000000000000000 0x04 bar -0000000000080000 g O \.stack 0000000000000000 _stack -0000000000001148 g O \.dtors 0000000000000000 ___dtors_end +0000000000080000 g \.stack 0000000000000000 _stack +0000000000001148 g \.dtors 0000000000000000 ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd index 296aebd3e..b104b4c55 100644 --- a/ld/testsuite/ld-sh/sh64/cmpct1.xd +++ b/ld/testsuite/ld-sh/sh64/cmpct1.xd @@ -44,12 +44,12 @@ SYMBOL TABLE: 0+1004 l \.text 0+ next 0+100c l \.rodata 0+ here 0+ l \*ABS\* 0+ \*ABS\* -0+1098 g O \.dtors 0+ ___dtors -0+1098 g O \*ABS\* 0+ __bss_start -0+1098 g O \.ctors 0+ ___ctors_end -0+1098 g O \.ctors 0+ ___ctors -0+1098 g O \*ABS\* 0+ _edata -0+1098 g O \*ABS\* 0+ _end +0+1098 g \.dtors 0+ ___dtors +0+1098 g \*ABS\* 0+ __bss_start +0+1098 g \.ctors 0+ ___ctors_end +0+1098 g \.ctors 0+ ___ctors +0+1098 g \*ABS\* 0+ _edata +0+1098 g \*ABS\* 0+ _end 0+1000 g \.text 0+ start -0+80000 g O \.stack 0+ _stack -0+1098 g O \.dtors 0+ ___dtors_end +0+80000 g \.stack 0+ _stack +0+1098 g \.dtors 0+ ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd index 3824a7821..7ce3e17cc 100644 --- a/ld/testsuite/ld-sh/sh64/crange1.rd +++ b/ld/testsuite/ld-sh/sh64/crange1.rd @@ -38,16 +38,16 @@ Symbol table '\.symtab' contains 24 entries: 11: 00000000 0 SECTION LOCAL DEFAULT 11 12: 00000000 0 SECTION LOCAL DEFAULT 12 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2 - 14: 000010a0 0 OBJECT GLOBAL DEFAULT 5 ___dtors - 15: 000010a0 0 OBJECT GLOBAL DEFAULT ABS __bss_start - 16: 000010a0 0 OBJECT GLOBAL DEFAULT 4 ___ctors_end + 14: 000010a0 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 15: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start + 16: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end 17: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 18: 000010a0 0 OBJECT GLOBAL DEFAULT 4 ___ctors - 19: 000010a0 0 OBJECT GLOBAL DEFAULT ABS _edata - 20: 000010a0 0 OBJECT GLOBAL DEFAULT ABS _end + 18: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 19: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _edata + 20: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _end 21: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start - 22: 00080000 0 OBJECT GLOBAL DEFAULT 8 _stack - 23: 000010a0 0 OBJECT GLOBAL DEFAULT 5 ___dtors_end + 22: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack + 23: 000010a0 0 NOTYPE GLOBAL DEFAULT 5 ___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 4231780df..1a4f76d55 100644 --- a/ld/testsuite/ld-sh/sh64/crange2.rd +++ b/ld/testsuite/ld-sh/sh64/crange2.rd @@ -42,16 +42,16 @@ Symbol table '\.symtab' contains 28 entries: 15: 0000102c 0 NOTYPE LOCAL DEFAULT 2 sec2 16: 00001040 0 NOTYPE LOCAL DEFAULT 2 sec3 17: 00001048 0 NOTYPE LOCAL DEFAULT 2 sec4 - 18: 000010e0 0 OBJECT GLOBAL DEFAULT 5 ___dtors - 19: 000010e0 0 OBJECT GLOBAL DEFAULT ABS __bss_start - 20: 000010e0 0 OBJECT GLOBAL DEFAULT 4 ___ctors_end + 18: 000010e0 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 19: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start + 20: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end 21: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 22: 000010e0 0 OBJECT GLOBAL DEFAULT 4 ___ctors - 23: 000010e0 0 OBJECT GLOBAL DEFAULT ABS _edata - 24: 000010e0 0 OBJECT GLOBAL DEFAULT ABS _end + 22: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 23: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _edata + 24: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _end 25: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start - 26: 00080000 0 OBJECT GLOBAL DEFAULT 8 _stack - 27: 000010e0 0 OBJECT GLOBAL DEFAULT 5 ___dtors_end + 26: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack + 27: 000010e0 0 NOTYPE GLOBAL DEFAULT 5 ___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 ea92dce9f..a4a4273e3 100644 --- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd +++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd @@ -59,16 +59,16 @@ Symbol table '\.symtab' contains 28 entries: 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3 16: 00000000 0 NOTYPE LOCAL DEFAULT ABS \*ABS\* 17: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion - 18: 00001160 0 OBJECT GLOBAL DEFAULT 5 ___dtors - 19: 00001160 0 OBJECT GLOBAL DEFAULT ABS __bss_start - 20: 00001160 0 OBJECT GLOBAL DEFAULT 4 ___ctors_end + 18: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 19: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start + 20: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end 21: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 22: 00001160 0 OBJECT GLOBAL DEFAULT 4 ___ctors - 23: 00001160 0 OBJECT GLOBAL DEFAULT ABS _edata - 24: 00001160 0 OBJECT GLOBAL DEFAULT ABS _end + 22: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata + 24: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end 25: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start - 26: 00080000 0 OBJECT GLOBAL DEFAULT 8 _stack - 27: 00001160 0 OBJECT GLOBAL DEFAULT 5 ___dtors_end + 26: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack + 27: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___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 5cc7888d7..7598fbb52 100644 --- a/ld/testsuite/ld-sh/sh64/crange3-media.rd +++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd @@ -59,16 +59,16 @@ Symbol table '\.symtab' contains 28 entries: 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3 16: 00000000 0 NOTYPE LOCAL DEFAULT ABS \*ABS\* 17: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion - 18: 00001160 0 OBJECT GLOBAL DEFAULT 5 ___dtors - 19: 00001160 0 OBJECT GLOBAL DEFAULT ABS __bss_start - 20: 00001160 0 OBJECT GLOBAL DEFAULT 4 ___ctors_end + 18: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 19: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start + 20: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end 21: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 22: 00001160 0 OBJECT GLOBAL DEFAULT 4 ___ctors - 23: 00001160 0 OBJECT GLOBAL DEFAULT ABS _edata - 24: 00001160 0 OBJECT GLOBAL DEFAULT ABS _end + 22: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata + 24: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end 25: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start - 26: 00080000 0 OBJECT GLOBAL DEFAULT 8 _stack - 27: 00001160 0 OBJECT GLOBAL DEFAULT 5 ___dtors_end + 26: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack + 27: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___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 363977c28..12c2f5703 100644 --- a/ld/testsuite/ld-sh/sh64/crange3.rd +++ b/ld/testsuite/ld-sh/sh64/crange3.rd @@ -40,16 +40,16 @@ Symbol table '\.symtab' contains 28 entries: 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3 16: 00000000 0 NOTYPE LOCAL DEFAULT ABS \*ABS\* 17: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion - 18: 00001160 0 OBJECT GLOBAL DEFAULT 5 ___dtors - 19: 00001160 0 OBJECT GLOBAL DEFAULT ABS __bss_start - 20: 00001160 0 OBJECT GLOBAL DEFAULT 4 ___ctors_end + 18: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 19: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start + 20: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end 21: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 22: 00001160 0 OBJECT GLOBAL DEFAULT 4 ___ctors - 23: 00001160 0 OBJECT GLOBAL DEFAULT ABS _edata - 24: 00001160 0 OBJECT GLOBAL DEFAULT ABS _end + 22: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata + 24: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end 25: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start - 26: 00080000 0 OBJECT GLOBAL DEFAULT 8 _stack - 27: 00001160 0 OBJECT GLOBAL DEFAULT 5 ___dtors_end + 26: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack + 27: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors_end Hex dump of section '\.text': 0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .* -- 2.11.4.GIT