* breakpoint.c (bpstat_should_step): Only consider software

	watchpoints that have a location.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82508e0ac2b392072486292702a020ef06673553..a57510148bba56217f078333d4d1aca5b463e07d 100644 (file)
--- 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 472eda4aea56e05f9e71f585ebc0003dabd58670..5a909c8105882dd7906faf4310ced2385bb0b57a 100644 (file)
--- 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;
 }