aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c23
2 files changed, 11 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e257fe..4850791 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2007-11-30 Vladimir Prus <vladimir@codesourcery.com>
+ * infrun.c (handle_inferior_event): Don't
+ ignore beakpoints if trap_expected is set.
+
+2007-11-30 Vladimir Prus <vladimir@codesourcery.com>
+
Make insert_breakpoints return void.
* breakpoint.h (insert_breakpoints): Change
return type to void.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 62d6d1e..1e3839a 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1964,23 +1964,12 @@ handle_inferior_event (struct execution_control_state *ecs)
return;
}
- /* Don't even think about breakpoints if just proceeded over a
- breakpoint. */
- if (stop_signal == TARGET_SIGNAL_TRAP && trap_expected)
- {
- if (debug_infrun)
- fprintf_unfiltered (gdb_stdlog, "infrun: trap expected\n");
- bpstat_clear (&stop_bpstat);
- }
- else
- {
- /* See if there is a breakpoint at the current PC. */
- stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid);
-
- /* Following in case break condition called a
- function. */
- stop_print_frame = 1;
- }
+ /* See if there is a breakpoint at the current PC. */
+ stop_bpstat = bpstat_stop_status (stop_pc, ecs->ptid);
+
+ /* Following in case break condition called a
+ function. */
+ stop_print_frame = 1;
/* NOTE: cagney/2003-03-29: These two checks for a random signal
at one stage in the past included checks for an inferior