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.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 4a36a76..ef84c8c 100644 (file)
--- 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 3662789..5be4aa0 100644 (file)
--- 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)
     {

diff --git a/ld/testsuite/ld-m68k/m68k.exp b/ld/testsuite/ld-m68k/m68k.exp
index a1096a8..346aa06 100644 (file)
--- a/ld/testsuite/ld-m68k/m68k.exp
+++ b/ld/testsuite/ld-m68k/m68k.exp
@@ -53,3 +53,4 @@ run_dump_test "merge-error-1d"
 run_dump_test "merge-error-1e"
 run_dump_test "merge-ok-1a"
 run_dump_test "merge-ok-1b"
+run_dump_test "merge-ok-1c"