diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 389dc0de2eb..5276041c206 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-13 Andrew Cagney <cagney@gnu.org>
+
+ * config/i386/nm-i386.h (TARGET_HAS_HARDWARE_WATCHPOINTS): Delete.
+ * config/s390/nm-linux.h (TARGET_HAS_HARDWARE_WATCHPOINTS): Delete.
+ * config/pa/nm-hppah.h (TARGET_HAS_HARDWARE_WATCHPOINTS): Delete.
+ * config/ia64/nm-linux.h (TARGET_HAS_HARDWARE_WATCHPOINTS): Delete.
+ * config/frv/tm-frv.h (TARGET_HAS_HARDWARE_WATCHPOINTS): Delete.
+ * mips-tdep.c (mips_dump_tdep): Do not print same.
+
2004-09-12 Andrew Cagney <cagney@gnu.org>
* valprint.c (print_longest): Use fputs_filtered. Make "val"
diff --git a/gdb/config/frv/tm-frv.h b/gdb/config/frv/tm-frv.h
index 3d032d3d913..b8f677df2fc 100644
--- a/gdb/config/frv/tm-frv.h
+++ b/gdb/config/frv/tm-frv.h
@@ -20,8 +20,6 @@
/* This target uses an architecture vector for most architecture methods. */
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-
#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) \
frv_check_watch_resources (type, cnt, ot)
extern int frv_check_watch_resources (int type, int cnt, int ot);
diff --git a/gdb/config/i386/nm-i386.h b/gdb/config/i386/nm-i386.h
index 88eacc8852b..2692cae1995 100644
--- a/gdb/config/i386/nm-i386.h
+++ b/gdb/config/i386/nm-i386.h
@@ -26,10 +26,6 @@
/* Targets should define this to use the generic x86 watchpoint support. */
#ifdef I386_USE_GENERIC_WATCHPOINTS
-#ifndef TARGET_HAS_HARDWARE_WATCHPOINTS
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-#endif
-
/* Clear the reference counts and forget everything we knew about DRi. */
extern void i386_cleanup_dregs (void);
diff --git a/gdb/config/ia64/nm-linux.h b/gdb/config/ia64/nm-linux.h
index 7e9172657ea..1a5539a8fdf 100644
--- a/gdb/config/ia64/nm-linux.h
+++ b/gdb/config/ia64/nm-linux.h
@@ -45,8 +45,6 @@ extern int ia64_cannot_store_register (int regno);
/* Hardware watchpoints */
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-
#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) 1
/* The IA-64 architecture can step over a watch point (without triggering
diff --git a/gdb/config/pa/nm-hppah.h b/gdb/config/pa/nm-hppah.h
index 5f37239f930..24d02567136 100644
--- a/gdb/config/pa/nm-hppah.h
+++ b/gdb/config/pa/nm-hppah.h
@@ -98,8 +98,6 @@ extern int hppa_require_detach (int, int);
10.20 will at least link. However, the "can I use a fast watchpoint?"
query will always return "No" for 10.20. */
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
-
/* The PA can watch any number of locations (generic routines already check
that all intermediates are in watchable memory locations). */
extern int hppa_can_use_hw_watchpoint (int type, int cnt, int ot);
diff --git a/gdb/config/s390/nm-linux.h b/gdb/config/s390/nm-linux.h
index 955110c5074..bf283cea80b 100644
--- a/gdb/config/s390/nm-linux.h
+++ b/gdb/config/s390/nm-linux.h
@@ -45,7 +45,6 @@ extern int s390_stopped_by_watchpoint (void);
extern int s390_insert_watchpoint (CORE_ADDR addr, int len);
extern int s390_remove_watchpoint (CORE_ADDR addr, int len);
-#define TARGET_HAS_HARDWARE_WATCHPOINTS
#define TARGET_CAN_USE_HARDWARE_WATCHPOINT(type, cnt, ot) 1
#define TARGET_REGION_OK_FOR_HW_WATCHPOINT(addr, len) 1
#define HAVE_CONTINUABLE_WATCHPOINT 1
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index e128a5392aa..2b40fddf8f9 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -6604,9 +6604,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
"mips_dump_tdep: TARGET_CAN_USE_HARDWARE_WATCHPOINT # %s\n",
XSTRING (TARGET_CAN_USE_HARDWARE_WATCHPOINT
(TYPE, CNT, OTHERTYPE)));
- fprintf_unfiltered (file,
- "mips_dump_tdep: TARGET_HAS_HARDWARE_WATCHPOINTS # %s\n",
- XSTRING (TARGET_HAS_HARDWARE_WATCHPOINTS));
#ifdef TRACE_CLEAR
fprintf_unfiltered (file,
"mips_dump_tdep: TRACE_CLEAR # %s\n",