From af566d9f8ce9121ba79c13c0b38eb5b2b98e0341 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 1 May 2002 03:14:05 +0000 Subject: [PATCH] * cris-tdep.c (cris_gdbarch_init): Use arches instead of current_gdbarch. --- gdb/ChangeLog | 5 +++++ gdb/cris-tdep.c | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1fd934a2f1..053c1a3f653 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-04-30 Andrew Cagney + + * cris-tdep.c (cris_gdbarch_init): Use arches instead of + current_gdbarch. + 2002-04-30 Michael Snyder * arm-tdep.c: Whitespace clean-ups. diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 9a526114d9a..e85ac129f33 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -4100,17 +4100,19 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) cris_abi = CRIS_ABI_V2; } } - else if (gdbarch_tdep (current_gdbarch)) + else if (arches != NULL) { - /* No bfd available. Stick with whatever ABI we're currently using. - (This is to avoid changing the ABI when the user updates the - architecture with the 'set cris-version' command.) */ - cris_abi = gdbarch_tdep (current_gdbarch)->cris_abi; + /* No bfd available. Stick with the ABI from the most recently + selected architecture of this same family (the head of arches + always points to this). (This is to avoid changing the ABI + when the user updates the architecture with the 'set + cris-version' command.) */ + cris_abi = gdbarch_tdep (arches->gdbarch)->cris_abi; } else { - /* No bfd, and no current architecture available. Assume it's the - new ABI. */ + /* No bfd, and no previously selected architecture available. + Assume it's the new ABI. */ cris_abi = CRIS_ABI_V2; } -- 2.30.2