get rid of unused m4 files

[deliverable/binutils-gdb.git] / gdb / i386v-nat.c

diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c
index 07ddc9f7b5de52298b9efe6149502f262ae5f917..8ecbad99d760a0491d7b3aacb7656345edba87b0 100644 (file)
--- a/gdb/i386v-nat.c
+++ b/gdb/i386v-nat.c
@@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
-#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
+#ifdef TARGET_HAS_HARDWARE_WATCHPOINTS
 #include <sys/debugreg.h>
 #endif
 
@@ -88,7 +88,7 @@ i386_register_u_addr (blockend, regnum)
   
 }
 \f
-#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
+#ifdef TARGET_HAS_HARDWARE_WATCHPOINTS
 
 #if !defined (offsetof)
 #define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
@@ -101,11 +101,12 @@ static int debug_control_mirror;
 static CORE_ADDR address_lookup[DR_LASTADDR - DR_FIRSTADDR + 1];
 
 static int
-i386_insert_nonaligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int,
+i386_insert_aligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int,
                                           int));
 
 static int
-i386_insert_aligned_watchpoint PARAMS ((pid, addr, len, rw));
+i386_insert_nonaligned_watchpoint PARAMS ((int, CORE_ADDR, CORE_ADDR, int,
+                                          int));
 
 /* Insert a watchpoint.  */
 
@@ -210,7 +211,7 @@ i386_insert_nonaligned_watchpoint (pid, waddr, addr, len, rw)
       size = (len > 4) ? 3 : len - 1;
       size = size_try_array[size * 4 + align];
 
-      rv = i386_insert_watchpoint (pid, waddr, addr, size, rw);
+      rv = i386_insert_aligned_watchpoint (pid, waddr, addr, size, rw);
       if (rv)
        {
          i386_remove_watchpoint (pid, waddr, size);
@@ -271,7 +272,7 @@ i386_stopped_by_watchpoint (pid)
   return 0;
 }
 
-#endif /* TARGET_CAN_USE_HARDWARE_WATCHPOINT */
+#endif /* TARGET_HAS_HARDWARE_WATCHPOINTS */
 
 #if 0
 /* using FLOAT_INFO as is would be a problem.  FLOAT_INFO is called