aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/testsuite/ChangeLog4
-rw-r--r--ld/testsuite/ld-elf/merge3.d3
-rw-r--r--ld/testsuite/ld-elf/merge3.s7
3 files changed, 4 insertions, 10 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 0ebc47e..cf588d5 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-05 Alan Modra <amodra@bigpond.net.au>
+
+ * ld-elf/merge3.d, ld-elf/merge3.s: Delete.
+
2007-11-05 Danny Smith <dannysmith@users.sourceforge.net>
* ld-scripts/align.exp: Enable for PECOFF.
diff --git a/ld/testsuite/ld-elf/merge3.d b/ld/testsuite/ld-elf/merge3.d
deleted file mode 100644
index 20d30ca..0000000
--- a/ld/testsuite/ld-elf/merge3.d
+++ /dev/null
@@ -1,3 +0,0 @@
-#source: merge3.s
-#ld: -T merge.ld
-#error: unterminated string in section `.rodata.str' marked for merging
diff --git a/ld/testsuite/ld-elf/merge3.s b/ld/testsuite/ld-elf/merge3.s
deleted file mode 100644
index 25709be..0000000
--- a/ld/testsuite/ld-elf/merge3.s
+++ /dev/null
@@ -1,7 +0,0 @@
- .section .rodata.str,"aMS","progbits",1
-.LC0:
- .ascii "abcd"
- .text
- .global _start
-_start:
- .long .LC0