diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c8c28604bc8..8bb0385f65d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-28  Pedro Alves  <palves@redhat.com>
+
+	* breakpoint.c (watchpoints_triggered)
+	<!target_stopped_data_address>: Hardcode return 1.
+
 2013-10-28  Pedro Alves  <palves@redhat.com>
 
 	* infrun.c (process_event_stop_test): Remove unnecessary scoping
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index c630b877e0c..e172be15724 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4714,7 +4714,7 @@ watchpoints_triggered (struct target_waitstatus *ws)
 	    w->watchpoint_triggered = watch_triggered_unknown;
 	  }
 
-      return stopped_by_watchpoint;
+      return 1;
     }
 
   /* The target could report the data address.  Mark watchpoints