diff options
| author | Richard Sandiford <rdsandiford@googlemail.com> | 2006-03-25 10:24:27 +0000 |
|---|---|---|
| committer | Richard Sandiford <rdsandiford@googlemail.com> | 2006-03-25 10:24:27 +0000 |
| commit | a9d34880555ed60254118c80850a4e4a6f62104f (patch) | |
| tree | 8fa27b6361338acecf73f7ac755f853eabbca73f /gas | |
| parent | 9332ab0250fa03f913b7253659266b2afb6d2501 (diff) | |
| download | gdb-a9d34880555ed60254118c80850a4e4a6f62104f.zip gdb-a9d34880555ed60254118c80850a4e4a6f62104f.tar.gz gdb-a9d34880555ed60254118c80850a4e4a6f62104f.tar.bz2 | |
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.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-m68k.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 4b5091f..b12c440 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2006-03-25 Richard Sandiford <richard@codesourcery.com> + + * config/tc-m68k.c (m68k_cpus): Change cpu_cf5208 entries to use + mcfemac instead of mcfmac. + 2006-03-22 Richard Sandiford <richard@codesourcery.com> Daniel Jacobowitz <dan@codesourcery.com> Phil Edwards <phil@codesourcery.com> diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c index 8b11263..f5646cd 100644 --- a/gas/config/tc-m68k.c +++ b/gas/config/tc-m68k.c @@ -432,7 +432,7 @@ static const struct m68k_cpu m68k_cpus[] = { cpu32|m68881, cpu_cpu32, "cpu32", 0}, { mcfisa_a, cpu_cf5200, "5200", 0}, { mcfisa_a|mcfhwdiv|mcfmac, cpu_cf5206e, "5206e", 0}, - { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, cpu_cf5208, "5208", 0}, + { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, cpu_cf5208, "5208", 0}, { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, cpu_cf5213, "5213", 0}, { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp,cpu_cf521x, "521x", 0}, { mcfisa_a|mcfhwdiv|mcfemac, cpu_cf5249, "5249", 0}, @@ -473,7 +473,7 @@ static const struct m68k_cpu m68k_cpus[] = { mcfisa_a, cpu_cf5200, "5202", 1}, { mcfisa_a, cpu_cf5200, "5204", 1}, { mcfisa_a, cpu_cf5200, "5206", 1}, - { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, cpu_cf5208, "5207", 1}, + { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, cpu_cf5208, "5207", 1}, { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, cpu_cf5213, "5211", 1}, { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, cpu_cf5213, "5212", 1}, { mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, cpu_cf521x, "5214", 1}, |