diff options
| author | Richard Sandiford <rsandifo@nildram.co.uk> | 2006-07-12 13:05:41 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@nildram.co.uk> | 2006-07-12 13:05:41 +0000 |
| commit | 1d0bf211311ebd91fa509a1b53675d40f752df32 (patch) | |
| tree | 50a09c3d8b4d56c75d0b770e5b2f7eaa4dfbbd4c | |
| parent | 580b7fee13410274f7aac4d01da202804bc28954 (diff) | |
| download | gdb-1d0bf211311ebd91fa509a1b53675d40f752df32.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.
| -rw-r--r-- | ChangeLog.csl | 15 | ||||
| -rw-r--r-- | bfd/cpu-m68k.c | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 4a36a76287b..ef84c8c85a6 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,18 @@ +2006-07-12 Richard Sandiford <richard@codesourcery.com> + + Backport from mainline: + + 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. + 2006-06-22 Richard Sandiford <richard@codesourcery.com> binutils/ diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c index 366278960a6..5be4aa047cc 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) { |