diff options
| author | Richard Sandiford <rsandifo@nildram.co.uk> | 2006-07-12 12:47:00 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@nildram.co.uk> | 2006-07-12 12:47:00 +0000 |
| commit | f71123faa273112fb66380c625827a4eec77274d (patch) | |
| tree | 83dba20b34b643f7b07e6ccb8c3c45b7559a446c /bfd/cpu-m68k.c | |
| parent | 49f07ae89e4b20038cf48174187804c88d9c5028 (diff) | |
| download | binutils-redhat-f71123faa273112fb66380c625827a4eec77274d.tar.gz | |
bfd/
2006-07-12 Matthew R. Dempsky <mrd@alkemio.org>
* cpu-m68k.c (bfd_m68k_compatible): Handle CPU32.
ld/testsuite/
2006-07-12 Richard Sandiford <richard@codesourcery.com>
* ld-m68k/merge-ok-1c.d: New test.
* ld-m68k/m68k.exp: Run it.
Diffstat (limited to 'bfd/cpu-m68k.c')
| -rw-r--r-- | bfd/cpu-m68k.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c index 366278960a..5be4aa047c 100644 --- a/bfd/cpu-m68k.c +++ b/bfd/cpu-m68k.c @@ -202,6 +202,9 @@ bfd_m68k_compatible (const bfd_arch_info_type *a, if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060) /* Merge m68k machine. */ return a->mach > b->mach ? a : b; + else if (a->mach == bfd_mach_cpu32 && b->mach == bfd_mach_cpu32) + /* CPU32 is compatible with itself. */ + return a; else if (a->mach >= bfd_mach_mcf_isa_a_nodiv && b->mach >= bfd_mach_mcf_isa_a_nodiv) { |