diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2007-05-17 13:11:42 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2007-05-17 13:11:42 +0000 |
| commit | c210d850a759f30fc747edbcb16dff83228c4948 (patch) | |
| tree | e4ab92f8447dec11a478fa5b704a729489ea9f03 /ld | |
| parent | 2b87874220e77b62bb868a2fe16bce24589e72bf (diff) | |
| download | ppe42-binutils-c210d850a759f30fc747edbcb16dff83228c4948.tar.gz ppe42-binutils-c210d850a759f30fc747edbcb16dff83228c4948.zip | |
* 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.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-m68k/merge-error-1a.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-m68k/merge-error-1b.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-m68k/merge-error-1c.d | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-m68k/merge-error-1d.d | 2 | ||||
| -rw-r--r-- | 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 37379b0af5..250d725e4d 100644 --- 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 ab3ef6e830..3629f39e55 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 291d42ff04..bedd3d6480 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 e74528097c..9538e7722c 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 310bf4326b..4d86771a47 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 87a2bf93f3..969f84440f 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]*$ |
