* ld-m68k/merge-error-1a.d: Mismatch is an error.

	* ld-m68k/merge-error-1b.d: Likewise.
	* ld-m68k/merge-error-1c.d: Likewise.
	* ld-m68k/merge-error-1d.d: Likewise.
	* ld-m68k/merge-error-1e.d: Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 37379b0..250d725 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * ld-m68k/merge-error-1a.d: Mismatch is an error.
+       * ld-m68k/merge-error-1b.d: Likewise.
+       * ld-m68k/merge-error-1c.d: Likewise.
+       * ld-m68k/merge-error-1d.d: Likewise.
+       * ld-m68k/merge-error-1e.d: Likewise.
+
 2007-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/4504

diff --git a/ld/testsuite/ld-m68k/merge-error-1a.d b/ld/testsuite/ld-m68k/merge-error-1a.d
index ab3ef6e..3629f39 100644 (file)
--- a/ld/testsuite/ld-m68k/merge-error-1a.d
+++ b/ld/testsuite/ld-m68k/merge-error-1a.d
@@ -1,4 +1,4 @@
 #source: merge-error-1a.s -mcpu=cpu32
 #source: merge-error-1b.s -mcpu=68000
 #ld: -r
-#warning: .*
+#error: ^[^\n]* m68k:68000 [^\n]* incompatible with m68k:cpu32 [^\n]*$

diff --git a/ld/testsuite/ld-m68k/merge-error-1b.d b/ld/testsuite/ld-m68k/merge-error-1b.d
index 291d42f..bedd3d6 100644 (file)
--- a/ld/testsuite/ld-m68k/merge-error-1b.d
+++ b/ld/testsuite/ld-m68k/merge-error-1b.d
@@ -1,4 +1,4 @@
 #source: merge-error-1a.s -mcpu=cpu32
 #source: merge-error-1b.s -mcpu=5207
 #ld: -r
-#warning: .*
+#error: ^[^\n]* m68k:isa-aplus:emac [^\n]* incompatible with m68k:cpu32 [^\n]*$

diff --git a/ld/testsuite/ld-m68k/merge-error-1c.d b/ld/testsuite/ld-m68k/merge-error-1c.d
index e745280..9538e77 100644 (file)
--- a/ld/testsuite/ld-m68k/merge-error-1c.d
+++ b/ld/testsuite/ld-m68k/merge-error-1c.d
@@ -1,4 +1,4 @@
 #source: merge-error-1a.s -march=isaaplus
 #source: merge-error-1b.s -march=isab
 #ld: -r
-#warning: .*
+#error: ^[^\n]* m68k:isa-b [^\n]* incompatible with m68k:isa-aplus [^\n]*$

diff --git a/ld/testsuite/ld-m68k/merge-error-1d.d b/ld/testsuite/ld-m68k/merge-error-1d.d
index 310bf43..4d86771 100644 (file)
--- a/ld/testsuite/ld-m68k/merge-error-1d.d
+++ b/ld/testsuite/ld-m68k/merge-error-1d.d
@@ -1,4 +1,4 @@
 #source: merge-error-1a.s -march=isaa -mmac
 #source: merge-error-1b.s -march=isaa -memac
 #ld: -r
-#warning: .*
+#error: ^[^\n]* m68k:isa-a:emac [^\n]* incompatible with m68k:isa-a:mac [^\n]*$

diff --git a/ld/testsuite/ld-m68k/merge-error-1e.d b/ld/testsuite/ld-m68k/merge-error-1e.d
index 87a2bf9..969f844 100644 (file)
--- a/ld/testsuite/ld-m68k/merge-error-1e.d
+++ b/ld/testsuite/ld-m68k/merge-error-1e.d
@@ -1,4 +1,4 @@
 #source: merge-error-1a.s -march=isaa -mno-div -mmac
 #source: merge-error-1b.s -march=isaa -mno-div -memac
 #ld: -r
-#warning: .*
+#error: ^[^\n]* m68k:isa-a:emac [^\n]* is incompatible with m68k:isa-a:mac [^\n]*$