aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/testsuite/ChangeLog6
-rw-r--r--ld/testsuite/ld-scripts/include-1.d4
-rw-r--r--ld/testsuite/ld-scripts/include.exp4
-rw-r--r--ld/testsuite/ld-scripts/include.s8
4 files changed, 14 insertions, 8 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6231d99..593c909 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-26 Alan Modra <amodra@bigpond.net.au>
+
+ * ld-scripts/include.exp: Don't run test for aout.
+ * ld-scripts/include.s: Use .fill rather than .4byte.
+ * ld-scripts/include-1.d: Adjust.
+
2008-07-22 Alan Modra <amodra@bigpond.net.au>
* ld-alpha/tlsbin.rd: Update.
diff --git a/ld/testsuite/ld-scripts/include-1.d b/ld/testsuite/ld-scripts/include-1.d
index 65cef4d..4ad1fe8 100644
--- a/ld/testsuite/ld-scripts/include-1.d
+++ b/ld/testsuite/ld-scripts/include-1.d
@@ -9,5 +9,5 @@
Sections:
Idx +Name +Size +VMA +LMA +File off +Algn +Flags
- 0 .text 0+000000c 0+0000000 0+0000000 [0-9a-f]+ 2\*\*[0-9]+ CONTENTS, ALLOC, LOAD,.*CODE
- 1 .data 0+000000c 0+0100000 0+0100000 [0-9a-f]+ 2\*\*[0-9]+ CONTENTS, ALLOC, LOAD, DATA
+ 0 .text 0+0000020 0+0000000 0+0000000 [0-9a-f]+ 2\*\*[0-9]+ CONTENTS, ALLOC, LOAD,.*CODE
+ 1 .data 0+0000010 0+0100000 0+0100000 [0-9a-f]+ 2\*\*[0-9]+ CONTENTS, ALLOC, LOAD, DATA
diff --git a/ld/testsuite/ld-scripts/include.exp b/ld/testsuite/ld-scripts/include.exp
index 3c73c6b..98fd55d 100644
--- a/ld/testsuite/ld-scripts/include.exp
+++ b/ld/testsuite/ld-scripts/include.exp
@@ -20,6 +20,10 @@
load_lib ld-lib.exp
+if [is_aout_format] {
+ return
+}
+
set old_ldflags $LDFLAGS
if { [istarget spu*-*-*] } {
set LDFLAGS "$LDFLAGS --no-overlays"
diff --git a/ld/testsuite/ld-scripts/include.s b/ld/testsuite/ld-scripts/include.s
index 5b8fda6..e9fca05 100644
--- a/ld/testsuite/ld-scripts/include.s
+++ b/ld/testsuite/ld-scripts/include.s
@@ -1,9 +1,5 @@
.text
- .4byte 0x11223344
- .4byte 0x55667788
- .4byte 0x99aabbcc
+ .fill 32,1,0x12
.data
- .4byte 0x01020304
- .4byte 0x05060708
- .4byte 0x090a0b0c
+ .fill 16,1,0x34