summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2007-06-30 15:35:19 +0000
committerAndreas Schwab <schwab@linux-m68k.org>2007-06-30 15:35:19 +0000
commit4ed7793328456e0503374bee02853a844ac07e9f (patch)
treef106e140cb974553354020521ea57492b646c142
parent34c8bcbae2e6ea0752c1ebe6e1282cc74a821957 (diff)
downloadbinutils-gdb-4ed7793328456e0503374bee02853a844ac07e9f.tar.gz
* m68k-tdep.c (m68k_gdbarch_init): Don't infer coldfire flavour
from the generic m68k arch.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/m68k-tdep.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 12c7f786490..fde27981a06 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 2be4b44476e..32aa8eb0776 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;
}