* rs6000-tdep.c (rs6000_gdbarch_init): Don't use the previous

architecture to infer the wordsize.  Previous architecture may not
be a PowerPC.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2c74a85..7061859 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-29  Andrew Cagney  <ac131313@redhat.com>
+
+       * rs6000-tdep.c (rs6000_gdbarch_init): Don't use the previous
+       architecture to infer the wordsize.  Previous architecture may not
+       be a PowerPC.
+
 2001-09-27  J. Brobecker <brobecker@gnat.com>
 
        * infttrace.c (kill_inferior): Issue a TT_PROC_EXIT request rather

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 6f5ade6..82c18c1 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -2163,8 +2163,8 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   osabi = get_elfosabi (info.abfd);
 
-  /* Check word size.  If INFO is from a binary file, infer it from that,
-     else use the previously-inferred size. */
+  /* Check word size.  If INFO is from a binary file, infer it from
+     that, else choose a likely default. */
   if (from_xcoff_exec)
     {
       if (xcoff_data (info.abfd)->xcoff64)
@@ -2181,11 +2181,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
     }
   else
     {
-      tdep = TDEP;
-      if (tdep)
-       wordsize = tdep->wordsize;
-      else
-       wordsize = 4;
+      wordsize = 4;
     }
 
   /* Find a candidate among extant architectures. */