From 5ef7553b46b9cacf88508ce2eb42f6f7b70a56ca Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 19 Mar 2003 20:14:01 +0000 Subject: [PATCH] * hppa-tdep.c (hppa_gdbarch_init): Set the push_dummy_frame gdbarch method, now that hppa_push_dummy_frame has a conformant prototype. * config/pa/tm-hppa.h (DEPRECATED_PUSH_DUMMY_FRAME): Wrap macro inside "#if !GDB_MULTI_ARCH ... #endif" conditional, in preparation for the switch to multiarch partial. --- gdb/ChangeLog | 10 ++++++++++ gdb/config/pa/tm-hppa.h | 4 ++-- gdb/hppa-tdep.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de6db2dc24f..a9f9dd56d3b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2003-03-19 J. Brobecker + + Continuing work to convert the hppa targets to multiarch partial. + + * hppa-tdep.c (hppa_gdbarch_init): Set the push_dummy_frame gdbarch + method, now that hppa_push_dummy_frame has a conformant prototype. + * config/pa/tm-hppa.h (DEPRECATED_PUSH_DUMMY_FRAME): Wrap macro + inside "#if !GDB_MULTI_ARCH ... #endif" conditional, in preparation + for the switch to multiarch partial. + 2003-03-19 Kevin Buettner * mdebugread.c (parse_symbol): For stEnd, we're done counting diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h index 7ec3c8bdb35..a14be0923cd 100644 --- a/gdb/config/pa/tm-hppa.h +++ b/gdb/config/pa/tm-hppa.h @@ -450,10 +450,10 @@ extern void hppa_frame_find_saved_regs (struct frame_info *, /* Things needed for making the inferior call functions. */ -/* Push an empty stack frame, to record the current PC, etc. */ - +#if !GDB_MULTI_ARCH #define DEPRECATED_PUSH_DUMMY_FRAME hppa_push_dummy_frame () extern void hppa_push_dummy_frame (void); +#endif /* Discard from the stack the innermost frame, restoring all saved registers. */ diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 1cce60de3f6..f6ebdf6a367 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -5000,7 +5000,7 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_locals_address (gdbarch, hppa_frame_locals_address); set_gdbarch_frame_num_args (gdbarch, hppa_frame_num_args); set_gdbarch_frame_args_skip (gdbarch, 0); - /* set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame); */ + set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame); set_gdbarch_deprecated_pop_frame (gdbarch, hppa_pop_frame); set_gdbarch_call_dummy_length (gdbarch, INSTRUCTION_SIZE * 28); set_gdbarch_call_dummy_start_offset (gdbarch, 0); -- 2.30.2