From: Pedro Alves <palves@redhat.com>
Date: Wed, 18 Mar 2009 01:13:19 +0000 (+0000)
Subject: 	* breakpoint.c (bpstat_should_step): Only consider software
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=717a8278b140f1127459a38138085f36496eba63;p=binutils-gdb.git

	* breakpoint.c (bpstat_should_step): Only consider software
	watchpoints that have a location.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82508e0ac2b..a57510148bb 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 472eda4aea5..5a909c81058 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;
 }