diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7eb32ab4fd451e01a4e174b7a8d2c3b00edefd40..be33dcf1e36e8455d0d3418523cbc3bf563e5b85 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-21 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix hw watchpoints created before the inferior was started.
+ * breakpoint.c (update_watchpoint): Convert the bp_watchpoint and
+ bp_hardware_watchpoint types according to the current runtime state.
+
2008-12-18 Pedro Alves <pedro@codesourcery.com>
* linux-nat.c (linux_child_follow_fork): If following the child,
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 0322d023db5b7fa3dc4db4d1ed2bad4d7c9e41f8..fac96b6fd80ce6745708f82ae81a4d828320fe34 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -891,6 +891,27 @@ update_watchpoint (struct breakpoint *b, int reparse)
b->val_valid = 1;
}
+ /* Change the type of breakpoint between hardware assisted or an
+ ordinary watchpoint depending on the hardware support and free
+ hardware slots. REPARSE is set when the inferior is started. */
+ if ((b->type == bp_watchpoint || b->type == bp_hardware_watchpoint)
+ && reparse)
+ {
+ int i, mem_cnt, target_resources_ok, other_type_used;
+
+ i = hw_watchpoint_used_count (bp_hardware_watchpoint,
+ &other_type_used);
+ mem_cnt = can_use_hardware_watchpoint (val_chain);
+
+ if (mem_cnt)
+ target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT
+ (bp_hardware_watchpoint, i + mem_cnt, other_type_used);
+ if (!mem_cnt || target_resources_ok <= 0)
+ b->type = bp_watchpoint;
+ else
+ b->type = bp_hardware_watchpoint;
+ }
+
/* Look at each value on the value chain. */
for (v = val_chain; v; v = next)
{
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e8b18bdb37c772d7b4aad46a64464c5498b25d93..23a1cfe1247f073d3908bbb78fe896fd3168c41e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-21 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.base/watchpoint-hw.exp, gdb.base/watchpoint-hw.c: New.
+
2008-12-16 Christophe Lyon <christophe.lyon@st.com>
* gdb.base/expand-psymtabs.c: Insert code in foo so that the
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.c b/gdb/testsuite/gdb.base/watchpoint-hw.c
new file mode 100644
index 0000000000000000000000000000000000000000..f6eea6fc62248cefc5abf4ace9f8fa1670f7574e
--- /dev/null
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.c
@@ -0,0 +1,27 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2008 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Please email any bugs, comments, and/or additions to this file to:
+ bug-gdb@prep.ai.mit.edu */
+
+int watchee;
+
+int
+main (void)
+{
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp
new file mode 100644
index 0000000000000000000000000000000000000000..0d36c55101174b419221285a50d49115cc7e459e
--- /dev/null
+++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp
@@ -0,0 +1,52 @@
+# Copyright 2008 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
+if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
+ && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
+ || [target_info exists gdb,no_hardware_watchpoints]} then {
+ verbose "Skipping watchpoint-hw test."
+ return
+}
+
+set testfile watchpoint-hw
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+ untested "Couldn't compile test program"
+ return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+# Create the watchpoint before the inferior gets started. Now the native CPU
+# target is still not active and its `to_can_use_hw_breakpoint' is not
+# installed, therefore only a software watchpoint gets created.
+
+gdb_test "watch watchee" "atchpoint 1: watchee"
+
+# `runto_main' or `runto main' would delete the watchpoint created above.
+
+if { [gdb_start_cmd] < 0 } {
+ untested start
+ return -1
+}
+gdb_test "" "main .* at .*" "start"
+
+# Check it is really a `hw'-watchpoint.
+gdb_test "info watchpoints" "1 *hw watchpoint .* watchee"