aboutsummaryrefslogtreecommitdiff
path: root/ld/testsuite/ld-sh/sh64
diff options
context:
space:
mode:
Diffstat (limited to 'ld/testsuite/ld-sh/sh64')
-rw-r--r--ld/testsuite/ld-sh/sh64/abi32.xd24
-rw-r--r--ld/testsuite/ld-sh/sh64/abi64.xd24
-rw-r--r--ld/testsuite/ld-sh/sh64/cmpct1.xd35
-rw-r--r--ld/testsuite/ld-sh/sh64/crange1.rd66
-rw-r--r--ld/testsuite/ld-sh/sh64/crange2.rd74
-rw-r--r--ld/testsuite/ld-sh/sh64/crange3-cmpct.rd78
-rw-r--r--ld/testsuite/ld-sh/sh64/crange3-media.rd78
-rw-r--r--ld/testsuite/ld-sh/sh64/crange3.rd72
-rw-r--r--ld/testsuite/ld-sh/sh64/gotplt.d4
-rw-r--r--ld/testsuite/ld-sh/sh64/init-cmpct.d14
-rw-r--r--ld/testsuite/ld-sh/sh64/init-media.d13
-rw-r--r--ld/testsuite/ld-sh/sh64/init64.d13
-rw-r--r--ld/testsuite/ld-sh/sh64/mix1.xd28
-rw-r--r--ld/testsuite/ld-sh/sh64/mix2.xd26
-rw-r--r--ld/testsuite/ld-sh/sh64/sh64.exp10
-rw-r--r--ld/testsuite/ld-sh/sh64/shdl32.xd26
-rw-r--r--ld/testsuite/ld-sh/sh64/shdl64.xd26
17 files changed, 228 insertions, 383 deletions
diff --git a/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd
index a267d31..03f1b01 100644
--- a/ld/testsuite/ld-sh/sh64/abi32.xd
+++ b/ld/testsuite/ld-sh/sh64/abi32.xd
@@ -17,25 +17,13 @@ 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 \.ctors 00000000 0+10e8 0+10e8 00000184 2\*\*0
- CONTENTS
- 2 \.dtors 00000000 0+10e8 0+10e8 00000184 2\*\*0
- CONTENTS
- 3 \.data 00000018 0+10e8 0+10e8 00000168 2\*\*2
+ 1 \.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
- ALLOC
- 6 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 2 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
-0+10e8 l d \.ctors 0+ (|\.ctors)
-0+10e8 l d \.dtors 0+ (|\.dtors)
0+10e8 l d \.data 0+ (|\.data)
-0+1100 l d \.sbss 0+ (|\.sbss)
-0+1100 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
@@ -45,16 +33,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 \.dtors 0+ ___dtors
+0+10e8 g \*ABS\* 0+ ___dtors
0+105c g \.text 0+ 0x04 xyzzy
0+1100 g \*ABS\* 0+ __bss_start
-0+10e8 g \.ctors 0+ ___ctors_end
+0+10e8 g \*ABS\* 0+ ___ctors_end
0+10f0 g \.data 0+ baz2
-0+10e8 g \.ctors 0+ ___ctors
+0+10e8 g \*ABS\* 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 \.dtors 0+ ___dtors_end
+0+10e8 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd
index 56e883c..fdfafb0 100644
--- a/ld/testsuite/ld-sh/sh64/abi64.xd
+++ b/ld/testsuite/ld-sh/sh64/abi64.xd
@@ -16,25 +16,13 @@ Sections:
Idx Name Size VMA LMA File off Algn
0 \.text 000000ac 0000000000001000 0000000000001000 00000100 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 \.ctors 00000000 0000000000001130 0000000000001130 00000204 2\*\*0
- CONTENTS
- 2 \.dtors 00000000 0000000000001130 0000000000001130 00000204 2\*\*0
- CONTENTS
- 3 \.data 00000018 0000000000001130 0000000000001130 000001b0 2\*\*2
+ 1 \.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
- ALLOC
- 6 \.stack 00000004 0000000000080000 0000000000080000 00000200 2\*\*0
+ 2 \.stack 00000004 0000000000080000 0000000000080000 00000200 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0000000000001000 l d \.text 0000000000000000 (|\.text)
-0000000000001130 l d \.ctors 0000000000000000 (|\.ctors)
-0000000000001130 l d \.dtors 0000000000000000 (|\.dtors)
0000000000001130 l d \.data 0000000000000000 (|\.data)
-0000000000001148 l d \.sbss 0000000000000000 (|\.sbss)
-0000000000001148 l d \.bss 0000000000000000 (|\.bss)
0000000000080000 l d \.stack 0000000000000000 (|\.stack)
0000000000000000 l d \*ABS\* 0000000000000000 (|\.shstrtab)
0000000000000000 l d \*ABS\* 0000000000000000 (|\.symtab)
@@ -44,16 +32,16 @@ SYMBOL TABLE:
00000000000010a8 l \.text 0000000000000000 0x04 plugh
0000000000001140 g \.data 0000000000000000 foobar
0000000000001130 g \.data 0000000000000000 baz
-0000000000001130 g \.dtors 0000000000000000 ___dtors
+0000000000001130 g \*ABS\* 0000000000000000 ___dtors
00000000000010a4 g \.text 0000000000000000 0x04 xyzzy
0000000000001148 g \*ABS\* 0000000000000000 __bss_start
-0000000000001130 g \.ctors 0000000000000000 ___ctors_end
+0000000000001130 g \*ABS\* 0000000000000000 ___ctors_end
0000000000001138 g \.data 0000000000000000 baz2
-0000000000001130 g \.ctors 0000000000000000 ___ctors
+0000000000001130 g \*ABS\* 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 \.dtors 0000000000000000 ___dtors_end
+0000000000001130 g \*ABS\* 0000000000000000 ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd
index f5e6224..e1beb14 100644
--- a/ld/testsuite/ld-sh/sh64/cmpct1.xd
+++ b/ld/testsuite/ld-sh/sh64/cmpct1.xd
@@ -6,51 +6,34 @@ EXEC_P, HAS_SYMS, D_PAGED
start address 0x0+1000
Program Header:
- LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
+ LOAD off 0x0+80 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+14 memsz 0x0+14 flags r-x
- LOAD off 0x0+118 vaddr 0x0+1098 paddr 0x0+1098 align 2\*\*7
- filesz 0x0+ memsz 0x0+ flags rw-
- LOAD off 0x0+180 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
+ LOAD off 0x0+100 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x00000004 memsz 0x00000004 flags rw-
Sections:
Idx Name Size VMA LMA File off Algn
- 0 \.text 00000008 0+1000 0+1000 00000100 2\*\*0
+ 0 \.text 00000008 0+1000 0+1000 00000080 2\*\*0
CONTENTS, ALLOC, LOAD, READONLY, CODE
- 1 \.rodata 0000000c 0+1008 0+1008 00000108 2\*\*2
+ 1 \.rodata 0000000c 0+1008 0+1008 00000088 2\*\*2
CONTENTS, ALLOC, LOAD, READONLY, DATA
- 2 \.ctors 00000000 0+1098 0+1098 00000184 2\*\*0
- CONTENTS
- 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
- ALLOC
- 7 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 2 \.stack 00000004 0+80000 0+80000 00000100 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1008 l d \.rodata 0+ (|\.rodata)
-0+1098 l d \.ctors 0+ (|\.ctors)
-0+1098 l d \.dtors 0+ (|\.dtors)
-0+1098 l d \.data 0+ (|\.data)
-0+1098 l d \.sbss 0+ (|\.sbss)
-0+1098 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
0+ l d \*ABS\* 0+ (|\.strtab)
0+1004 l \.text 0+ next
0+100c l \.rodata 0+ here
-0+1098 g \.dtors 0+ ___dtors
+0+1098 g \*ABS\* 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+ ___ctors_end
+0+1098 g \*ABS\* 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 \.dtors 0+ ___dtors_end
+0+1098 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd
index 1c927ca..52b7bd1 100644
--- a/ld/testsuite/ld-sh/sh64/crange1.rd
+++ b/ld/testsuite/ld-sh/sh64/crange1.rd
@@ -1,20 +1,15 @@
-There are 13 section headers, starting at offset 0x1f8:
+.*
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 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\] \.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
- \[ 9\] \.cranges LOUSER\+1 00000000 000184 00001e 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 0001a2 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 000400 000180 10 12 14 4
- \[12\] \.strtab STRTAB 00000000 000580 000064 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 000018 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000100 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000104 00001e 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
@@ -22,32 +17,27 @@ Key to Flags:
There are no relocations in this file\.
-Symbol table '\.symtab' contains 24 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 000010a0 0 SECTION LOCAL DEFAULT 3
- 4: 000010a0 0 SECTION LOCAL DEFAULT 4
- 5: 000010a0 0 SECTION LOCAL DEFAULT 5
- 6: 000010a0 0 SECTION LOCAL DEFAULT 6
- 7: 000010a0 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 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 4 ___dtors
- 15: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 16: 000010a0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 17: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 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 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 000010a0 0 NOTYPE GLOBAL DEFAULT ABS ___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 281223d..dac8f9b 100644
--- a/ld/testsuite/ld-sh/sh64/crange2.rd
+++ b/ld/testsuite/ld-sh/sh64/crange2.rd
@@ -1,20 +1,15 @@
-There are 13 section headers, starting at offset 0x220:
+.*
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 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\] \.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
- \[ 9\] \.cranges LOUSER\+1 00000000 000184 000046 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 0001ca 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 000428 0001c0 10 12 18 4
- \[12\] \.strtab STRTAB 00000000 0005e8 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 00005c 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000100 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000104 000046 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
@@ -22,36 +17,31 @@ Key to Flags:
There are no relocations in this file\.
-Symbol table '\.symtab' contains 28 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 000010e0 0 SECTION LOCAL DEFAULT 3
- 4: 000010e0 0 SECTION LOCAL DEFAULT 4
- 5: 000010e0 0 SECTION LOCAL DEFAULT 5
- 6: 000010e0 0 SECTION LOCAL DEFAULT 6
- 7: 000010e0 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
- 14: 0000101c 0 NOTYPE LOCAL DEFAULT 2 sec1
- 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 4 ___dtors
- 19: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 20: 000010e0 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 21: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 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 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 0000101c 0 NOTYPE LOCAL DEFAULT 2 sec1
+.*: 0000102c 0 NOTYPE LOCAL DEFAULT 2 sec2
+.*: 00001040 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 00001048 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 00001004 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 000010e0 0 NOTYPE GLOBAL DEFAULT ABS ___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 8ff9691..674a913 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
@@ -10,64 +10,54 @@ ELF Header:
Version: 0x1
Entry point address: 0x10c4
Start of program headers: 52 \(bytes into file\)
- Start of section headers: 664 \(bytes into file\)
+ Start of section headers: 504 \(bytes into file\)
Flags: 0xa, sh5
Size of this header: 52 \(bytes\)
Size of program headers: 32 \(bytes\)
- Number of program headers: 3
+ Number of program headers: 2
Size of section headers: 40 \(bytes\)
- Number of section headers: 13
- Section header string table index: 10
+ Number of section headers: 8
+ Section header string table index: 5
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 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\] \.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
- \[ 9\] \.cranges LOUSER\+1 00000000 000204 00003c 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 000240 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 0004a0 0001b0 10 12 16 4
- \[12\] \.strtab STRTAB 00000000 000650 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 0000d8 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000184 00003c 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 00001160 0 SECTION LOCAL DEFAULT 3
- 4: 00001160 0 SECTION LOCAL DEFAULT 4
- 5: 00001160 0 SECTION LOCAL DEFAULT 5
- 6: 00001160 0 SECTION LOCAL DEFAULT 6
- 7: 00001160 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
- 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 4 ___dtors
- 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 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 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___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 51d0a95..c5f2be4 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-media.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd
@@ -10,64 +10,54 @@ ELF Header:
Version: 0x1
Entry point address: 0x10a5
Start of program headers: 52 \(bytes into file\)
- Start of section headers: 664 \(bytes into file\)
+ Start of section headers: 504 \(bytes into file\)
Flags: 0xa, sh5
Size of this header: 52 \(bytes\)
Size of program headers: 32 \(bytes\)
- Number of program headers: 3
+ Number of program headers: 2
Size of section headers: 40 \(bytes\)
- Number of section headers: 13
- Section header string table index: 10
+ Number of section headers: 8
+ Section header string table index: 5
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 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\] \.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
- \[ 9\] \.cranges LOUSER\+1 00000000 000204 00003c 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 000240 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 0004a0 0001b0 10 12 16 4
- \[12\] \.strtab STRTAB 00000000 000650 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 0000d8 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000184 00003c 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 00001160 0 SECTION LOCAL DEFAULT 3
- 4: 00001160 0 SECTION LOCAL DEFAULT 4
- 5: 00001160 0 SECTION LOCAL DEFAULT 5
- 6: 00001160 0 SECTION LOCAL DEFAULT 6
- 7: 00001160 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
- 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 4 ___dtors
- 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 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 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___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 c55b9e2..0341254 100644
--- a/ld/testsuite/ld-sh/sh64/crange3.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3.rd
@@ -1,54 +1,44 @@
-There are 13 section headers, starting at offset 0x298:
+.*
Section Headers:
\[Nr\] Name Type Addr Off Size ES Flg Lk Inf Al
\[ 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\] \.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
- \[ 9\] \.cranges LOUSER\+1 00000000 000204 00003c 00 W 0 0 1
- \[10\] \.shstrtab STRTAB 00000000 000240 000056 00 0 0 1
- \[11\] \.symtab SYMTAB 00000000 0004a0 0001b0 10 12 16 4
- \[12\] \.strtab STRTAB 00000000 000650 000078 00 0 0 1
+ \[ 1\] \.init PROGBITS 00001000 000080 000004 00 AXp 0 0 4
+ \[ 2\] \.text PROGBITS 00001004 000084 0000d8 00 AXp 0 0 4
+ \[ 3\] \.stack PROGBITS 00080000 000180 000004 00 WA 0 0 1
+ \[ 4\] \.cranges LOUSER\+1 00000000 000184 00003c 00 W 0 0 1
+ \[ 5\] \.shstrtab STRTAB .*
+ \[ 6\] \.symtab SYMTAB .*
+ \[ 7\] \.strtab STRTAB .*
Key to Flags:
W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
I \(info\), L \(link order\), G \(group\), x \(unknown\)
O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
Num: Value Size Type Bind Vis Ndx Name
- 0: 00000000 0 NOTYPE LOCAL DEFAULT UND
- 1: 00001000 0 SECTION LOCAL DEFAULT 1
- 2: 00001004 0 SECTION LOCAL DEFAULT 2
- 3: 00001160 0 SECTION LOCAL DEFAULT 3
- 4: 00001160 0 SECTION LOCAL DEFAULT 4
- 5: 00001160 0 SECTION LOCAL DEFAULT 5
- 6: 00001160 0 SECTION LOCAL DEFAULT 6
- 7: 00001160 0 SECTION LOCAL DEFAULT 7
- 8: 00080000 0 SECTION LOCAL DEFAULT 8
- 9: 00000000 0 SECTION LOCAL DEFAULT 9
- 10: 00000000 0 SECTION LOCAL DEFAULT 10
- 11: 00000000 0 SECTION LOCAL DEFAULT 11
- 12: 00000000 0 SECTION LOCAL DEFAULT 12
- 13: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
- 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 4 ___dtors
- 18: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
- 19: 00001160 0 NOTYPE GLOBAL DEFAULT 3 ___ctors_end
- 20: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
- 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 4 ___dtors_end
+.*: 00000000 0 NOTYPE LOCAL DEFAULT UND
+.*: 00001000 0 SECTION LOCAL DEFAULT 1
+.*: 00001004 0 SECTION LOCAL DEFAULT 2
+.*: 00080000 0 SECTION LOCAL DEFAULT 3
+.*: 00000000 0 SECTION LOCAL DEFAULT 4
+.*: 00000000 0 SECTION LOCAL DEFAULT 5
+.*: 00000000 0 SECTION LOCAL DEFAULT 6
+.*: 00000000 0 SECTION LOCAL DEFAULT 7
+.*: 00001004 0 NOTYPE LOCAL DEFAULT 2 sec4
+.*: 000010a4 0 NOTYPE LOCAL DEFAULT 2 start2
+.*: 000010bc 0 NOTYPE LOCAL DEFAULT 2 sec3
+.*: 000010c4 0 NOTYPE GLOBAL DEFAULT 2 diversion
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___dtors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors_end
+.*: 000010a4 0 NOTYPE GLOBAL DEFAULT 2 diversion2
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___ctors
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _edata
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS _end
+.*: 00001000 0 NOTYPE GLOBAL DEFAULT 1 start
+.*: 00080000 0 NOTYPE GLOBAL DEFAULT 3 _stack
+.*: 00001160 0 NOTYPE GLOBAL DEFAULT ABS ___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 89a401a..5822326 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 0x270 contains 1 entries:
+Relocation section '\.rela\.dyn' at offset .* contains 1 entries:
Offset Info Type Sym\.Value Sym\. Name \+ Addend
-0000039c 000000a5 R_SH_RELATIVE 0000027c
+[0-9a-f ]+R_SH_RELATIVE[0-9a-f ]+
diff --git a/ld/testsuite/ld-sh/sh64/init-cmpct.d b/ld/testsuite/ld-sh/sh64/init-cmpct.d
index b9f1731..6f64bc4 100644
--- a/ld/testsuite/ld-sh/sh64/init-cmpct.d
+++ b/ld/testsuite/ld-sh/sh64/init-cmpct.d
@@ -7,14 +7,8 @@
# Make sure that the lsb of DT_INIT and DT_FINI entries is not set
# when _init and _fini are SHcompact code.
-Dynamic section at offset 0x228 contains 8 entries:
+Dynamic section at offset .* contains 8 entries:
Tag Type Name/Value
- 0x0000000c \(INIT\) 0x216
- 0x0000000d \(FINI\) 0x21e
- 0x00000004 \(HASH\) 0x94
- 0x00000005 \(STRTAB\) 0x1c0
- 0x00000006 \(SYMTAB\) 0xe0
- 0x0000000a \(STRSZ\) 85 \(bytes\)
- 0x0000000b \(SYMENT\) 16 \(bytes\)
- 0x00000000 \(NULL\) 0x0
-
+ 0x0000000c \(INIT\) .*[02468ace]
+ 0x0000000d \(FINI\) .*[02468ace]
+#pass
diff --git a/ld/testsuite/ld-sh/sh64/init-media.d b/ld/testsuite/ld-sh/sh64/init-media.d
index 4e0e585..56c6c19 100644
--- a/ld/testsuite/ld-sh/sh64/init-media.d
+++ b/ld/testsuite/ld-sh/sh64/init-media.d
@@ -7,13 +7,8 @@
# Make sure that the lsb of DT_INIT and DT_FINI entries is set
# when _init and _fini are SHmedia code.
-Dynamic section at offset 0x238 contains 8 entries:
+.*
Tag Type Name/Value
- 0x0000000c \(INIT\) 0x217
- 0x0000000d \(FINI\) 0x227
- 0x00000004 \(HASH\) 0x94
- 0x00000005 \(STRTAB\) 0x1c0
- 0x00000006 \(SYMTAB\) 0xe0
- 0x0000000a \(STRSZ\) 85 \(bytes\)
- 0x0000000b \(SYMENT\) 16 \(bytes\)
- 0x00000000 \(NULL\) 0x0
+ 0x0000000c \(INIT\) .*[13579bdf]
+ 0x0000000d \(FINI\) .*[13579bdf]
+#pass
diff --git a/ld/testsuite/ld-sh/sh64/init64.d b/ld/testsuite/ld-sh/sh64/init64.d
index c32a76f..01c8e97 100644
--- a/ld/testsuite/ld-sh/sh64/init64.d
+++ b/ld/testsuite/ld-sh/sh64/init64.d
@@ -7,13 +7,8 @@
# Make sure that the lsb of DT_INIT and DT_FINI entries is set
# when _init and _fini are SHmedia code.
-Dynamic section at offset 0x300 contains 8 entries:
+.*
Tag Type Name/Value
- 0x000000000000000c \(INIT\) 0x2df
- 0x000000000000000d \(FINI\) 0x2ef
- 0x0000000000000004 \(HASH\) 0xe8
- 0x0000000000000005 \(STRTAB\) 0x288
- 0x0000000000000006 \(SYMTAB\) 0x138
- 0x000000000000000a \(STRSZ\) 85 \(bytes\)
- 0x000000000000000b \(SYMENT\) 24 \(bytes\)
- 0x0000000000000000 \(NULL\) 0x0
+ 0x000000000000000c \(INIT\) .*[13579bdf]
+ 0x000000000000000d \(FINI\) .*[13579bdf]
+#pass
diff --git a/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd
index ea17531..ae82c45 100644
--- a/ld/testsuite/ld-sh/sh64/mix1.xd
+++ b/ld/testsuite/ld-sh/sh64/mix1.xd
@@ -9,34 +9,22 @@ Program Header:
LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+48 memsz 0x0+48 flags r-x
LOAD off 0x0+148 vaddr 0x0+10c8 paddr 0x0+10c8 align 2\*\*7
- filesz 0x0+c memsz 0x0+10 flags rw-
+ filesz 0x0+c memsz 0x0+c flags rw-
LOAD off 0x0+180 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x0+4 memsz 0x0+4 flags rw-
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 \.ctors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 2 \.dtors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 3 \.data 0000000c 0+10c8 0+10c8 00000148 2\*\*2
+ 1 \.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 00000154 2\*\*0
- ALLOC
- 6 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 2 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
- 7 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
+ 3 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
CONTENTS, DEBUGGING, SORT_ENTRIES
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
-0+10c8 l d \.ctors 0+ (|\.ctors)
-0+10c8 l d \.dtors 0+ (|\.dtors)
0+10c8 l d \.data 0+ (|\.data)
-0+10d8 l d \.sbss 0+ (|\.sbss)
-0+10d8 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \.cranges 0+ (|\.cranges)
0+ l d \*ABS\* 0+ (|\.shstrtab)
@@ -46,12 +34,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 \.dtors 0+ ___dtors
+0+10c8 g \*ABS\* 0+ ___dtors
0+10d8 g \*ABS\* 0+ __bss_start
-0+10c8 g \.ctors 0+ ___ctors_end
-0+10c8 g \.ctors 0+ ___ctors
+0+10c8 g \*ABS\* 0+ ___ctors_end
+0+10c8 g \*ABS\* 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 \.dtors 0+ ___dtors_end
+0+10c8 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd
index ec76cc8..a7df4ef 100644
--- a/ld/testsuite/ld-sh/sh64/mix2.xd
+++ b/ld/testsuite/ld-sh/sh64/mix2.xd
@@ -19,28 +19,16 @@ 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 \.ctors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 3 \.dtors 00000000 0+10c8 0+10c8 00000184 2\*\*0
- CONTENTS
- 4 \.data 00000010 0+10c8 0+10c8 00000148 2\*\*2
+ 2 \.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
- ALLOC
- 7 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
+ 3 \.stack 00000004 0+80000 0+80000 00000180 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
- 8 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
+ 4 \.cranges 00000014 0+ 0+ 00000184 2\*\*0
CONTENTS, DEBUGGING, SORT_ENTRIES
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1034 l d \.rodata 0+ (|\.rodata)
-0+10c8 l d \.ctors 0+ (|\.ctors)
-0+10c8 l d \.dtors 0+ (|\.dtors)
0+10c8 l d \.data 0+ (|\.data)
-0+10d8 l d \.sbss 0+ (|\.sbss)
-0+10d8 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \.cranges 0+ (|\.cranges)
0+ l d \*ABS\* 0+ (|\.shstrtab)
@@ -54,14 +42,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 \.dtors 0+ ___dtors
+0+10c8 g \*ABS\* 0+ ___dtors
0+10cc g \.data 0+ medialabel4
0+10d8 g \*ABS\* 0+ __bss_start
-0+10c8 g \.ctors 0+ ___ctors_end
+0+10c8 g \*ABS\* 0+ ___ctors_end
0+10d4 g \.data 0+ compactlabel5
-0+10c8 g \.ctors 0+ ___ctors
+0+10c8 g \*ABS\* 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 \.dtors 0+ ___dtors_end
+0+10c8 g \*ABS\* 0+ ___dtors_end
diff --git a/ld/testsuite/ld-sh/sh64/sh64.exp b/ld/testsuite/ld-sh/sh64/sh64.exp
index 1b54cf5..a150dc2 100644
--- a/ld/testsuite/ld-sh/sh64/sh64.exp
+++ b/ld/testsuite/ld-sh/sh64/sh64.exp
@@ -97,13 +97,13 @@ set sh64tests {
{{readelf {-s -r -x 1 -x 3} reldl64.rd}} "reldl64.bin" }
{"Handling SH64 assembler-generated .cranges" "-mshelf32"
"--abi=32" {crange-2a.s crange-1.s}
- {{readelf {-S -s -r -x 1 -x 2 -x 9} crange1.rd}} "crange1.bin" }
+ {{readelf {-S -s -r -x 1 -x 2 -x 4} crange1.rd}} "crange1.bin" }
{"Handling SH64 assembler-generated .cranges, partial linking" "-mshelf32 -r"
"--abi=32" {crange-2a.s}
{{readelf {-S -s -r -x 2 -x 6} crangerel1.rd}} "crangerel1.bin" }
{"Mixing SH64 assembler-generated with linker-generated .cranges" "-mshelf32"
"--abi=32" {crange-2a.s crange-2b.s crange-1.s}
- {{readelf {-S -s -r -x 2 -x 9} crange2.rd}} "crange2.bin" }
+ {{readelf {-S -s -r -x 2 -x 4} crange2.rd}} "crange2.bin" }
{"Mixing SH64 assembler-generated with linker-generated .cranges, partial linking"
"-mshelf32 -r"
"--abi=32" {crange-2a.s crange-2c.s crange-2d.s crange-2e.s}
@@ -112,17 +112,17 @@ set sh64tests {
"--abi=32"
{crange-2e.s crange-2f.s crange-2g.s crange-2a.s crange-2d.s crange-2i.s
crange-2h.s crange-1.s}
- {{readelf {-S -s -x 2 -x 9} crange3.rd} {objdump -d crange3.dd}} "crange3.bin" }
+ {{readelf {-S -s -x 2 -x 4} crange3.rd} {objdump -d crange3.dd}} "crange3.bin" }
{"Sorted SH64 .cranges, entry at SHcompact code" "-mshelf32 --entry diversion"
"--abi=32"
{crange-2e.s crange-2f.s crange-2g.s crange-2a.s crange-2d.s crange-2i.s
crange-2h.s crange-1.s}
- {{readelf {-h -S -s -x 2 -x 9} crange3-cmpct.rd}} "crange3-cmpct.bin" }
+ {{readelf {-h -S -s -x 2 -x 4} crange3-cmpct.rd}} "crange3-cmpct.bin" }
{"Sorted SH64 .cranges, entry at SHmedia code" "-mshelf32 --entry diversion2"
"--abi=32"
{crange-2e.s crange-2f.s crange-2g.s crange-2a.s crange-2d.s crange-2i.s
crange-2h.s crange-1.s}
- {{readelf {-h -S -s -x 2 -x 9} crange3-media.rd}} "crange3-media.bin" }
+ {{readelf {-h -S -s -x 2 -x 4} crange3-media.rd}} "crange3-media.bin" }
{"SH64 Big Endianness" "-mshelf64 -Tendian.ld"
"--abi=64" {endian.s}
{{objdump -s endian.sbd} {objdump -d endian.dbd}} "endianb.bin" }
diff --git a/ld/testsuite/ld-sh/sh64/shdl32.xd b/ld/testsuite/ld-sh/sh64/shdl32.xd
index 84dabc5..c0b1f34 100644
--- a/ld/testsuite/ld-sh/sh64/shdl32.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl32.xd
@@ -8,7 +8,7 @@ Program Header:
LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+348 memsz 0x0+348 flags r-x
LOAD off 0x0+448 vaddr 0x0+13c8 paddr 0x0+13c8 align 2\*\*7
- filesz 0x0+194 memsz 0x0+198 flags rw-
+ filesz 0x0+194 memsz 0x0+194 flags rw-
LOAD off 0x0+600 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x00000004 memsz 0x00000004 flags rw-
@@ -18,26 +18,14 @@ 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 \.ctors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 3 \.dtors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 4 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2
+ 2 \.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+5dc 2\*\*0
- ALLOC
- 7 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
+ 3 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1204 l d \.rodata 0+ (|\.rodata)
-0+13c8 l d \.ctors 0+ (|\.ctors)
-0+13c8 l d \.dtors 0+ (|\.dtors)
0+13c8 l d \.data 0+ (|\.data)
-0+1560 l d \.sbss 0+ (|\.sbss)
-0+1560 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
@@ -88,7 +76,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 \.dtors 0+ ___dtors
+0+13c8 g \*ABS\* 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 +92,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 \.ctors 0+ ___ctors_end
+0+13c8 g \*ABS\* 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 \.ctors 0+ ___ctors
+0+13c8 g \*ABS\* 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 +121,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 \.dtors 0+ ___dtors_end
+0+13c8 g \*ABS\* 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 71ab0d3..8a7b236 100644
--- a/ld/testsuite/ld-sh/sh64/shdl64.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl64.xd
@@ -8,7 +8,7 @@ Program Header:
LOAD off 0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
filesz 0x0+348 memsz 0x0+348 flags r-x
LOAD off 0x0+448 vaddr 0x0+13c8 paddr 0x0+13c8 align 2\*\*7
- filesz 0x0+194 memsz 0x0+198 flags rw-
+ filesz 0x0+194 memsz 0x0+194 flags rw-
LOAD off 0x0+600 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
filesz 0x0+4 memsz 0x0+4 flags rw-
@@ -18,26 +18,14 @@ 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 \.ctors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 3 \.dtors 0+ 0+13c8 0+13c8 0+604 2\*\*0
- CONTENTS
- 4 \.data 0+194 0+13c8 0+13c8 0+448 2\*\*2
+ 2 \.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+5dc 2\*\*0
- ALLOC
- 7 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
+ 3 \.stack 0+4 0+80000 0+80000 0+600 2\*\*0
CONTENTS, ALLOC, LOAD, DATA
SYMBOL TABLE:
0+1000 l d \.text 0+ (|\.text)
0+1204 l d \.rodata 0+ (|\.rodata)
-0+13c8 l d \.ctors 0+ (|\.ctors)
-0+13c8 l d \.dtors 0+ (|\.dtors)
0+13c8 l d \.data 0+ (|\.data)
-0+1560 l d \.sbss 0+ (|\.sbss)
-0+1560 l d \.bss 0+ (|\.bss)
0+80000 l d \.stack 0+ (|\.stack)
0+ l d \*ABS\* 0+ (|\.shstrtab)
0+ l d \*ABS\* 0+ (|\.symtab)
@@ -88,7 +76,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 \.dtors 0+ ___dtors
+0+13c8 g \*ABS\* 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 +92,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 \.ctors 0+ ___ctors_end
+0+13c8 g \*ABS\* 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 \.ctors 0+ ___ctors
+0+13c8 g \*ABS\* 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 +121,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 \.dtors 0+ ___dtors_end
+0+13c8 g \*ABS\* 0+ ___dtors_end
0+151c g \.data 0+ dbaz_otherboth2
0+1500 g \.data 0+ dbazboth2