diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ca1bd6659e948e5537275b72d32ff4f146000f59..c994830eb92cadd9477b18fb8268d8acdf5956bd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-22  Andrew Cagney  <cagney@redhat.com>
+
+	* config/pa/tm-hppa.h (CALL_DUMMY_LOCATION): Delete macro.
+	(DEPRECATED_PC_IN_CALL_DUMMY): Delete macro.
+	(DEPRECATED_USE_GENERIC_DUMMY_FRAMES): Delete macro.
+	* hppa-tdep.c (hppa_gdbarch_init): Clear deprecated
+	use_generic_dummy_frames, set deprecated pc_in_call_dummy, set
+	call_dummy_location to ON_STACK.
+
 2004-02-22  Mark Kettenis  <kettenis@gnu.org>
 
 	* x86-64-linux-tdep.c: Tweak comment.
diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index c097ccc192dce3a88016765e061b96ccf20a4f52..9924ffa9678e1b5801be9c78edab7cd69eb740b3 100644
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -31,10 +31,6 @@
 
 #define GDB_MULTI_ARCH 1
 
-/* NOTE: cagney/2002-11-24: This is a guess.  */
-#define DEPRECATED_USE_GENERIC_DUMMY_FRAMES 0
-#define CALL_DUMMY_LOCATION ON_STACK
-#define DEPRECATED_PC_IN_CALL_DUMMY(pc, sp, frame_address) deprecated_pc_in_call_dummy_on_stack (pc, sp, frame_address)
 /* Hack, get around problem with including "arch-utils.h".  */
 struct frame_info;
 
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index fbc0c5376bc5f33536b71e92952f63dea23a5806..b561bbef56c3575fc2e18fa37f66dbd7814cc4c0 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -5606,6 +5606,9 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame);
       /* set_gdbarch_deprecated_fix_call_dummy (gdbarch, hppa_fix_call_dummy); */
       set_gdbarch_deprecated_push_arguments (gdbarch, hppa_push_arguments);
+      set_gdbarch_deprecated_use_generic_dummy_frames (gdbarch, 0);
+      set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack);
+      set_gdbarch_call_dummy_location (gdbarch, ON_STACK);
     }
       
   /* Struct return methods.  */