* 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.
This commit is contained in:
Nathan Sidwell 2007-05-17 13:11:42 +00:00
parent 2b87874220
commit c210d850a7
6 changed files with 13 additions and 5 deletions

View File

@ -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

View File

@ -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]*$

View File

@ -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]*$

View File

@ -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]*$

View File

@ -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]*$

View File

@ -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]*$