From 5db8bbe5fdcd6f746f51a372583a0822478c3e2c Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 5 Sep 2008 11:45:01 +0000 Subject: [PATCH] * hppa-tdep.c (internalize_unwinds): Use objfile architecture instead of current_gdbarch. --- gdb/ChangeLog | 5 +++++ gdb/hppa-tdep.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de24f85f7a1..22da66883ba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-09-05 Ulrich Weigand + + * hppa-tdep.c (internalize_unwinds): Use objfile architecture + instead of current_gdbarch. + 2008-09-05 Ulrich Weigand * m68k-tdep.h (m68kbsd_fpreg_offset): Add gdbarch parameter. diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 3b4d331e44a..4b2ec571e35 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -230,6 +230,7 @@ internalize_unwinds (struct objfile *objfile, struct unwind_table_entry *table, if (size > 0) { + struct gdbarch *gdbarch = get_objfile_arch (objfile); unsigned long tmp; unsigned i; char *buf = alloca (size); @@ -241,7 +242,7 @@ internalize_unwinds (struct objfile *objfile, struct unwind_table_entry *table, Note that when loading a shared library (text_offset != 0) the unwinds are already relative to the text_offset that will be passed in. */ - if (gdbarch_tdep (current_gdbarch)->is_elf && text_offset == 0) + if (gdbarch_tdep (gdbarch)->is_elf && text_offset == 0) { low_text_segment_address = -1; @@ -251,9 +252,9 @@ internalize_unwinds (struct objfile *objfile, struct unwind_table_entry *table, text_offset = low_text_segment_address; } - else if (gdbarch_tdep (current_gdbarch)->solib_get_text_base) + else if (gdbarch_tdep (gdbarch)->solib_get_text_base) { - text_offset = gdbarch_tdep (current_gdbarch)->solib_get_text_base (objfile); + text_offset = gdbarch_tdep (gdbarch)->solib_get_text_base (objfile); } bfd_get_section_contents (objfile->obfd, section, buf, 0, size); -- 2.30.2