bfd/

	* elf32-m68k.c (elf32_m68k_object_p): Treat the default case
	as ColdFire.
	(elf32_m68k_merge_private_bfd_data): Use EF_M68K_ARCH_MASK to
	extract architecture mask.  Treat the default case as ColdFire.

	binutils/
	* readelf.c (get_machine_flags): Treat the default case as
	ColdFire.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 2bcf2f94fec13369bb496c177aa585996391fa1a..d70041ef41f058e089de0650e13694f2234b89ed 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,15 @@
+2006-11-29  Kazu Hirata  <kazu@codesourcery.com>
+
+       bfd/
+       * elf32-m68k.c (elf32_m68k_object_p): Treat the default case
+       as ColdFire.
+       (elf32_m68k_merge_private_bfd_data): Use EF_M68K_ARCH_MASK to
+       extract architecture mask.  Treat the default case as ColdFire.
+
+       binutils/
+       * readelf.c (get_machine_flags): Treat the default case as
+       ColdFire.
+
 2006-11-28  Kazu Hirata  <kazu@codesourcery.com>
 
        bfd/

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index f1a47c44a3956633084d2d2c7f0221ae44e0a2e1..4b23d5302a75a50c0f548c765ed7cdf0e56510be 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -445,9 +445,7 @@ elf32_m68k_object_p (bfd *abfd)
     features |= m68000;
   else if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
     features |= cpu32;
-  else if (((eflags & EF_M68K_ARCH_MASK) == 0
-           && (eflags & EF_M68K_CF_ISA_MASK) != 0)
-          || (eflags & EF_M68K_ARCH_MASK) == EF_M68K_CFV4E)
+  else
     {
       switch (eflags & EF_M68K_CF_ISA_MASK)
        {
@@ -532,8 +530,17 @@ elf32_m68k_merge_private_bfd_data (ibfd, obfd)
   else
     {
       out_flags = elf_elfheader (obfd)->e_flags;
-      in_isa = (in_flags & EF_M68K_CF_ISA_MASK);
-      out_isa = (out_flags & EF_M68K_CF_ISA_MASK);
+      unsigned int variant_mask;
+
+      if ((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_M68000)
+       variant_mask = 0;
+      else if ((in_flags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
+       variant_mask = 0;
+      else
+       variant_mask = EF_M68K_CF_ISA_MASK;
+
+      in_isa = (in_flags & variant_mask);
+      out_isa = (out_flags & variant_mask);
       if (in_isa > out_isa)
        out_flags ^= in_isa ^ out_isa;
       out_flags |= in_flags ^ in_isa;
@@ -566,9 +573,7 @@ elf32_m68k_print_private_bfd_data (abfd, ptr)
     fprintf (file, " [m68000]");
   else if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
     fprintf (file, " [cpu32]");
-  else if (((eflags & EF_M68K_ARCH_MASK) == 0
-           && (eflags & EF_M68K_CF_ISA_MASK) != 0)
-          || (eflags & EF_M68K_ARCH_MASK) == EF_M68K_CFV4E)
+  else
     {
       if ((eflags & EF_M68K_ARCH_MASK) == EF_M68K_CFV4E)
        fprintf (file, " [cfv4e]");

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 2d0e5df13e18850fe449a805468b028e62b7ef94..aa79d5fb057e7b697c6d541bce518cfb12d1de34 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1950,9 +1950,7 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
            strcat (buf, ", m68000");
          else if ((e_flags & EF_M68K_ARCH_MASK) == EF_M68K_CPU32)
            strcat (buf, ", cpu32");
-         else if (((e_flags & EF_M68K_ARCH_MASK) == 0
-                   && (e_flags & EF_M68K_CF_ISA_MASK) != 0)
-                  || (e_flags & EF_M68K_ARCH_MASK) == EF_M68K_CFV4E)
+         else
            {
              char const *isa = _("unknown");
              char const *mac = _("unknown mac");