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/bfd/ChangeLog b/bfd/ChangeLog
index 5603c24..e9a5dba 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-12  Matthew R. Dempsky  <mrd@alkemio.org>
+
+       * cpu-m68k.c (bfd_m68k_compatible): Handle CPU32.
+
 2006-07-10  Jakub Jelinek  <jakub@redhat.com>
 
        * elf.c (_bfd_elf_print_private_bfd_data): Handle DT_GNU_HASH.

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/ChangeLog b/ld/testsuite/ChangeLog
index 235143f..575da33 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12  Richard Sandiford  <richard@codesourcery.com>
+
+       * ld-m68k/merge-ok-1c.d: New test.
+       * ld-m68k/m68k.exp: Run it.
+
 2006-07-11  Hans-Peter Nilsson  <hp@axis.com>
 
        * ld-cris/libdso-2.d: Adjust for recent hash-related changes.

diff --git a/ld/testsuite/ld-m68k/m68k.exp b/ld/testsuite/ld-m68k/m68k.exp
index 042f1b9..ca096f5 100644 (file)
--- a/ld/testsuite/ld-m68k/m68k.exp
+++ b/ld/testsuite/ld-m68k/m68k.exp
@@ -53,6 +53,7 @@ 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"
 
 foreach { id sources } { a { plt1.s } b { plt1-empty.s plt1.s } } {
     foreach arch { 68020 cpu32 isab } {

diff --git a/ld/testsuite/ld-m68k/merge-ok-1c.d b/ld/testsuite/ld-m68k/merge-ok-1c.d
new file mode 100644 (file)
index 0000000..81cf5a6
--- /dev/null
+++ b/ld/testsuite/ld-m68k/merge-ok-1c.d
@@ -0,0 +1,6 @@
+#source: merge-error-1a.s -march=cpu32
+#source: merge-error-1b.s -march=cpu32
+#ld: -r
+#objdump: -p
+#...
+private flags = 810000: \[cpu32\]