2004-03-18 Andrew Cagney <cagney@redhat.com>

	* stack.c (return_command): Delete code wrapped in #ifdef
	DEPRECATED_CALL_DUMMY_HAS_COMPLETED, macro no longer defined.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 43ad2f89acc8afed1f6994d92502ca36a96fb169..defcfaac698d38b534b7c450c2b2634cca9b5e81 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-18  Andrew Cagney  <cagney@redhat.com>
 
+       * stack.c (return_command): Delete code wrapped in #ifdef
+       DEPRECATED_CALL_DUMMY_HAS_COMPLETED, macro no longer defined.
+
        * rs6000-tdep.c (skip_prologue): Record only the first LR save.
 
 2004-03-18  Andrew Cagney  <cagney@redhat.com>

diff --git a/gdb/stack.c b/gdb/stack.c
index 18d9a7c303e5492312865e2c04945ae20973770d..93e36b5210f2a9d017aeb9ccd3a5223c60449d12 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1947,20 +1947,8 @@ If you continue, the return value that you specified will be ignored.\n";
 
   /* If we are at the end of a call dummy now, pop the dummy frame
      too.  */
-  /* NOTE: cagney/2003-01-18: Is this silly?  Instead of popping all
-     the frames in sequence, should this code just pop the dummy frame
-     directly?  */
-#ifdef DEPRECATED_CALL_DUMMY_HAS_COMPLETED
-  /* Since all up-to-date architectures return direct to the dummy
-     breakpoint address, a dummy frame has, by definition, always
-     completed.  Hence this method is no longer needed.  */
-  if (DEPRECATED_CALL_DUMMY_HAS_COMPLETED (read_pc(), read_sp (),
-                                          get_frame_base (get_current_frame ())))
-    frame_pop (get_current_frame ());
-#else
   if (get_frame_type (get_current_frame ()) == DUMMY_FRAME)
     frame_pop (get_current_frame ());
-#endif
 
   /* If interactive, print the frame that is now current.  */
   if (from_tty)