aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2012-10-24 23:22:47 +0000
committerAlan Modra <amodra@bigpond.net.au>2012-10-24 23:22:47 +0000
commit41b0a19ae74ab718bf99556acc4a54c6dc826ad8 (patch)
treea854a55b5aa3c1667a831d7f558628dd4813e605
parent913acdd9686b672b403c0d69374353e01d1b7568 (diff)
downloadbinutils-41b0a19ae74ab718bf99556acc4a54c6dc826ad8.tar.gz
* ld-scripts/empty-aligned.d: Revert last change. Allow more
than one header, just not two PT_LOAD. * ld-elf/stack.s: Use .long 0 rather than nops.
-rw-r--r--ld/testsuite/ChangeLog6
-rw-r--r--ld/testsuite/ld-elf/stack.s6
-rw-r--r--ld/testsuite/ld-scripts/empty-aligned.d6
3 files changed, 10 insertions, 8 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d0a777c9a..0f99f9759 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-25 Nathan Sidwell <nathan@codesourcery.com>
+
+ * ld-scripts/empty-aligned.d: Revert last change. Allow more
+ than one header, just not two PT_LOAD.
+ * ld-elf/stack.s: Use .long 0 rather than nops.
+
2012-10-23 Nathan Sidwell <nathan@codesourcery.com>
* ld-elf/binutils.exp: Add -z stack-size=0.
diff --git a/ld/testsuite/ld-elf/stack.s b/ld/testsuite/ld-elf/stack.s
index b92617bd5..259e62c6d 100644
--- a/ld/testsuite/ld-elf/stack.s
+++ b/ld/testsuite/ld-elf/stack.s
@@ -3,8 +3,4 @@
.globl _start
start:
_start:
- nop
- nop
- nop
- nop
-
+ .long 0
diff --git a/ld/testsuite/ld-scripts/empty-aligned.d b/ld/testsuite/ld-scripts/empty-aligned.d
index 4a0c87cd1..d9916ddca 100644
--- a/ld/testsuite/ld-scripts/empty-aligned.d
+++ b/ld/testsuite/ld-scripts/empty-aligned.d
@@ -1,5 +1,5 @@
#source: empty-aligned.s
-#ld: -T empty-aligned.t -z stack-size=0
+#ld: -T empty-aligned.t
#readelf: -l --wide
#xfail: "hppa64-*-*"
#notarget: frv-*-*linux*
@@ -8,7 +8,7 @@
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align
+LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ [RWE ]+ +0x[0-9a-f]+
-
- Section to Segment mapping:
+! +LOAD .*
+#...
+Segment Sections\.\.\.
+00 +.text