* 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 37379b0af554b5c466e0075fdebc7b581f20f734..250d725e4d140896737196b9917038ea58d9d412 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 ab3ef6e8306ffd3d383b8e871db6b061442dcf8b..3629f39e55c7846fb3041c5e262418a471b03d26 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 291d42ff042e093ca2c20dba3f97e59439b74205..bedd3d6480d9fef55f94ab66a5f74141dc741ad7 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 e74528097c3b9c605f6f7d7eec30ed595af60e29..9538e7722c6534892268ec5197f5e35e65e81367 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 310bf4326bd0da706fe1ee75bed78e055377dec4..4d86771a47544f6e433d5c9626c554cd5ead8e63 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 87a2bf93f3cc17f55afdc87e052c014a7963299e..969f84440fbfdb7a9aa10bbee12b69baabe64e6f 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]*$