From e712c1cf7924dd0944f2f3c55c172a0a55ef7618 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 29 Sep 2001 21:32:01 +0000 Subject: [PATCH] * rs6000-tdep.c (rs6000_gdbarch_init): Don't use the previous architecture to infer the wordsize. Previous architecture may not be a PowerPC. --- gdb/ChangeLog | 6 ++++++ gdb/rs6000-tdep.c | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2c74a8532b8..7061859b8c6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2001-09-29 Andrew Cagney + + * 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 * infttrace.c (kill_inferior): Issue a TT_PROC_EXIT request rather diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 6f5ade6a8c1..82c18c1dac2 100644 --- 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. */ -- 2.30.2