* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de6db2d..a9f9dd5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-19  J. Brobecker  <brobecker@gnat.com>
+
+       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  <kevinb@redhat.com>
 
        * 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 7ec3c8b..a14be09 100644 (file)
--- 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 1cce60d..f6ebdf6 100644 (file)
--- 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);