* breakpoint.h (enum bpstat_what_main_action): Remove

	BPSTAT_WHAT_THROUGH_SIGTRAMP.
	* infrun.c (process_event_stop_test): Do not check for it.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d24db0b..450bbee 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-23  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * breakpoint.h (enum bpstat_what_main_action): Remove
+       BPSTAT_WHAT_THROUGH_SIGTRAMP.
+       * infrun.c (process_event_stop_test): Do not check for it.
+
 2007-05-22  Chris Dearman  <chris@mips.com>
             Maciej W. Rozycki  <macro@mips.com>
 

diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 639f991..9f0b940 100644 (file)
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -486,10 +486,6 @@ enum bpstat_what_main_action
     /* Clear step resume breakpoint, and keep checking.  */
     BPSTAT_WHAT_STEP_RESUME,
 
-    /* Clear through_sigtramp breakpoint, muck with trap_expected, and keep
-       checking.  */
-    BPSTAT_WHAT_THROUGH_SIGTRAMP,
-
     /* Check the dynamic linker's data structures for new libraries, then
        keep checking.  */
     BPSTAT_WHAT_CHECK_SHLIBS,

diff --git a/gdb/infrun.c b/gdb/infrun.c
index dccd9ec..f90a556 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2178,15 +2178,6 @@ process_event_stop_test:
          }
        break;
 
-      case BPSTAT_WHAT_THROUGH_SIGTRAMP:
-        if (debug_infrun)
-         fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_THROUGH_SIGTRAMP\n");
-       /* If were waiting for a trap, hitting the step_resume_break
-          doesn't count as getting it.  */
-       if (trap_expected)
-         ecs->another_trap = 1;
-       break;
-
       case BPSTAT_WHAT_CHECK_SHLIBS:
       case BPSTAT_WHAT_CHECK_SHLIBS_RESUME_FROM_HOOK:
        {