X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fx86-nat.h;h=7108e4d1cbed6ff692e96a9aeb3f5170446828de;hb=2301204a3b3cd6553f7490498b3adc5973157c1b;hp=8ad1821360ca0eb9f2fb9a7503ef7c5b55668231;hpb=f6ac5f3d63e03a81c4ff3749aba234961cc9090e;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/x86-nat.h b/gdb/x86-nat.h
index 8ad1821360..7108e4d1cb 100644
--- a/gdb/x86-nat.h
+++ b/gdb/x86-nat.h
@@ -1,9 +1,9 @@
 /* Native-dependent code for x86 (i386 and x86-64).
 
-   Low level functions to implement Oeprating System specific
+   Low level functions to implement Operating System specific
    code to manipulate x86 debug registers.
 
-   Copyright (C) 2009-2018 Free Software Foundation, Inc.
+   Copyright (C) 2009-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -72,13 +72,6 @@ struct x86_nat_target : public BaseTarget
 {
   /* Hook in the x86 hardware watchpoints/breakpoints support.  */
 
-  /* After a watchpoint trap, the PC points to the instruction after
-     the one that caused the trap.  Therefore we don't need to step
-     over it.  But we do need to reset the status register to avoid
-     another trap.  */
-  bool have_continuable_watchpoint () override
-  { return true; }
-
   int can_use_hw_breakpoint (enum bptype type, int cnt, int othertype) override
   { return x86_can_use_hw_breakpoint (type, cnt, othertype); }
 
@@ -103,16 +96,16 @@ struct x86_nat_target : public BaseTarget
 			    struct bp_target_info *bp_tgt) override
   { return x86_remove_hw_breakpoint (gdbarch, bp_tgt); }
 
-  int stopped_by_watchpoint () override
+  bool stopped_by_watchpoint () override
   { return x86_stopped_by_watchpoint (); }
 
-  int stopped_data_address (CORE_ADDR *addr_p) override
+  bool stopped_data_address (CORE_ADDR *addr_p) override
   { return x86_stopped_data_address (addr_p); }
 
   /* A target must provide an implementation of the
      "supports_stopped_by_hw_breakpoint" target method before this
      callback will be used.  */
-  int stopped_by_hw_breakpoint () override
+  bool stopped_by_hw_breakpoint () override
   { return x86_stopped_by_hw_breakpoint (); }
 };