From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 30 Jun 2007 15:35:19 +0000 (+0000)
Subject: 	* m68k-tdep.c (m68k_gdbarch_init): Don't infer coldfire flavour
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4ed7793328456e0503374bee02853a844ac07e9f;p=deliverable%2Fbinutils-gdb.git

	* m68k-tdep.c (m68k_gdbarch_init): Don't infer coldfire flavour
	from the generic m68k arch.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 12c7f78649..fde27981a0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-30  Andreas Schwab  <schwab@suse.de>
+
+	* m68k-tdep.c (m68k_gdbarch_init): Don't infer coldfire flavour
+	from the generic m68k arch.
+
 2007-06-28  Michael Snyder  <msnyder@access-company.com>
 
 	* m2-typeprint.c (m2_print_type): Move pointer ref after null test
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index 2be4b44476..32aa8eb077 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -1110,14 +1110,14 @@ m68k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
      and the type of long double depend on whether we're
      on ColdFire or standard m68k. */
 
-  if (info.bfd_arch_info)
+  if (info.bfd_arch_info && info.bfd_arch_info->mach != 0)
     {
       const bfd_arch_info_type *coldfire_arch = 
 	bfd_lookup_arch (bfd_arch_m68k, bfd_mach_mcf_isa_a_nodiv);
 
       if (coldfire_arch
-	  && (*info.bfd_arch_info->compatible) 
-	  (info.bfd_arch_info, coldfire_arch))
+	  && ((*info.bfd_arch_info->compatible) 
+	      (info.bfd_arch_info, coldfire_arch)))
 	flavour = m68k_coldfire_flavour;
     }