summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/testsuite/ChangeLog4
-rw-r--r--ld/testsuite/ld-cris/badgotr1.d2
2 files changed, 5 insertions, 1 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 8c94dc8ee5..c67a655d33 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-23 Hans-Peter Nilsson <hp@axis.com>
+
+ * ld-cris/badgotr1.d: Robustify regexp.
+
2008-10-29 Nick Clifton <nickc@redhat.com>
* ld-gc/gc.c (dummy_func): New function - present so that
diff --git a/ld/testsuite/ld-cris/badgotr1.d b/ld/testsuite/ld-cris/badgotr1.d
index 7ef7036610..3e027706a1 100644
--- a/ld/testsuite/ld-cris/badgotr1.d
+++ b/ld/testsuite/ld-cris/badgotr1.d
@@ -2,7 +2,7 @@
#as: --pic --underscore --em=criself
#ld: -m crislinux -shared
#objdump: -dr
-#error: ^[^c][^h][^i][^l][^d].* uses _-prefixed .* failed to merge .* no GOT .* Bad value$
+#error: \A[^\nc][^\n]*o: uses _-prefixed [^\nc]*\n[^\nc][^\n]* failed to merge [^\nc]*\n[^\nc][^\n]* no GOT [^\n]*\n[^\nc][^\n]* Bad value\Z
# The error regex above is supposed to not match if we get a
# SEGV, in which case we'll see "child killed: segmentation