2 Commits

Author	SHA1	Message	Date
Nathan Sidwell	c210d850a7	* 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-17 13:11:42 +00:00
Richard Sandiford	a9d3488055	bfd/ ... * cpu-m68k.c (bfd_m68k_compatible): Treat ISA A+ and ISA B code as incompatible. Likewise MAC and EMAC code. * elf32-m68k.c (elf32_m68k_merge_private_bfd_data): Use bfd_get_compatible to set the new bfd architecture. Rely on it to detect incompatibilities. gas/ * config/tc-m68k.c (m68k_cpus): Change cpu_cf5208 entries to use mcfemac instead of mcfmac. ld/testsuite/ * ld-m68k/merge-error-1a.s, ld-m68k/merge-error-1b.s, * ld-m68k/merge-error-1a.d, ld-m68k/merge-error-1b.d, * ld-m68k/merge-error-1c.d, ld-m68k/merge-error-1d.d, * ld-m68k/merge-error-1e.d, ld-m68k/merge-ok-1a.d, * ld-m68k/merge-ok-1b.d: New tests. * ld-m68k/m68k.exp: Run them.	2006-03-25 10:24:27 +00:00