* 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.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6231d99b1ac793239e2ecede18617843ec566fd8..593c909b6199bcfe67bcaa14257bbc9febdcbebc 100644 (file)
--- 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 65cef4d559f5ec55e419dfb30c0b855bbe59db59..4ad1fe8cc082d6fe1b2d82cd6acbcd3901b3cf86 100644 (file)
--- 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 3c73c6b3653363a91b3b330c2000fab1f044b7cc..98fd55d22a002c157414f09436c0f77b8b70ea00 100644 (file)
--- 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 5b8fda69383ead5d5502fdc8448fb5f5dcf32b64..e9fca056d10fa5e65362e6f0495f6c5ff3bed84e 100644 (file)
--- 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