summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/testsuite/ChangeLog11
-rw-r--r--ld/testsuite/ld-sh/vxworks1-le.dd16
-rw-r--r--ld/testsuite/ld-sh/vxworks1-lib-le.dd20
-rw-r--r--ld/testsuite/ld-sh/vxworks1-lib.dd20
-rw-r--r--ld/testsuite/ld-sh/vxworks1.dd16
-rw-r--r--ld/testsuite/ld-sh/vxworks3-le.dd14
-rw-r--r--ld/testsuite/ld-sh/vxworks3.dd14
7 files changed, 61 insertions, 50 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 309b15aef69..2ccb103b422 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-14 Richard Sandiford <richard@codesourcery.com>
+
+ * ld-sh/vxworks1.dd: Remove hexadecimal prefixes from constant pool
+ contents. Consistently use "!" as the comment character.
+ Consistently use _PROCEDURE_LINKAGE_TABLE_ in the first PLT entry.
+ * ld-sh/vxworks1-le.dd: Likewise.
+ * ld-sh/vxworks1-lib.dd: Likewise.
+ * ld-sh/vxworks1-lib-le.dd: Likewise.
+ * ld-sh/vxworks3.dd: Likewise.
+ * ld-sh/vxworks3-le.dd: Likewise.
+
2007-05-14 Andreas Schwab <schwab@suse.de>
* ld-elf/dl2a.list: New file.
diff --git a/ld/testsuite/ld-sh/vxworks1-le.dd b/ld/testsuite/ld-sh/vxworks1-le.dd
index d70c9af19be..03c817c190f 100644
--- a/ld/testsuite/ld-sh/vxworks1-le.dd
+++ b/ld/testsuite/ld-sh/vxworks1-le.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
00080800 <_PROCEDURE_LINKAGE_TABLE_>:
- 80800: 01 d1 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r1 ! 0x81408
+ 80800: 01 d1 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r1 ! 81408
80802: 12 61 mov\.l @r1,r1
80804: 2b 41 jmp @r1
80806: 09 00 nop
@@ -13,14 +13,14 @@ Disassembly of section \.plt:
8080a: 08 00 .*
0008080c <_sglobal@plt>:
- 8080c: 01 d0 mov\.l 80814 <_sglobal@plt\+0x8>,r0 ! 0x8140c
+ 8080c: 01 d0 mov\.l 80814 <_sglobal@plt\+0x8>,r0 ! 8140c
8080e: 02 60 mov\.l @r0,r0
80810: 2b 40 jmp @r0
80812: 09 00 nop
80814: 0c 14 .*
80814: R_SH_DIR32 _GLOBAL_OFFSET_TABLE_\+0xc
80816: 08 00 .*
- 80818: 01 d0 mov\.l 80820 <_sglobal@plt\+0x14>,r0 ! 0x0
+ 80818: 01 d0 mov\.l 80820 <_sglobal@plt\+0x14>,r0 ! 0
8081a: f1 af bra 80800 <_PROCEDURE_LINKAGE_TABLE_>
8081c: 09 00 nop
8081e: 09 00 nop
@@ -28,14 +28,14 @@ Disassembly of section \.plt:
\.\.\.
00080824 <_foo@plt>:
- 80824: 01 d0 mov\.l 8082c <_foo@plt\+0x8>,r0 ! 0x81410
+ 80824: 01 d0 mov\.l 8082c <_foo@plt\+0x8>,r0 ! 81410
80826: 02 60 mov\.l @r0,r0
80828: 2b 40 jmp @r0
8082a: 09 00 nop
8082c: 10 14 .*
8082c: R_SH_DIR32 _GLOBAL_OFFSET_TABLE_\+0x10
8082e: 08 00 .*
- 80830: 01 d0 mov\.l 80838 <_foo@plt\+0x14>,r0 ! 0xc
+ 80830: 01 d0 mov\.l 80838 <_foo@plt\+0x14>,r0 ! c
80832: e5 af bra 80800 <_PROCEDURE_LINKAGE_TABLE_>
80834: 09 00 nop
80836: 09 00 nop
@@ -45,13 +45,13 @@ Disassembly of section \.text:
00080c00 <__start>:
80c00: 22 4f sts\.l pr,@-r15
- 80c02: 06 d0 mov\.l 80c1c <__start\+0x1c>,r0 ! 0x80824 <_foo@plt>
+ 80c02: 06 d0 mov\.l 80c1c <__start\+0x1c>,r0 ! 80824 <_foo@plt>
80c04: 0b 40 jsr @r0
80c06: 09 00 nop
- 80c08: 05 d0 mov\.l 80c20 <__start\+0x20>,r0 ! 0x8080c <_sglobal@plt>
+ 80c08: 05 d0 mov\.l 80c20 <__start\+0x20>,r0 ! 8080c <_sglobal@plt>
80c0a: 0b 40 jsr @r0
80c0c: 09 00 nop
- 80c0e: 05 d0 mov\.l 80c24 <__start\+0x24>,r0 ! 0x80c28 <_sexternal>
+ 80c0e: 05 d0 mov\.l 80c24 <__start\+0x24>,r0 ! 80c28 <_sexternal>
80c10: 0b 40 jsr @r0
80c12: 09 00 nop
80c14: 26 4f lds\.l @r15\+,pr
diff --git a/ld/testsuite/ld-sh/vxworks1-lib-le.dd b/ld/testsuite/ld-sh/vxworks1-lib-le.dd
index 1e3e6d6e26e..6511c164cf9 100644
--- a/ld/testsuite/ld-sh/vxworks1-lib-le.dd
+++ b/ld/testsuite/ld-sh/vxworks1-lib-le.dd
@@ -4,13 +4,13 @@
Disassembly of section \.plt:
00080800 <_PROCEDURE_LINKAGE_TABLE_>:
- 80800: 01 d0 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r0 ! 0xc
+ 80800: 01 d0 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r0 ! c
80802: ce 00 mov\.l @\(r0,r12\),r0
80804: 2b 40 jmp @r0
80806: 09 00 nop
80808: 0c 00 .*
8080a: 00 00 .*
- 8080c: 01 d0 mov\.l 80814 <_sglobal@plt\+0x14>,r0 | 0x0
+ 8080c: 01 d0 mov\.l 80814 <_PROCEDURE_LINKAGE_TABLE_\+0x14>,r0 ! 0
8080e: c2 51 mov\.l @\(8,r12\),r1
80810: 2b 41 jmp @r1
80812: 09 00 nop
@@ -18,13 +18,13 @@ Disassembly of section \.plt:
\.\.\.
00080818 <_sexternal@plt>:
- 80818: 01 d0 mov\.l 80820 <_sexternal@plt\+0x8>,r0 ! 0x10
+ 80818: 01 d0 mov\.l 80820 <_sexternal@plt\+0x8>,r0 ! 10
8081a: ce 00 mov\.l @\(r0,r12\),r0
8081c: 2b 40 jmp @r0
8081e: 09 00 nop
80820: 10 00 .*
80822: 00 00 .*
- 80824: 01 d0 mov\.l 8082c <_sexternal@plt\+0x14>,r0 ! 0xc
+ 80824: 01 d0 mov\.l 8082c <_sexternal@plt\+0x14>,r0 ! c
80826: c2 51 mov\.l @\(8,r12\),r1
80828: 2b 41 jmp @r1
8082a: 09 00 nop
@@ -35,22 +35,22 @@ Disassembly of section \.text:
00080c00 <_foo>:
80c00: c6 2f mov\.l r12,@-r15
80c02: 22 4f sts\.l pr,@-r15
- 80c04: 0a dc mov\.l 80c30 <_foo\+0x30>,r12 ! 0x0
+ 80c04: 0a dc mov\.l 80c30 <_foo\+0x30>,r12 ! 0
80c06: c2 6c mov\.l @r12,r12
- 80c08: 0a d0 mov\.l 80c34 <_foo\+0x34>,r0 ! 0x0
+ 80c08: 0a d0 mov\.l 80c34 <_foo\+0x34>,r0 ! 0
80c0a: ce 0c mov\.l @\(r0,r12\),r12
- 80c0c: 0a d0 mov\.l 80c38 <_foo\+0x38>,r0 ! 0x14
+ 80c0c: 0a d0 mov\.l 80c38 <_foo\+0x38>,r0 ! 14
80c0e: ce 01 mov\.l @\(r0,r12\),r1
80c10: 12 62 mov\.l @r1,r2
80c12: 01 72 add #1,r2
80c14: 22 21 mov\.l r2,@r1
- 80c16: 09 d0 mov\.l 80c3c <_foo\+0x3c>,r0 ! 0x2c
+ 80c16: 09 d0 mov\.l 80c3c <_foo\+0x3c>,r0 ! 2c
80c18: 03 00 bsrf r0
80c1a: 09 00 nop
- 80c1c: 08 d0 mov\.l 80c40 <_foo\+0x40>,r0 ! 0xfffffbde
+ 80c1c: 08 d0 mov\.l 80c40 <_foo\+0x40>,r0 ! fffffbde
80c1e: 03 00 bsrf r0
80c20: 09 00 nop
- 80c22: 08 d0 mov\.l 80c44 <_foo\+0x44>,r0 ! 0xfffffbf0
+ 80c22: 08 d0 mov\.l 80c44 <_foo\+0x44>,r0 ! fffffbf0
80c24: 03 00 bsrf r0
80c26: 09 00 nop
80c28: 26 4f lds\.l @r15\+,pr
diff --git a/ld/testsuite/ld-sh/vxworks1-lib.dd b/ld/testsuite/ld-sh/vxworks1-lib.dd
index fc9f3a64736..e20f3347717 100644
--- a/ld/testsuite/ld-sh/vxworks1-lib.dd
+++ b/ld/testsuite/ld-sh/vxworks1-lib.dd
@@ -4,13 +4,13 @@
Disassembly of section \.plt:
00080800 <_PROCEDURE_LINKAGE_TABLE_>:
- 80800: d0 01 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r0 ! 0xc
+ 80800: d0 01 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r0 ! c
80802: 00 ce mov\.l @\(r0,r12\),r0
80804: 40 2b jmp @r0
80806: 00 09 nop
80808: 00 00 .*
8080a: 00 0c .*
- 8080c: d0 01 mov\.l 80814 <_sglobal@plt\+0x14>,r0 | 0x0
+ 8080c: d0 01 mov\.l 80814 <_PROCEDURE_LINKAGE_TABLE_\+0x14>,r0 ! 0
8080e: 51 c2 mov\.l @\(8,r12\),r1
80810: 41 2b jmp @r1
80812: 00 09 nop
@@ -18,13 +18,13 @@ Disassembly of section \.plt:
\.\.\.
00080818 <_sexternal@plt>:
- 80818: d0 01 mov\.l 80820 <_sexternal@plt\+0x8>,r0 ! 0x10
+ 80818: d0 01 mov\.l 80820 <_sexternal@plt\+0x8>,r0 ! 10
8081a: 00 ce mov\.l @\(r0,r12\),r0
8081c: 40 2b jmp @r0
8081e: 00 09 nop
80820: 00 00 .*
80822: 00 10 .*
- 80824: d0 01 mov\.l 8082c <_sexternal@plt\+0x14>,r0 ! 0xc
+ 80824: d0 01 mov\.l 8082c <_sexternal@plt\+0x14>,r0 ! c
80826: 51 c2 mov\.l @\(8,r12\),r1
80828: 41 2b jmp @r1
8082a: 00 09 nop
@@ -35,22 +35,22 @@ Disassembly of section \.text:
00080c00 <_foo>:
80c00: 2f c6 mov\.l r12,@-r15
80c02: 4f 22 sts\.l pr,@-r15
- 80c04: dc 0a mov\.l 80c30 <_foo\+0x30>,r12 ! 0x0
+ 80c04: dc 0a mov\.l 80c30 <_foo\+0x30>,r12 ! 0
80c06: 6c c2 mov\.l @r12,r12
- 80c08: d0 0a mov\.l 80c34 <_foo\+0x34>,r0 ! 0x0
+ 80c08: d0 0a mov\.l 80c34 <_foo\+0x34>,r0 ! 0
80c0a: 0c ce mov\.l @\(r0,r12\),r12
- 80c0c: d0 0a mov\.l 80c38 <_foo\+0x38>,r0 ! 0x14
+ 80c0c: d0 0a mov\.l 80c38 <_foo\+0x38>,r0 ! 14
80c0e: 01 ce mov\.l @\(r0,r12\),r1
80c10: 62 12 mov\.l @r1,r2
80c12: 72 01 add #1,r2
80c14: 21 22 mov\.l r2,@r1
- 80c16: d0 09 mov\.l 80c3c <_foo\+0x3c>,r0 ! 0x2c
+ 80c16: d0 09 mov\.l 80c3c <_foo\+0x3c>,r0 ! 2c
80c18: 00 03 bsrf r0
80c1a: 00 09 nop
- 80c1c: d0 08 mov\.l 80c40 <_foo\+0x40>,r0 ! 0xfffffbde
+ 80c1c: d0 08 mov\.l 80c40 <_foo\+0x40>,r0 ! fffffbde
80c1e: 00 03 bsrf r0
80c20: 00 09 nop
- 80c22: d0 08 mov\.l 80c44 <_foo\+0x44>,r0 ! 0xfffffbf0
+ 80c22: d0 08 mov\.l 80c44 <_foo\+0x44>,r0 ! fffffbf0
80c24: 00 03 bsrf r0
80c26: 00 09 nop
80c28: 4f 26 lds\.l @r15\+,pr
diff --git a/ld/testsuite/ld-sh/vxworks1.dd b/ld/testsuite/ld-sh/vxworks1.dd
index 4f49005da88..4bb3b47bd63 100644
--- a/ld/testsuite/ld-sh/vxworks1.dd
+++ b/ld/testsuite/ld-sh/vxworks1.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
00080800 <_PROCEDURE_LINKAGE_TABLE_>:
- 80800: d1 01 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r1 ! 0x81408
+ 80800: d1 01 mov\.l 80808 <_PROCEDURE_LINKAGE_TABLE_\+0x8>,r1 ! 81408
80802: 61 12 mov\.l @r1,r1
80804: 41 2b jmp @r1
80806: 00 09 nop
@@ -13,14 +13,14 @@ Disassembly of section \.plt:
8080a: 14 08 .*
0008080c <_sglobal@plt>:
- 8080c: d0 01 mov\.l 80814 <_sglobal@plt\+0x8>,r0 ! 0x8140c
+ 8080c: d0 01 mov\.l 80814 <_sglobal@plt\+0x8>,r0 ! 8140c
8080e: 60 02 mov\.l @r0,r0
80810: 40 2b jmp @r0
80812: 00 09 nop
80814: 00 08 .*
80814: R_SH_DIR32 _GLOBAL_OFFSET_TABLE_\+0xc
80816: 14 0c .*
- 80818: d0 01 mov\.l 80820 <_sglobal@plt\+0x14>,r0 ! 0x0
+ 80818: d0 01 mov\.l 80820 <_sglobal@plt\+0x14>,r0 ! 0
8081a: af f1 bra 80800 <_PROCEDURE_LINKAGE_TABLE_>
8081c: 00 09 nop
8081e: 00 09 nop
@@ -28,14 +28,14 @@ Disassembly of section \.plt:
\.\.\.
00080824 <_foo@plt>:
- 80824: d0 01 mov\.l 8082c <_foo@plt\+0x8>,r0 ! 0x81410
+ 80824: d0 01 mov\.l 8082c <_foo@plt\+0x8>,r0 ! 81410
80826: 60 02 mov\.l @r0,r0
80828: 40 2b jmp @r0
8082a: 00 09 nop
8082c: 00 08 .*
8082c: R_SH_DIR32 _GLOBAL_OFFSET_TABLE_\+0x10
8082e: 14 10 .*
- 80830: d0 01 mov\.l 80838 <_foo@plt\+0x14>,r0 ! 0xc
+ 80830: d0 01 mov\.l 80838 <_foo@plt\+0x14>,r0 ! c
80832: af e5 bra 80800 <_PROCEDURE_LINKAGE_TABLE_>
80834: 00 09 nop
80836: 00 09 nop
@@ -45,13 +45,13 @@ Disassembly of section \.text:
00080c00 <__start>:
80c00: 4f 22 sts\.l pr,@-r15
- 80c02: d0 06 mov\.l 80c1c <__start\+0x1c>,r0 ! 0x80824 <_foo@plt>
+ 80c02: d0 06 mov\.l 80c1c <__start\+0x1c>,r0 ! 80824 <_foo@plt>
80c04: 40 0b jsr @r0
80c06: 00 09 nop
- 80c08: d0 05 mov\.l 80c20 <__start\+0x20>,r0 ! 0x8080c <_sglobal@plt>
+ 80c08: d0 05 mov\.l 80c20 <__start\+0x20>,r0 ! 8080c <_sglobal@plt>
80c0a: 40 0b jsr @r0
80c0c: 00 09 nop
- 80c0e: d0 05 mov\.l 80c24 <__start\+0x24>,r0 ! 0x80c28 <_sexternal>
+ 80c0e: d0 05 mov\.l 80c24 <__start\+0x24>,r0 ! 80c28 <_sexternal>
80c10: 40 0b jsr @r0
80c12: 00 09 nop
80c14: 4f 26 lds\.l @r15\+,pr
diff --git a/ld/testsuite/ld-sh/vxworks3-le.dd b/ld/testsuite/ld-sh/vxworks3-le.dd
index 3fc966c32d7..6a0fc2dc1db 100644
--- a/ld/testsuite/ld-sh/vxworks3-le.dd
+++ b/ld/testsuite/ld-sh/vxworks3-le.dd
@@ -4,31 +4,31 @@
Disassembly of section \.plt:
#...
-.*: 01 d0 mov\.l .*,r0 ! 0x0
+.*: 01 d0 mov\.l .*,r0 ! 0
.*: f1 af bra .* <_PROCEDURE_LINKAGE_TABLE_>
.*: 09 00 nop
#...
-.*: 01 d0 mov\.l .*,r0 ! 0x7ec
+.*: 01 d0 mov\.l .*,r0 ! 7ec
.*: 05 a8 bra .* <_PROCEDURE_LINKAGE_TABLE_>
.*: 09 00 nop
#...
-.*: 01 d0 mov\.l .*,r0 ! 0x7f8
+.*: 01 d0 mov\.l .*,r0 ! 7f8
.*: f2 af bra .*
.*: 09 00 nop
#...
-.*: 01 d0 mov\.l .*,r0 ! 0xfe4
+.*: 01 d0 mov\.l .*,r0 ! fe4
.*: 06 a8 bra .*
.*: 09 00 nop
#...
-.*: 01 d0 mov\.l .*,r0 ! 0xff0
+.*: 01 d0 mov\.l .*,r0 ! ff0
.*: f2 af bra .*
.*: 09 00 nop
#...
-.*: 01 d0 mov\.l .*,r0 ! 0x17dc
+.*: 01 d0 mov\.l .*,r0 ! 17dc
.*: 06 a8 bra .*
.*: 09 00 nop
#...
-.*: 01 d0 mov\.l .*,r0 ! 0x17e8
+.*: 01 d0 mov\.l .*,r0 ! 17e8
.*: f2 af bra .*
.*: 09 00 nop
#pass
diff --git a/ld/testsuite/ld-sh/vxworks3.dd b/ld/testsuite/ld-sh/vxworks3.dd
index fea019a2bb6..f0593b683d1 100644
--- a/ld/testsuite/ld-sh/vxworks3.dd
+++ b/ld/testsuite/ld-sh/vxworks3.dd
@@ -4,31 +4,31 @@
Disassembly of section \.plt:
#...
-.*: d0 01 mov\.l .*,r0 ! 0x0
+.*: d0 01 mov\.l .*,r0 ! 0
.*: af f1 bra .* <_PROCEDURE_LINKAGE_TABLE_>
.*: 00 09 nop
#...
-.*: d0 01 mov\.l .*,r0 ! 0x7ec
+.*: d0 01 mov\.l .*,r0 ! 7ec
.*: a8 05 bra .* <_PROCEDURE_LINKAGE_TABLE_>
.*: 00 09 nop
#...
-.*: d0 01 mov\.l .*,r0 ! 0x7f8
+.*: d0 01 mov\.l .*,r0 ! 7f8
.*: af f2 bra .*
.*: 00 09 nop
#...
-.*: d0 01 mov\.l .*,r0 ! 0xfe4
+.*: d0 01 mov\.l .*,r0 ! fe4
.*: a8 06 bra .*
.*: 00 09 nop
#...
-.*: d0 01 mov\.l .*,r0 ! 0xff0
+.*: d0 01 mov\.l .*,r0 ! ff0
.*: af f2 bra .*
.*: 00 09 nop
#...
-.*: d0 01 mov\.l .*,r0 ! 0x17dc
+.*: d0 01 mov\.l .*,r0 ! 17dc
.*: a8 06 bra .*
.*: 00 09 nop
#...
-.*: d0 01 mov\.l .*,r0 ! 0x17e8
+.*: d0 01 mov\.l .*,r0 ! 17e8
.*: af f2 bra .*
.*: 00 09 nop
#pass