aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/breakpoint.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82508e0..a575101 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-18 Pedro Alves <pedro@codesourcery.com>
+
+ * breakpoint.c (bpstat_should_step): Only consider software
+ watchpoints that have a location.
+
2009-03-17 Joel Brobecker <brobecker@adacore.com>
Add a target_ops parameter to the to_kill method in struct target_ops.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 472eda4..5a909c8 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3304,7 +3304,7 @@ bpstat_should_step (void)
{
struct breakpoint *b;
ALL_BREAKPOINTS (b)
- if (breakpoint_enabled (b) && b->type == bp_watchpoint)
+ if (breakpoint_enabled (b) && b->type == bp_watchpoint && b->loc != NULL)
return 1;
return 0;
}