bfd/
authorRichard Sandiford <rdsandiford@googlemail.com>
Sat, 25 Mar 2006 10:24:27 +0000 (10:24 +0000)
committerRichard Sandiford <rdsandiford@googlemail.com>
Sat, 25 Mar 2006 10:24:27 +0000 (10:24 +0000)
commita9d34880555ed60254118c80850a4e4a6f62104f
tree8fa27b6361338acecf73f7ac755f853eabbca73f
parent9332ab0250fa03f913b7253659266b2afb6d2501
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.
16 files changed:
bfd/ChangeLog
bfd/cpu-m68k.c
bfd/elf32-m68k.c
gas/ChangeLog
gas/config/tc-m68k.c
ld/testsuite/ChangeLog
ld/testsuite/ld-m68k/m68k.exp
ld/testsuite/ld-m68k/merge-error-1a.d [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-error-1a.s [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-error-1b.d [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-error-1b.s [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-error-1c.d [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-error-1d.d [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-error-1e.d [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-ok-1a.d [new file with mode: 0644]
ld/testsuite/ld-m68k/merge-ok-1b.d [new file with mode: 0644]