From c210d850a759f30fc747edbcb16dff83228c4948 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 17 May 2007 13:11:42 +0000 Subject: [PATCH] * 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. --- ld/testsuite/ChangeLog | 8 ++++++++ ld/testsuite/ld-m68k/merge-error-1a.d | 2 +- ld/testsuite/ld-m68k/merge-error-1b.d | 2 +- ld/testsuite/ld-m68k/merge-error-1c.d | 2 +- ld/testsuite/ld-m68k/merge-error-1d.d | 2 +- ld/testsuite/ld-m68k/merge-error-1e.d | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 37379b0af55..250d725e4d1 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-05-17 Nathan Sidwell + + * 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 PR ld/4504 diff --git a/ld/testsuite/ld-m68k/merge-error-1a.d b/ld/testsuite/ld-m68k/merge-error-1a.d index ab3ef6e8306..3629f39e55c 100644 --- 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 291d42ff042..bedd3d6480d 100644 --- 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 e74528097c3..9538e7722c6 100644 --- 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 310bf4326bd..4d86771a475 100644 --- 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 87a2bf93f3c..969f84440fb 100644 --- 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]*$ -- 2.30.2