X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Frs6000-tdep.c;h=82c18c1dac2e9210aba04013c97ce9ce07724731;hb=1d9d99f32d861ae85dd59689ada801cc51d3ac91;hp=d1a81e67d2aff4428404b6524231e4028a0c1f27;hpb=ea7c478fe2e8aac579da890b1861677fa6bea5eb;p=binutils-gdb.git

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index d1a81e67d2a..82c18c1dac2 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -31,6 +31,7 @@
 #include "objfiles.h"
 #include "arch-utils.h"
 #include "regcache.h"
+#include "doublest.h"
 
 #include "bfd/libbfd.h"		/* for bfd_default_set_arch_mach */
 #include "coff/internal.h"	/* for libcoff.h */
@@ -2162,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)
@@ -2180,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. */