* Extend use of i386_use_watchpoints to all i386 native files

	using hardware watchpoints.
	go32-nat.c (init_go32_ops): Call i386_use_watchpoints.
	i386fbsd-nat.c (_initialize_i386fbsd_nat): Ditto.
	windows-nat.c (init_windows_ops): Ditto.
	config/i386/nm-cygwin.h: Define I386_WATCHPOINTS_IN_TARGET_VECTOR.
	config/i386/nm-cygwin64.h: Ditto.
	config/i386/nm-fbsd.h: Ditto.
	config/i386/nm-go32.h: Ditto.

8 files changed, 23 insertions, 0 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eb792c2294..bce126beb5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2009-02-20  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* Extend use of i386_use_watchpoints to all i386 native files
+	using hardware watchpoints.
+	go32-nat.c (init_go32_ops): Call i386_use_watchpoints.
+	i386fbsd-nat.c (_initialize_i386fbsd_nat): Ditto.
+	windows-nat.c (init_windows_ops): Ditto.
+	config/i386/nm-cygwin.h: Define I386_WATCHPOINTS_IN_TARGET_VECTOR.
+	config/i386/nm-cygwin64.h: Ditto.
+	config/i386/nm-fbsd.h: Ditto.
+	config/i386/nm-go32.h: Ditto.
+
+
 2009-02-19  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-typeprint.c (ada_typedef_print): Remove.  Unused.
diff --git a/gdb/config/i386/nm-cygwin.h b/gdb/config/i386/nm-cygwin.h
index 9daa74db38..047688ae41 100644
--- a/gdb/config/i386/nm-cygwin.h
+++ b/gdb/config/i386/nm-cygwin.h
@@ -20,6 +20,7 @@
 void dll_symbol_command (char *, int);
 
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 
diff --git a/gdb/config/i386/nm-cygwin64.h b/gdb/config/i386/nm-cygwin64.h
index 71b26829a0..a4768480ca 100644
--- a/gdb/config/i386/nm-cygwin64.h
+++ b/gdb/config/i386/nm-cygwin64.h
@@ -19,6 +19,7 @@
 void dll_symbol_command (char *, int);
 
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 
diff --git a/gdb/config/i386/nm-fbsd.h b/gdb/config/i386/nm-fbsd.h
index 77875dacff..b9a6fc8b36 100644
--- a/gdb/config/i386/nm-fbsd.h
+++ b/gdb/config/i386/nm-fbsd.h
@@ -23,6 +23,7 @@
 
 #ifdef HAVE_PT_GETDBREGS
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 #endif
 
 #include "i386/nm-i386.h"
diff --git a/gdb/config/i386/nm-go32.h b/gdb/config/i386/nm-go32.h
index 3a6fd1b54c..1268846ad1 100644
--- a/gdb/config/i386/nm-go32.h
+++ b/gdb/config/i386/nm-go32.h
@@ -18,6 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define I386_USE_GENERIC_WATCHPOINTS
+#define I386_WATCHPOINTS_IN_TARGET_VECTOR
 
 #include "i386/nm-i386.h"
 
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index be0de4a355..f5d5326354 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -910,6 +910,9 @@ init_go32_ops (void)
   go32_ops.to_has_stack = 1;
   go32_ops.to_has_registers = 1;
   go32_ops.to_has_execution = 1;
+
+  i386_use_watchpoints (&go32_ops);
+
   go32_ops.to_magic = OPS_MAGIC;
 
   /* Initialize child's cwd as empty to be initialized when starting
diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
index e040185661..79d53f684f 100644
--- a/gdb/i386fbsd-nat.c
+++ b/gdb/i386fbsd-nat.c
@@ -125,6 +125,7 @@ _initialize_i386fbsd_nat (void)
 
   /* Add some extra features to the common *BSD/i386 target.  */
   t = i386bsd_target ();
+  i386_use_watchpoints (t);
   t->to_resume = i386fbsd_resume;
   t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
   t->to_find_memory_regions = fbsd_find_memory_regions;
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 7398d6a063..ef9ef9d498 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2135,6 +2135,8 @@ init_windows_ops (void)
   windows_ops.to_has_registers = 1;
   windows_ops.to_has_execution = 1;
   windows_ops.to_pid_to_exec_file = windows_pid_to_exec_file;
+  i386_use_watchpoints (&windows_ops);
+
   windows_ops.to_magic = OPS_MAGIC;
 }