From f6a8ae8136cfabbb8024e00a37d0cf6cd40ac696 Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Fri, 2 Jul 2004 11:25:54 +0000 Subject: [PATCH] * emulparams/shlelf32_linux.sh (COMMONPAGESIZE): Set to 4KB. * ld-elf/frame.exp: Don't run on sh*-*-elf*. * ld-sh/shared-1.d: Adjust for section reordering changes. * ld-sh/shared-2.d: Likewise. * ld-sh/tlsbin-2.d: Likewise. * ld-sh/tlspic-2.d: Likewise. * ld-sh/sh64/abi32.xd: Likewise. * ld-sh/sh64/abi64.xd: Likewise. * ld-sh/sh64/cmpct1.xd: Likewise. * ld-sh/sh64/crange1.rd: Likewise. * ld-sh/sh64/crange2.rd: Likewise. * ld-sh/sh64/crange3-cmpct.rd: Likewise. * ld-sh/sh64/crange3-media.rd: Likewise. * ld-sh/sh64/crange3.rd: Likewise. * ld-sh/sh64/gotplt.d: Likewise. * ld-sh/sh64/init-cmpct.d: Likewise. * ld-sh/sh64/init-media.d: Likewise. * ld-sh/sh64/init64.d: Likewise. * ld-sh/sh64/mix1.xd: Likewise. * ld-sh/sh64/mix2.xd: Likewise. * ld-sh/sh64/shdl32.xd: Likewise. * ld-sh/sh64/shdl64.xd: Likewise. --- ld/ChangeLog | 4 +++ ld/emulparams/shlelf32_linux.sh | 1 + ld/testsuite/ChangeLog | 24 ++++++++++++++++ ld/testsuite/ld-elf/frame.exp | 5 ++++ ld/testsuite/ld-sh/sh64/abi32.xd | 20 ++++++------- ld/testsuite/ld-sh/sh64/abi64.xd | 20 ++++++------- ld/testsuite/ld-sh/sh64/cmpct1.xd | 10 +++---- ld/testsuite/ld-sh/sh64/crange1.rd | 14 ++++----- ld/testsuite/ld-sh/sh64/crange2.rd | 14 ++++----- ld/testsuite/ld-sh/sh64/crange3-cmpct.rd | 14 ++++----- ld/testsuite/ld-sh/sh64/crange3-media.rd | 14 ++++----- ld/testsuite/ld-sh/sh64/crange3.rd | 14 ++++----- ld/testsuite/ld-sh/sh64/gotplt.d | 4 +-- ld/testsuite/ld-sh/sh64/init-cmpct.d | 10 +++---- ld/testsuite/ld-sh/sh64/init-media.d | 10 +++---- ld/testsuite/ld-sh/sh64/init64.d | 10 +++---- ld/testsuite/ld-sh/sh64/mix1.xd | 20 ++++++------- ld/testsuite/ld-sh/sh64/mix2.xd | 20 ++++++------- ld/testsuite/ld-sh/sh64/shdl32.xd | 20 ++++++------- ld/testsuite/ld-sh/sh64/shdl64.xd | 20 ++++++------- ld/testsuite/ld-sh/shared-1.d | 6 ++-- ld/testsuite/ld-sh/shared-2.d | 2 +- ld/testsuite/ld-sh/tlsbin-2.d | 49 +------------------------------- ld/testsuite/ld-sh/tlspic-2.d | 41 +++----------------------- 24 files changed, 160 insertions(+), 206 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 67ffbe4..8aad633 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2004-07-02 Kaz Kojima + + * emulparams/shlelf32_linux.sh (COMMONPAGESIZE): Set to 4KB. + 2004-07-01 H.J. Lu * ldmisc.c (vfinfo): Call bfd_get_section_ident to identify diff --git a/ld/emulparams/shlelf32_linux.sh b/ld/emulparams/shlelf32_linux.sh index 63a8356..59d4179 100644 --- a/ld/emulparams/shlelf32_linux.sh +++ b/ld/emulparams/shlelf32_linux.sh @@ -5,6 +5,7 @@ SCRIPT_NAME=elf OUTPUT_FORMAT="elf32-sh64-linux" TEXT_START_ADDR=0x400000 MAXPAGESIZE=0x10000 +COMMONPAGESIZE=0x1000 ARCH=sh MACHINE=sh5 ALIGNMENT=8 diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 858fc2e..8aa98f2 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,27 @@ +2004-07-02 Kaz Kojima + + * ld-elf/frame.exp: Don't run on sh*-*-elf*. + * ld-sh/shared-1.d: Adjust for section reordering changes. + * ld-sh/shared-2.d: Likewise. + * ld-sh/tlsbin-2.d: Likewise. + * ld-sh/tlspic-2.d: Likewise. + * ld-sh/sh64/abi32.xd: Likewise. + * ld-sh/sh64/abi64.xd: Likewise. + * ld-sh/sh64/cmpct1.xd: Likewise. + * ld-sh/sh64/crange1.rd: Likewise. + * ld-sh/sh64/crange2.rd: Likewise. + * ld-sh/sh64/crange3-cmpct.rd: Likewise. + * ld-sh/sh64/crange3-media.rd: Likewise. + * ld-sh/sh64/crange3.rd: Likewise. + * ld-sh/sh64/gotplt.d: Likewise. + * ld-sh/sh64/init-cmpct.d: Likewise. + * ld-sh/sh64/init-media.d: Likewise. + * ld-sh/sh64/init64.d: Likewise. + * ld-sh/sh64/mix1.xd: Likewise. + * ld-sh/sh64/mix2.xd: Likewise. + * ld-sh/sh64/shdl32.xd: Likewise. + * ld-sh/sh64/shdl64.xd: Likewise. + 2004-07-02 Alan Modra * ld-discard/static.d: Accept both original sym and section sym. diff --git a/ld/testsuite/ld-elf/frame.exp b/ld/testsuite/ld-elf/frame.exp index 3f6857f..dbb4c94 100644 --- a/ld/testsuite/ld-elf/frame.exp +++ b/ld/testsuite/ld-elf/frame.exp @@ -30,6 +30,11 @@ if { [istarget "mcore-*-*"] } { return } +# Too small MAXPAGESIZE on this target. +if { [istarget "sh*-*-elf*"] } { + return +} + set test1 "read-only .eh_frame section" set test2 "read-only .gcc_except_table section" diff --git a/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd index 8fd05c9..c6bd1da 100644 --- a/ld/testsuite/ld-sh/sh64/abi32.xd +++ b/ld/testsuite/ld-sh/sh64/abi32.xd @@ -17,12 +17,12 @@ Sections: Idx Name Size VMA LMA File off Algn 0 \.text 00000064 0+1000 0+1000 00000100 2\*\*0 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 \.data 00000018 0+10e8 0+10e8 00000168 2\*\*2 - CONTENTS, ALLOC, LOAD, DATA - 2 \.ctors 00000000 0+1100 0+1100 00000184 2\*\*0 + 1 \.ctors 00000000 0+10e8 0+10e8 00000184 2\*\*0 CONTENTS - 3 \.dtors 00000000 0+1100 0+1100 00000184 2\*\*0 + 2 \.dtors 00000000 0+10e8 0+10e8 00000184 2\*\*0 CONTENTS + 3 \.data 00000018 0+10e8 0+10e8 00000168 2\*\*2 + CONTENTS, ALLOC, LOAD, DATA 4 \.sbss 00000000 0+1100 0+1100 00000184 2\*\*0 CONTENTS 5 \.bss 00000000 0+1100 0+1100 00000180 2\*\*0 @@ -31,9 +31,9 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, DATA SYMBOL TABLE: 0+1000 l d \.text 0+ +0+10e8 l d \.ctors 0+ +0+10e8 l d \.dtors 0+ 0+10e8 l d \.data 0+ -0+1100 l d \.ctors 0+ -0+1100 l d \.dtors 0+ 0+1100 l d \.sbss 0+ 0+1100 l d \.bss 0+ 0+80000 l d \.stack 0+ @@ -45,16 +45,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 \.dtors 0+ ___dtors +0+10e8 g \.dtors 0+ ___dtors 0+105c g \.text 0+ 0x04 xyzzy 0+1100 g \*ABS\* 0+ __bss_start -0+1100 g \.ctors 0+ ___ctors_end +0+10e8 g \.ctors 0+ ___ctors_end 0+10f0 g \.data 0+ baz2 -0+1100 g \.ctors 0+ ___ctors +0+10e8 g \.ctors 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+1100 g \.dtors 0+ ___dtors_end +0+10e8 g \.dtors 0+ ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd index 65ee15e..0814679 100644 --- a/ld/testsuite/ld-sh/sh64/abi64.xd +++ b/ld/testsuite/ld-sh/sh64/abi64.xd @@ -16,12 +16,12 @@ Sections: Idx Name Size VMA LMA File off Algn 0 \.text 000000ac 0000000000001000 0000000000001000 00000100 2\*\*0 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 \.data 00000018 0000000000001130 0000000000001130 000001b0 2\*\*2 - CONTENTS, ALLOC, LOAD, DATA - 2 \.ctors 00000000 0000000000001148 0000000000001148 00000204 2\*\*0 + 1 \.ctors 00000000 0000000000001130 0000000000001130 00000204 2\*\*0 CONTENTS - 3 \.dtors 00000000 0000000000001148 0000000000001148 00000204 2\*\*0 + 2 \.dtors 00000000 0000000000001130 0000000000001130 00000204 2\*\*0 CONTENTS + 3 \.data 00000018 0000000000001130 0000000000001130 000001b0 2\*\*2 + CONTENTS, ALLOC, LOAD, DATA 4 \.sbss 00000000 0000000000001148 0000000000001148 00000204 2\*\*0 CONTENTS 5 \.bss 00000000 0000000000001148 0000000000001148 000001c8 2\*\*0 @@ -30,9 +30,9 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, DATA SYMBOL TABLE: 0000000000001000 l d \.text 0000000000000000 +0000000000001130 l d \.ctors 0000000000000000 +0000000000001130 l d \.dtors 0000000000000000 0000000000001130 l d \.data 0000000000000000 -0000000000001148 l d \.ctors 0000000000000000 -0000000000001148 l d \.dtors 0000000000000000 0000000000001148 l d \.sbss 0000000000000000 0000000000001148 l d \.bss 0000000000000000 0000000000080000 l d \.stack 0000000000000000 @@ -44,16 +44,16 @@ SYMBOL TABLE: 00000000000010a8 l \.text 0000000000000000 0x04 plugh 0000000000001140 g \.data 0000000000000000 foobar 0000000000001130 g \.data 0000000000000000 baz -0000000000001148 g \.dtors 0000000000000000 ___dtors +0000000000001130 g \.dtors 0000000000000000 ___dtors 00000000000010a4 g \.text 0000000000000000 0x04 xyzzy 0000000000001148 g \*ABS\* 0000000000000000 __bss_start -0000000000001148 g \.ctors 0000000000000000 ___ctors_end +0000000000001130 g \.ctors 0000000000000000 ___ctors_end 0000000000001138 g \.data 0000000000000000 baz2 -0000000000001148 g \.ctors 0000000000000000 ___ctors +0000000000001130 g \.ctors 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 -0000000000001148 g \.dtors 0000000000000000 ___dtors_end +0000000000001130 g \.dtors 0000000000000000 ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd index 37a8c7c..06e47a9 100644 --- a/ld/testsuite/ld-sh/sh64/cmpct1.xd +++ b/ld/testsuite/ld-sh/sh64/cmpct1.xd @@ -19,12 +19,12 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, CODE 1 \.rodata 0000000c 0+1008 0+1008 00000108 2\*\*2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 \.data 00000000 0+1098 0+1098 00000118 2\*\*0 - CONTENTS, ALLOC, LOAD, DATA - 3 \.ctors 00000000 0+1098 0+1098 00000184 2\*\*0 + 2 \.ctors 00000000 0+1098 0+1098 00000184 2\*\*0 CONTENTS - 4 \.dtors 00000000 0+1098 0+1098 00000184 2\*\*0 + 3 \.dtors 00000000 0+1098 0+1098 00000184 2\*\*0 CONTENTS + 4 \.data 00000000 0+1098 0+1098 00000118 2\*\*0 + CONTENTS, ALLOC, LOAD, DATA 5 \.sbss 00000000 0+1098 0+1098 00000184 2\*\*0 CONTENTS 6 \.bss 00000000 0+1098 0+1098 00000118 2\*\*0 @@ -34,9 +34,9 @@ Idx Name Size VMA LMA File off Algn SYMBOL TABLE: 0+1000 l d \.text 0+ 0+1008 l d \.rodata 0+ -0+1098 l d \.data 0+ 0+1098 l d \.ctors 0+ 0+1098 l d \.dtors 0+ +0+1098 l d \.data 0+ 0+1098 l d \.sbss 0+ 0+1098 l d \.bss 0+ 0+80000 l d \.stack 0+ diff --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd index ac491c6..1c927ca 100644 --- a/ld/testsuite/ld-sh/sh64/crange1.rd +++ b/ld/testsuite/ld-sh/sh64/crange1.rd @@ -5,9 +5,9 @@ Section Headers: \[ 0\] NULL 00000000 000000 000000 00 0 0 0 \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4 \[ 2\] \.text PROGBITS 00001004 000104 000018 00 AXp 0 0 4 - \[ 3\] \.data PROGBITS 000010a0 000120 000000 00 WA 0 0 1 - \[ 4\] \.ctors PROGBITS 000010a0 000184 000000 00 W 0 0 1 - \[ 5\] \.dtors PROGBITS 000010a0 000184 000000 00 W 0 0 1 + \[ 3\] \.ctors PROGBITS 000010a0 000184 000000 00 W 0 0 1 + \[ 4\] \.dtors PROGBITS 000010a0 000184 000000 00 W 0 0 1 + \[ 5\] \.data PROGBITS 000010a0 000120 000000 00 WA 0 0 1 \[ 6\] \.sbss PROGBITS 000010a0 000184 000000 00 W 0 0 1 \[ 7\] \.bss NOBITS 000010a0 000120 000000 00 WA 0 0 1 \[ 8\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1 @@ -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 NOTYPE GLOBAL DEFAULT 5 ___dtors + 14: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___dtors 15: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start - 16: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end + 16: 000010a0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end 17: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 18: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 18: 000010a0 0 NOTYPE GLOBAL DEFAULT 3 ___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 NOTYPE GLOBAL DEFAULT 8 _stack - 23: 000010a0 0 NOTYPE GLOBAL DEFAULT 5 ___dtors_end + 23: 000010a0 0 NOTYPE GLOBAL DEFAULT 4 ___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 4e65f6c..281223d 100644 --- a/ld/testsuite/ld-sh/sh64/crange2.rd +++ b/ld/testsuite/ld-sh/sh64/crange2.rd @@ -5,9 +5,9 @@ Section Headers: \[ 0\] NULL 00000000 000000 000000 00 0 0 0 \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4 \[ 2\] \.text PROGBITS 00001004 000104 00005c 00 AXp 0 0 4 - \[ 3\] \.data PROGBITS 000010e0 000160 000000 00 WA 0 0 1 - \[ 4\] \.ctors PROGBITS 000010e0 000184 000000 00 W 0 0 1 - \[ 5\] \.dtors PROGBITS 000010e0 000184 000000 00 W 0 0 1 + \[ 3\] \.ctors PROGBITS 000010e0 000184 000000 00 W 0 0 1 + \[ 4\] \.dtors PROGBITS 000010e0 000184 000000 00 W 0 0 1 + \[ 5\] \.data PROGBITS 000010e0 000160 000000 00 WA 0 0 1 \[ 6\] \.sbss PROGBITS 000010e0 000184 000000 00 W 0 0 1 \[ 7\] \.bss NOBITS 000010e0 000160 000000 00 WA 0 0 1 \[ 8\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1 @@ -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 NOTYPE GLOBAL DEFAULT 5 ___dtors + 18: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___dtors 19: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start - 20: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end + 20: 000010e0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end 21: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 22: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 22: 000010e0 0 NOTYPE GLOBAL DEFAULT 3 ___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 NOTYPE GLOBAL DEFAULT 8 _stack - 27: 000010e0 0 NOTYPE GLOBAL DEFAULT 5 ___dtors_end + 27: 000010e0 0 NOTYPE GLOBAL DEFAULT 4 ___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 acafa00..d285658 100644 --- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd +++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd @@ -24,9 +24,9 @@ Section Headers: \[ 0\] NULL 00000000 000000 000000 00 0 0 0 \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4 \[ 2\] \.text PROGBITS 00001004 000104 0000d8 00 AXp 0 0 4 - \[ 3\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1 - \[ 4\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1 - \[ 5\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 3\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 4\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 5\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1 \[ 6\] \.sbss PROGBITS 00001160 000204 000000 00 W 0 0 1 \[ 7\] \.bss NOBITS 00001160 0001e0 000000 00 WA 0 0 1 \[ 8\] \.stack PROGBITS 00080000 000200 000004 00 WA 0 0 1 @@ -58,16 +58,16 @@ Symbol table '\.symtab' contains 27 entries: 14: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3 16: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion - 17: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 17: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start - 19: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end + 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 21: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 21: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors 22: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end 24: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start 25: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack - 26: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors_end + 26: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___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 5f6e6ad..c5c8c0a 100644 --- a/ld/testsuite/ld-sh/sh64/crange3-media.rd +++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd @@ -24,9 +24,9 @@ Section Headers: \[ 0\] NULL 00000000 000000 000000 00 0 0 0 \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4 \[ 2\] \.text PROGBITS 00001004 000104 0000d8 00 AXp 0 0 4 - \[ 3\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1 - \[ 4\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1 - \[ 5\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 3\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 4\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 5\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1 \[ 6\] \.sbss PROGBITS 00001160 000204 000000 00 W 0 0 1 \[ 7\] \.bss NOBITS 00001160 0001e0 000000 00 WA 0 0 1 \[ 8\] \.stack PROGBITS 00080000 000200 000004 00 WA 0 0 1 @@ -58,16 +58,16 @@ Symbol table '\.symtab' contains 27 entries: 14: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3 16: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion - 17: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 17: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start - 19: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end + 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 21: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 21: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors 22: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end 24: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start 25: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack - 26: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors_end + 26: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___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 0b0f28f..c55b9e2 100644 --- a/ld/testsuite/ld-sh/sh64/crange3.rd +++ b/ld/testsuite/ld-sh/sh64/crange3.rd @@ -5,9 +5,9 @@ Section Headers: \[ 0\] NULL 00000000 000000 000000 00 0 0 0 \[ 1\] \.init PROGBITS 00001000 000100 000004 00 AXp 0 0 4 \[ 2\] \.text PROGBITS 00001004 000104 0000d8 00 AXp 0 0 4 - \[ 3\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1 - \[ 4\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1 - \[ 5\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 3\] \.ctors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 4\] \.dtors PROGBITS 00001160 000204 000000 00 W 0 0 1 + \[ 5\] \.data PROGBITS 00001160 0001e0 000000 00 WA 0 0 1 \[ 6\] \.sbss PROGBITS 00001160 000204 000000 00 W 0 0 1 \[ 7\] \.bss NOBITS 00001160 0001e0 000000 00 WA 0 0 1 \[ 8\] \.stack PROGBITS 00080000 000200 000004 00 WA 0 0 1 @@ -39,16 +39,16 @@ Symbol table '\.symtab' contains 27 entries: 14: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2 15: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3 16: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion - 17: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors + 17: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start - 19: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors_end + 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2 - 21: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___ctors + 21: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors 22: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata 23: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end 24: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start 25: 00080000 0 NOTYPE GLOBAL DEFAULT 8 _stack - 26: 00001160 0 NOTYPE GLOBAL DEFAULT 5 ___dtors_end + 26: 00001160 0 NOTYPE GLOBAL DEFAULT 4 ___dtors_end Hex dump of section '\.text': 0x00001004 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0 .* diff --git a/ld/testsuite/ld-sh/sh64/gotplt.d b/ld/testsuite/ld-sh/sh64/gotplt.d index 1015fcb..75d148c 100644 --- a/ld/testsuite/ld-sh/sh64/gotplt.d +++ b/ld/testsuite/ld-sh/sh64/gotplt.d @@ -7,6 +7,6 @@ # Make sure that gotplt relocations of forced local symbols # use the GOT. -Relocation section '\.rela\.dyn' at offset 0x3c8 contains 1 entries: +Relocation section '\.rela\.dyn' at offset 0x29c contains 1 entries: Offset Info Type Sym\.Value Sym\. Name \+ Addend -000004f4 000000a5 R_SH_RELATIVE 000003d4 +000003cc 000000a5 R_SH_RELATIVE 000002a8 diff --git a/ld/testsuite/ld-sh/sh64/init-cmpct.d b/ld/testsuite/ld-sh/sh64/init-cmpct.d index 8fb2876..e6f094d 100644 --- a/ld/testsuite/ld-sh/sh64/init-cmpct.d +++ b/ld/testsuite/ld-sh/sh64/init-cmpct.d @@ -7,13 +7,13 @@ # Make sure that the lsb of DT_INIT and DT_FINI entries is not set # when _init and _fini are SHcompact code. -Dynamic segment at offset 0x328 contains 8 entries: +Dynamic section at offset 0x250 contains 8 entries: Tag Type Name/Value - 0x0000000c \(INIT\) 0x318 - 0x0000000d \(FINI\) 0x320 + 0x0000000c \(INIT\) 0x240 + 0x0000000d \(FINI\) 0x248 0x00000004 \(HASH\) 0x94 - 0x00000005 \(STRTAB\) 0x2ac - 0x00000006 \(SYMTAB\) 0x13c + 0x00000005 \(STRTAB\) 0x1d4 + 0x00000006 \(SYMTAB\) 0xe4 0x0000000a \(STRSZ\) 107 \(bytes\) 0x0000000b \(SYMENT\) 16 \(bytes\) 0x00000000 \(NULL\) 0x0 diff --git a/ld/testsuite/ld-sh/sh64/init-media.d b/ld/testsuite/ld-sh/sh64/init-media.d index 2fd914b..1b4f454 100644 --- a/ld/testsuite/ld-sh/sh64/init-media.d +++ b/ld/testsuite/ld-sh/sh64/init-media.d @@ -7,13 +7,13 @@ # Make sure that the lsb of DT_INIT and DT_FINI entries is set # when _init and _fini are SHmedia code. -Dynamic segment at offset 0x338 contains 8 entries: +Dynamic section at offset 0x260 contains 8 entries: Tag Type Name/Value - 0x0000000c \(INIT\) 0x319 - 0x0000000d \(FINI\) 0x329 + 0x0000000c \(INIT\) 0x241 + 0x0000000d \(FINI\) 0x251 0x00000004 \(HASH\) 0x94 - 0x00000005 \(STRTAB\) 0x2ac - 0x00000006 \(SYMTAB\) 0x13c + 0x00000005 \(STRTAB\) 0x1d4 + 0x00000006 \(SYMTAB\) 0xe4 0x0000000a \(STRSZ\) 107 \(bytes\) 0x0000000b \(SYMENT\) 16 \(bytes\) 0x00000000 \(NULL\) 0x0 diff --git a/ld/testsuite/ld-sh/sh64/init64.d b/ld/testsuite/ld-sh/sh64/init64.d index 01f881e..eae4457 100644 --- a/ld/testsuite/ld-sh/sh64/init64.d +++ b/ld/testsuite/ld-sh/sh64/init64.d @@ -7,13 +7,13 @@ # Make sure that the lsb of DT_INIT and DT_FINI entries is set # when _init and _fini are SHmedia code. -Dynamic segment at offset 0x448 contains 8 entries: +Dynamic section at offset 0x330 contains 8 entries: Tag Type Name/Value - 0x000000000000000c \(INIT\) 0x425 - 0x000000000000000d \(FINI\) 0x435 + 0x000000000000000c \(INIT\) 0x30d + 0x000000000000000d \(FINI\) 0x31d 0x0000000000000004 \(HASH\) 0xe8 - 0x0000000000000005 \(STRTAB\) 0x3b8 - 0x0000000000000006 \(SYMTAB\) 0x190 + 0x0000000000000005 \(STRTAB\) 0x2a0 + 0x0000000000000006 \(SYMTAB\) 0x138 0x000000000000000a \(STRSZ\) 107 \(bytes\) 0x000000000000000b \(SYMENT\) 24 \(bytes\) 0x0000000000000000 \(NULL\) 0x0 diff --git a/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd index 1ee9c8c..a5c732b 100644 --- a/ld/testsuite/ld-sh/sh64/mix1.xd +++ b/ld/testsuite/ld-sh/sh64/mix1.xd @@ -16,12 +16,12 @@ Sections: Idx Name Size VMA LMA File off Algn 0 \.text 00000048 0+1000 0+1000 00000100 2\*\*2 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 \.data 0000000c 0+10c8 0+10c8 00000148 2\*\*2 - CONTENTS, ALLOC, LOAD, DATA - 2 \.ctors 00000000 0+10d4 0+10d4 00000184 2\*\*0 + 1 \.ctors 00000000 0+10c8 0+10c8 00000184 2\*\*0 CONTENTS - 3 \.dtors 00000000 0+10d4 0+10d4 00000184 2\*\*0 + 2 \.dtors 00000000 0+10c8 0+10c8 00000184 2\*\*0 CONTENTS + 3 \.data 0000000c 0+10c8 0+10c8 00000148 2\*\*2 + CONTENTS, ALLOC, LOAD, DATA 4 \.sbss 00000000 0+10d8 0+10d8 00000184 2\*\*0 CONTENTS 5 \.bss 00000000 0+10d8 0+10d8 00000158 2\*\*0 @@ -32,9 +32,9 @@ Idx Name Size VMA LMA File off Algn CONTENTS, DEBUGGING, SORT_ENTRIES SYMBOL TABLE: 0+1000 l d \.text 0+ +0+10c8 l d \.ctors 0+ +0+10c8 l d \.dtors 0+ 0+10c8 l d \.data 0+ -0+10d4 l d \.ctors 0+ -0+10d4 l d \.dtors 0+ 0+10d8 l d \.sbss 0+ 0+10d8 l d \.bss 0+ 0+80000 l d \.stack 0+ @@ -46,12 +46,12 @@ SYMBOL TABLE: 0+1004 l \.text 0+ start2 0+1030 l \.text 0+ 0x04 mediacode2 0+1018 l \.text 0+ 0x04 mediacode -0+10d4 g \.dtors 0+ ___dtors +0+10c8 g \.dtors 0+ ___dtors 0+10d8 g \*ABS\* 0+ __bss_start -0+10d4 g \.ctors 0+ ___ctors_end -0+10d4 g \.ctors 0+ ___ctors +0+10c8 g \.ctors 0+ ___ctors_end +0+10c8 g \.ctors 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+10d4 g \.dtors 0+ ___dtors_end +0+10c8 g \.dtors 0+ ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd index f5b099f..28234f9 100644 --- a/ld/testsuite/ld-sh/sh64/mix2.xd +++ b/ld/testsuite/ld-sh/sh64/mix2.xd @@ -19,12 +19,12 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, CODE 1 \.rodata 00000010 0+1034 0+1034 00000134 2\*\*2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 \.data 00000010 0+10c8 0+10c8 00000148 2\*\*2 - CONTENTS, ALLOC, LOAD, DATA - 3 \.ctors 00000000 0+10d8 0+10d8 00000184 2\*\*0 + 2 \.ctors 00000000 0+10c8 0+10c8 00000184 2\*\*0 CONTENTS - 4 \.dtors 00000000 0+10d8 0+10d8 00000184 2\*\*0 + 3 \.dtors 00000000 0+10c8 0+10c8 00000184 2\*\*0 CONTENTS + 4 \.data 00000010 0+10c8 0+10c8 00000148 2\*\*2 + CONTENTS, ALLOC, LOAD, DATA 5 \.sbss 00000000 0+10d8 0+10d8 00000184 2\*\*0 CONTENTS 6 \.bss 00000000 0+10d8 0+10d8 00000158 2\*\*0 @@ -36,9 +36,9 @@ Idx Name Size VMA LMA File off Algn SYMBOL TABLE: 0+1000 l d \.text 0+ 0+1034 l d \.rodata 0+ +0+10c8 l d \.ctors 0+ +0+10c8 l d \.dtors 0+ 0+10c8 l d \.data 0+ -0+10d8 l d \.ctors 0+ -0+10d8 l d \.dtors 0+ 0+10d8 l d \.sbss 0+ 0+10d8 l d \.bss 0+ 0+80000 l d \.stack 0+ @@ -54,14 +54,14 @@ SYMBOL TABLE: 0+1024 g \.text 0+ compactlabel2 0+1028 g \.text 0+ compactlabel3 0+1010 g \.text 0+ 0x04 medialabel1 -0+10d8 g \.dtors 0+ ___dtors +0+10c8 g \.dtors 0+ ___dtors 0+10cc g \.data 0+ medialabel4 0+10d8 g \*ABS\* 0+ __bss_start -0+10d8 g \.ctors 0+ ___ctors_end +0+10c8 g \.ctors 0+ ___ctors_end 0+10d4 g \.data 0+ compactlabel5 -0+10d8 g \.ctors 0+ ___ctors +0+10c8 g \.ctors 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+10d8 g \.dtors 0+ ___dtors_end +0+10c8 g \.dtors 0+ ___dtors_end diff --git a/ld/testsuite/ld-sh/sh64/shdl32.xd b/ld/testsuite/ld-sh/sh64/shdl32.xd index facaa78..663cfc8 100644 --- a/ld/testsuite/ld-sh/sh64/shdl32.xd +++ b/ld/testsuite/ld-sh/sh64/shdl32.xd @@ -18,12 +18,12 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, CODE 1 \.rodata 0+144 0+1204 0+1204 0+304 2\*\*2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2 - CONTENTS, ALLOC, LOAD, DATA - 3 \.ctors 0+ 0+155c 0+155c 0+604 2\*\*0 + 2 \.ctors 0+ 0+13c8 0+13c8 0+604 2\*\*0 CONTENTS - 4 \.dtors 0+ 0+155c 0+155c 0+604 2\*\*0 + 3 \.dtors 0+ 0+13c8 0+13c8 0+604 2\*\*0 CONTENTS + 4 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2 + CONTENTS, ALLOC, LOAD, DATA 5 \.sbss 0+ 0+1560 0+1560 0+604 2\*\*0 CONTENTS 6 \.bss 0+ 0+1560 0+1560 0+5e0 2\*\*0 @@ -33,9 +33,9 @@ Idx Name Size VMA LMA File off Algn SYMBOL TABLE: 0+1000 l d \.text 0+ 0+1204 l d \.rodata 0+ +0+13c8 l d \.ctors 0+ +0+13c8 l d \.dtors 0+ 0+13c8 l d \.data 0+ -0+155c l d \.ctors 0+ -0+155c l d \.dtors 0+ 0+1560 l d \.sbss 0+ 0+1560 l d \.bss 0+ 0+80000 l d \.stack 0+ @@ -88,7 +88,7 @@ SYMBOL TABLE: 0+14e0 g \.data 0+ dbar_mixboth2 0+14ec g \.data 0+ dbaz 0+1524 g \.data 0+ dbaz_mix -0+155c g \.dtors 0+ ___dtors +0+13c8 g \.dtors 0+ ___dtors 0+141c g \.data 0+ dfoo_mixboth2 0+119c g \.text 0+ 0x04 bazboth 0+13f0 g \.data 0+ dfoo_other @@ -104,13 +104,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+155c g \.ctors 0+ ___ctors_end +0+13c8 g \.ctors 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+155c g \.ctors 0+ ___ctors +0+13c8 g \.ctors 0+ ___ctors 0+14d4 g \.data 0+ dbar_mix 0+100c g \.text 0+ 0x04 fooboth 0+1170 g \.text 0+ 0x04 bar_otherboth @@ -133,6 +133,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+155c g \.dtors 0+ ___dtors_end +0+13c8 g \.dtors 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 1d9bce3..26ae839 100644 --- a/ld/testsuite/ld-sh/sh64/shdl64.xd +++ b/ld/testsuite/ld-sh/sh64/shdl64.xd @@ -18,12 +18,12 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, CODE 1 \.rodata 0+144 0+1204 0+1204 0+304 2\*\*2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2 - CONTENTS, ALLOC, LOAD, DATA - 3 \.ctors 0+ 0+155c 0+155c 0+604 2\*\*0 + 2 \.ctors 0+ 0+13c8 0+13c8 0+604 2\*\*0 CONTENTS - 4 \.dtors 0+ 0+155c 0+155c 0+604 2\*\*0 + 3 \.dtors 0+ 0+13c8 0+13c8 0+604 2\*\*0 CONTENTS + 4 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2 + CONTENTS, ALLOC, LOAD, DATA 5 \.sbss 0+ 0+1560 0+1560 0+604 2\*\*0 CONTENTS 6 \.bss 0+ 0+1560 0+1560 0+5e0 2\*\*0 @@ -33,9 +33,9 @@ Idx Name Size VMA LMA File off Algn SYMBOL TABLE: 0+1000 l d \.text 0+ 0+1204 l d \.rodata 0+ +0+13c8 l d \.ctors 0+ +0+13c8 l d \.dtors 0+ 0+13c8 l d \.data 0+ -0+155c l d \.ctors 0+ -0+155c l d \.dtors 0+ 0+1560 l d \.sbss 0+ 0+1560 l d \.bss 0+ 0+80000 l d \.stack 0+ @@ -88,7 +88,7 @@ SYMBOL TABLE: 0+14e0 g \.data 0+ dbar_mixboth2 0+14ec g \.data 0+ dbaz 0+1524 g \.data 0+ dbaz_mix -0+155c g \.dtors 0+ ___dtors +0+13c8 g \.dtors 0+ ___dtors 0+141c g \.data 0+ dfoo_mixboth2 0+119c g \.text 0+ 0x04 bazboth 0+13f0 g \.data 0+ dfoo_other @@ -104,13 +104,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+155c g \.ctors 0+ ___ctors_end +0+13c8 g \.ctors 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+155c g \.ctors 0+ ___ctors +0+13c8 g \.ctors 0+ ___ctors 0+14d4 g \.data 0+ dbar_mix 0+100c g \.text 0+ 0x04 fooboth 0+1170 g \.text 0+ 0x04 bar_otherboth @@ -133,6 +133,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+155c g \.dtors 0+ ___dtors_end +0+13c8 g \.dtors 0+ ___dtors_end 0+151c g \.data 0+ dbaz_otherboth2 0+1500 g \.data 0+ dbazboth2 diff --git a/ld/testsuite/ld-sh/shared-1.d b/ld/testsuite/ld-sh/shared-1.d index 82198ae..f04f940 100644 --- a/ld/testsuite/ld-sh/shared-1.d +++ b/ld/testsuite/ld-sh/shared-1.d @@ -13,10 +13,10 @@ Relocation section '\.rela\.text' at offset 0x[0-9a-f]+ contains 1 entries: .* -0000030c 000000a5 R_SH_RELATIVE +00000310 +00000220 000000a5 R_SH_RELATIVE +00000224 Hex dump of section '\.rela\.text': - 0x000002f8 00000310 000000a5 0000030c .* + 0x0000020c 00000224 000000a5 00000220 .* Hex dump of section '\.text': - 0x00000304 00000310 00090009 00090009 .* + 0x00000218 00000224 00090009 00090009 .* diff --git a/ld/testsuite/ld-sh/shared-2.d b/ld/testsuite/ld-sh/shared-2.d index 12175ca..e65fea4 100644 --- a/ld/testsuite/ld-sh/shared-2.d +++ b/ld/testsuite/ld-sh/shared-2.d @@ -7,7 +7,7 @@ # Make sure that there is no unnecessary DT_TEXTREL entry. -Dynamic segment at offset 0x[0-9a-f]+ contains 9 entries: +Dynamic section at offset 0x[0-9a-f]+ contains 9 entries: Tag Type Name/Value 0x00000004 \(HASH\) 0x[0-9a-f]+ 0x00000005 \(STRTAB\) 0x[0-9a-f]+ diff --git a/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d index 919f88e..a2e8ff6 100644 --- a/ld/testsuite/ld-sh/tlsbin-2.d +++ b/ld/testsuite/ld-sh/tlsbin-2.d @@ -20,8 +20,7 @@ Section Headers: \[ 8\] \.text +PROGBITS +0+401000 .* \[ 9\] \.tdata +PROGBITS +0+413000 [0-9a-f]+ 0+018 00 WAT 0 0 4 \[10\] \.tbss +NOBITS +0+413018 [0-9a-f]+ 0+010 00 WAT 0 0 1 - \[11\] \.dynamic +DYNAMIC +0+413018 .* - \[12\] \.data +.* +#... \[[0-9a-f]+\] \.got +PROGBITS +0+414000 .* \[[0-9a-f]+\] \.sbss +.* \[[0-9a-f]+\] \.bss +.* @@ -80,50 +79,4 @@ Symbol table '\.dynsym' contains [0-9]+ entries: +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG1 #... -Symbol table '\.symtab' contains [0-9]+ 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-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-9a-f]+ +0 SECTION LOCAL DEFAULT +15 * - +16: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 * - +17: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17 * - +18: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +18 * - +[0-9]+: 00000008 +0 TLS +LOCAL DEFAULT +9 sl1 - +[0-9]+: 0000000c +0 TLS +LOCAL DEFAULT +9 sl2 - +[0-9]+: 00000020 +0 TLS +LOCAL DEFAULT +10 bl1 - +[0-9]+: 00000024 +0 TLS +LOCAL DEFAULT +10 bl2 - +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG3 - +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC - +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG2 - +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG4 - +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND __tls_get_addr - +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1 - +[0-9]+: 0+402000 +0 FUNC +GLOBAL DEFAULT +8 _start -#... - +[0-9]+: 0+401000 +0 FUNC +GLOBAL DEFAULT +8 fn2 -#... - +[0-9]+: 00000004 +0 TLS +GLOBAL DEFAULT +9 sg2 - +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG1 - +[0-9]+: 00000010 +0 TLS +GLOBAL HIDDEN +9 sh1 - +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata - +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_ - +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end - +[0-9]+: 00000014 +0 TLS +GLOBAL HIDDEN +9 sh2 - +[0-9]+: 0000001c +0 TLS +GLOBAL DEFAULT +10 bg2 - +[0-9]+: 00000018 +0 TLS +GLOBAL DEFAULT +10 bg1 -#... - +[0-9]+: .* #pass diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d index 9a26b4a..40ece5a 100644 --- a/ld/testsuite/ld-sh/tlspic-2.d +++ b/ld/testsuite/ld-sh/tlspic-2.d @@ -19,8 +19,6 @@ Section Headers: \[ 7\] \.text +PROGBITS +0+[0-9a-f]+ .* \[ 8\] \.tdata +PROGBITS +0+[0-9a-f]+ [0-9a-f]+ 0+018 00 WAT 0 0 4 \[ 9\] \.tbss +NOBITS +0+[0-9a-f]+ [0-9a-f]+ 0+008 00 WAT 0 0 1 - \[10\] \.dynamic +DYNAMIC +0+[0-9a-f]+ .* - \[11\] \.data +.* #... \[[0-9a-f]+\] \.got +PROGBITS +0+[0-9a-f]+ .* \[[0-9a-f]+\] \.sbss +.* @@ -75,47 +73,16 @@ Symbol table '\.dynsym' contains [0-9]+ entries: +1: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 * +2: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 * +3: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9 * - +4: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +11 * - +5: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 * + +4: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +[0-9]+ * + +5: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +[0-9]+ * +6: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC +[0-9a-f]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr +[0-9a-f]+: 0+00 +0 TLS +GLOBAL DEFAULT +8 sg1 +#... +[0-9a-f]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +7 fn1 #... +[0-9a-f]+: 0+04 +0 TLS +GLOBAL DEFAULT +8 sg2 #... -Symbol table '\.symtab' contains [0-9]+ 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-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-9a-f]+ +0 SECTION LOCAL DEFAULT +15 * - +16: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 * - +17: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17 * - +[0-9]+: 0+08 +0 TLS +LOCAL DEFAULT +8 sl1 - +[0-9]+: 0+0c +0 TLS +LOCAL DEFAULT +8 sl2 - +[0-9]+: 0+18 +0 TLS +LOCAL HIDDEN +9 sH1 - +[0-9]+: 0+1c +0 TLS +LOCAL HIDDEN +9 sH2 - +[0-9]+: 0+10 +0 TLS +LOCAL HIDDEN +8 sh1 - +[0-9]+: 0+14 +0 TLS +LOCAL HIDDEN +8 sh2 -#... - +[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr - +[0-9]+: 0+00 +0 TLS +GLOBAL DEFAULT +8 sg1 -#... - +[0-9]+: [0-9a-f]+ +0 FUNC GLOBAL DEFAULT +7 fn1 -#... - +[0-9]+: 0+04 +0 TLS +GLOBAL DEFAULT +8 sg2 #pass + -- 2.7.4