From 2f1b59840e9d5daa1add3c43681940a8f748ff96 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 17 May 2002 23:06:10 +0000 Subject: [PATCH] * corelow.c (core_open): Only call set_gdbarch_from_file if exec_bfd is NULL. --- gdb/ChangeLog | 5 +++++ gdb/corelow.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 16f19e507bf..c94caff5e84 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-05-18 Mark Kettenis + + * corelow.c (core_open): Only call set_gdbarch_from_file if + exec_bfd is NULL. + 2002-05-17 Andrey Volkov * h8300-tdep.c: Add support of EXR register diff --git a/gdb/corelow.c b/gdb/corelow.c index 657cdc8ffc9..785b8e14323 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -321,7 +321,12 @@ core_open (char *filename, int from_tty) error ("\"%s\": Can't find sections: %s", bfd_get_filename (core_bfd), bfd_errmsg (bfd_get_error ())); - set_gdbarch_from_file (core_bfd); + /* If we have no exec file, try to set the architecture from the + core file. We don't do this unconditionally since an exec file + typically contains more information that helps us determine the + architecture than a core file. */ + if (!exec_bfd) + set_gdbarch_from_file (core_bfd); ontop = !push_target (&core_ops); discard_cleanups (old_chain); -- 2.30.2