diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b9e766f..63d30b4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -921,7 +921,7 @@ psymtab.h psympriv.h progspace.h bfin-tdep.h ia64-hpux-tdep.h \
 amd64-darwin-tdep.h charset-list.h \
 config/djgpp/langinfo.h config/djgpp/nl_types.h darwin-nat.h \
 dicos-tdep.h filesystem.h gcore.h gdb_wchar.h hppabsd-tdep.h \
-i386-darwin-tdep.h i386-nat.h linux-record.h moxie-tdep.h nios2-tdep.h \
+i386-darwin-tdep.h x86-nat.h linux-record.h moxie-tdep.h nios2-tdep.h \
 osdata.h procfs.h python/py-event.h python/py-events.h python/py-stopevent.h \
 python/python-internal.h python/python.h ravenscar-thread.h record.h \
 record-full.h solib-aix.h \
@@ -935,7 +935,7 @@ nat/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h \
 gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \
 ctf.h nat/i386-cpuid.h nat/i386-gcc-cpuid.h target/resume.h \
 target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
-common/print-utils.h common/rsp-low.h nat/i386-dregs.h x86-linux-nat.h \
+common/print-utils.h common/rsp-low.h nat/x86-dregs.h x86-linux-nat.h \
 i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \
 common/common-debug.h common/cleanups.h common/gdb_setjmp.h \
 common/common-exceptions.h target/target.h target/symbol.h \
@@ -1637,7 +1637,7 @@ ALLDEPFILES = \
 	i387-tdep.c \
 	i386-darwin-tdep.c i386-darwin-nat.c \
 	i386-dicos-tdep.c \
-	i386-linux-tdep.c i386-nat.c \
+	i386-linux-tdep.c x86-nat.c \
 	i386-sol2-nat.c i386-sol2-tdep.c \
 	i386gnu-nat.c i386gnu-tdep.c \
 	ia64-hpux-nat.c ia64-hpux-tdep.c \
@@ -2188,8 +2188,8 @@ waitstatus.o: ${srcdir}/target/waitstatus.c
 # Need to explicitly specify the compile rule as make will do nothing
 # or try to compile the object file into the sub-directory.
 
-i386-dregs.o: ${srcdir}/nat/i386-dregs.c
-	$(COMPILE) $(srcdir)/nat/i386-dregs.c
+x86-dregs.o: ${srcdir}/nat/x86-dregs.c
+	$(COMPILE) $(srcdir)/nat/x86-dregs.c
 	$(POSTCOMPILE)
 
 linux-btrace.o: ${srcdir}/nat/linux-btrace.c
diff --git a/gdb/amd64-windows-nat.c b/gdb/amd64-windows-nat.c
index 65c4099..cd9701b 100644
--- a/gdb/amd64-windows-nat.c
+++ b/gdb/amd64-windows-nat.c
@@ -17,7 +17,7 @@
 
 #include "defs.h"
 #include "windows-nat.h"
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "amd64-tdep.h"
 
 #include <windows.h>
@@ -103,5 +103,5 @@ _initialize_amd64_windows_nat (void)
 {
   windows_set_context_register_offsets (mappings);
   windows_set_segment_register_p (amd64_windows_segment_register_p);
-  i386_set_debug_register_length (8);
+  x86_set_debug_register_length (8);
 }
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index fd189ec..fe4e009 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -32,7 +32,7 @@
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
 #include "amd64bsd-nat.h"
-#include "i386-nat.h"
+#include "x86-nat.h"
 
 
 /* Offset in `struct reg' where MEMBER is stored.  */
@@ -145,7 +145,7 @@ static void
 amd64fbsd_mourn_inferior (struct target_ops *ops)
 {
 #ifdef HAVE_PT_GETDBREGS
-  i386_cleanup_dregs ();
+  x86_cleanup_dregs ();
 #endif
   super_mourn_inferior (ops);
 }
@@ -167,14 +167,14 @@ _initialize_amd64fbsd_nat (void)
 
 #ifdef HAVE_PT_GETDBREGS
 
-  i386_use_watchpoints (t);
+  x86_use_watchpoints (t);
 
-  i386_dr_low.set_control = amd64bsd_dr_set_control;
-  i386_dr_low.set_addr = amd64bsd_dr_set_addr;
-  i386_dr_low.get_addr = amd64bsd_dr_get_addr;
-  i386_dr_low.get_status = amd64bsd_dr_get_status;
-  i386_dr_low.get_control = amd64bsd_dr_get_control;
-  i386_set_debug_register_length (8);
+  x86_dr_low.set_control = amd64bsd_dr_set_control;
+  x86_dr_low.set_addr = amd64bsd_dr_set_addr;
+  x86_dr_low.get_addr = amd64bsd_dr_get_addr;
+  x86_dr_low.get_status = amd64bsd_dr_get_status;
+  x86_dr_low.get_control = amd64bsd_dr_get_control;
+  x86_set_debug_register_length (8);
 
 #endif /* HAVE_PT_GETDBREGS */
 
diff --git a/gdb/config/i386/cygwin.mh b/gdb/config/i386/cygwin.mh
index 07f06f2..09bee12 100644
--- a/gdb/config/i386/cygwin.mh
+++ b/gdb/config/i386/cygwin.mh
@@ -1,3 +1,3 @@
 MH_CFLAGS=
-NATDEPFILES= i386-nat.o i386-dregs.o windows-nat.o i386-windows-nat.o
+NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o i386-windows-nat.o
 XM_CLIBS=
diff --git a/gdb/config/i386/cygwin64.mh b/gdb/config/i386/cygwin64.mh
index 5ce3095..3bede64 100644
--- a/gdb/config/i386/cygwin64.mh
+++ b/gdb/config/i386/cygwin64.mh
@@ -17,4 +17,4 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-NATDEPFILES= i386-nat.o i386-dregs.o windows-nat.o amd64-windows-nat.o
+NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o amd64-windows-nat.o
diff --git a/gdb/config/i386/darwin.mh b/gdb/config/i386/darwin.mh
index bd4d57e..16c1558 100644
--- a/gdb/config/i386/darwin.mh
+++ b/gdb/config/i386/darwin.mh
@@ -1,4 +1,4 @@
 # Host: IA86 running Darwin
 
 NATDEPFILES = fork-child.o darwin-nat.o \
-     i386-darwin-nat.o i386-nat.o i386-dregs.o amd64-nat.o darwin-nat-info.o
+     i386-darwin-nat.o x86-nat.o x86-dregs.o amd64-nat.o darwin-nat-info.o
diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh
index 7aa6a69..e5bff3a 100644
--- a/gdb/config/i386/fbsd.mh
+++ b/gdb/config/i386/fbsd.mh
@@ -1,6 +1,6 @@
 # Host: FreeBSD/i386
 NATDEPFILES= fork-child.o inf-ptrace.o \
-	fbsd-nat.o i386-nat.o i386-dregs.o i386bsd-nat.o i386fbsd-nat.o \
+	fbsd-nat.o x86-nat.o x86-dregs.o i386bsd-nat.o i386fbsd-nat.o \
 	bsd-kvm.o
 NAT_FILE= nm-fbsd.h
 HAVE_NATIVE_GCORE_HOST = 1
diff --git a/gdb/config/i386/fbsd64.mh b/gdb/config/i386/fbsd64.mh
index c37f460..329c526 100644
--- a/gdb/config/i386/fbsd64.mh
+++ b/gdb/config/i386/fbsd64.mh
@@ -1,7 +1,7 @@
 # Host: FreeBSD/amd64
 NATDEPFILES= fork-child.o inf-ptrace.o \
 	fbsd-nat.o amd64-nat.o amd64bsd-nat.o amd64fbsd-nat.o \
-	bsd-kvm.o i386-nat.o i386-dregs.o
+	bsd-kvm.o x86-nat.o x86-dregs.o
 HAVE_NATIVE_GCORE_HOST = 1
 
 LOADLIBES= -lkvm
diff --git a/gdb/config/i386/go32.mh b/gdb/config/i386/go32.mh
index 1b8ce86..b0ab60c 100644
--- a/gdb/config/i386/go32.mh
+++ b/gdb/config/i386/go32.mh
@@ -3,7 +3,7 @@
 # We include several header files from config/djgpp
 MH_CFLAGS= -I$(srcdir)/config/djgpp
 
-NATDEPFILES= go32-nat.o i386-nat.o i386-dregs.o
+NATDEPFILES= go32-nat.o x86-nat.o x86-dregs.o
 
 HOST_IPC=
 CC= gcc
diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh
index 536ed3d..a4e4842 100644
--- a/gdb/config/i386/linux.mh
+++ b/gdb/config/i386/linux.mh
@@ -2,7 +2,7 @@
 
 NAT_FILE= config/nm-linux.h
 NATDEPFILES= inf-ptrace.o fork-child.o \
-	i386-nat.o i386-dregs.o i386-linux-nat.o x86-linux-nat.o \
+	x86-nat.o x86-dregs.o i386-linux-nat.o x86-linux-nat.o \
 	proc-service.o linux-thread-db.o \
 	linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \
 	linux-btrace.o linux-waitpid.o
diff --git a/gdb/config/i386/linux64.mh b/gdb/config/i386/linux64.mh
index 8faca42..d557202 100644
--- a/gdb/config/i386/linux64.mh
+++ b/gdb/config/i386/linux64.mh
@@ -1,6 +1,6 @@
 # Host: GNU/Linux x86-64
 NATDEPFILES= inf-ptrace.o fork-child.o \
-	i386-nat.o i386-dregs.o amd64-nat.o amd64-linux-nat.o \
+	x86-nat.o x86-dregs.o amd64-nat.o amd64-linux-nat.o \
 	x86-linux-nat.o \
 	linux-nat.o linux-osdata.o \
 	proc-service.o linux-thread-db.o linux-fork.o \
diff --git a/gdb/config/i386/mingw.mh b/gdb/config/i386/mingw.mh
index 07f06f2..09bee12 100644
--- a/gdb/config/i386/mingw.mh
+++ b/gdb/config/i386/mingw.mh
@@ -1,3 +1,3 @@
 MH_CFLAGS=
-NATDEPFILES= i386-nat.o i386-dregs.o windows-nat.o i386-windows-nat.o
+NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o i386-windows-nat.o
 XM_CLIBS=
diff --git a/gdb/config/i386/mingw64.mh b/gdb/config/i386/mingw64.mh
index 740f508..0ee2e2c 100644
--- a/gdb/config/i386/mingw64.mh
+++ b/gdb/config/i386/mingw64.mh
@@ -1 +1 @@
-NATDEPFILES= i386-nat.o i386-dregs.o windows-nat.o amd64-windows-nat.o
+NATDEPFILES= x86-nat.o x86-dregs.o windows-nat.o amd64-windows-nat.o
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 8a313f9..074d93d 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -149,7 +149,7 @@ SFILES=	$(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \
 	$(srcdir)/thread-db.c $(srcdir)/utils.c $(srcdir)/debug.c \
 	$(srcdir)/linux-arm-low.c $(srcdir)/linux-bfin-low.c \
 	$(srcdir)/linux-cris-low.c $(srcdir)/linux-crisv32-low.c \
-	${srcdir}/i386-low.c $(srcdir)/i387-fp.c \
+	${srcdir}/x86-low.c $(srcdir)/i387-fp.c \
 	$(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \
 	$(srcdir)/linux-m32r-low.c \
 	$(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \
@@ -558,7 +558,7 @@ waitstatus.o: ../target/waitstatus.c
 
 # Native object files rules from ../nat
 
-i386-dregs.o: ../nat/i386-dregs.c
+x86-dregs.o: ../nat/x86-dregs.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 linux-btrace.o: ../nat/linux-btrace.c
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 8ff9c28..679fc9f 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -99,7 +99,7 @@ case "${target}" in
 			srv_linux_thread_db=yes
 			;;
   i[34567]86-*-cygwin*)	srv_regobj="$srv_i386_regobj"
-			srv_tgtobj="i386-low.o i386-dregs.o win32-low.o win32-i386-low.o"
+			srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o"
 			srv_xmlfiles="$srv_i386_xmlfiles"
 			;;
   i[34567]86-*-linux*)	srv_regobj="$srv_i386_linux_regobj"
@@ -108,7 +108,7 @@ case "${target}" in
 			    srv_regobj="$srv_regobj $srv_amd64_linux_regobj"
 			    srv_xmlfiles="${srv_xmlfiles} $srv_amd64_linux_xmlfiles"
 			fi
-			srv_tgtobj="$srv_linux_obj linux-x86-low.o i386-low.o i386-dregs.o i387-fp.o"
+			srv_tgtobj="$srv_linux_obj linux-x86-low.o x86-low.o x86-dregs.o i387-fp.o"
 			srv_tgtobj="${srv_tgtobj} linux-btrace.o"
 			srv_linux_usrregs=yes
 			srv_linux_regsets=yes
@@ -125,7 +125,7 @@ case "${target}" in
 			;;
   i[34567]86-*-mingw32ce*)
 			srv_regobj="$srv_i386_regobj"
-			srv_tgtobj="i386-low.o i386-dregs.o win32-low.o win32-i386-low.o"
+			srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o"
 			srv_tgtobj="${srv_tgtobj} wincecompat.o"
 			srv_xmlfiles="$srv_i386_xmlfiles"
 			# hostio_last_error implementation is in win32-low.c
@@ -134,7 +134,7 @@ case "${target}" in
 			srv_mingwce=yes
 			;;
   i[34567]86-*-mingw*)	srv_regobj="$srv_i386_regobj"
-			srv_tgtobj="i386-low.o i386-dregs.o win32-low.o win32-i386-low.o"
+			srv_tgtobj="x86-low.o x86-dregs.o win32-low.o win32-i386-low.o"
 			srv_xmlfiles="$srv_i386_xmlfiles"
 			srv_mingw=yes
 			;;
@@ -315,7 +315,7 @@ case "${target}" in
 			srv_linux_thread_db=yes
 			;;
   x86_64-*-linux*)	srv_regobj="$srv_amd64_linux_regobj $srv_i386_linux_regobj"
-			srv_tgtobj="$srv_linux_obj linux-x86-low.o i386-low.o i386-dregs.o i387-fp.o"
+			srv_tgtobj="$srv_linux_obj linux-x86-low.o x86-low.o x86-dregs.o i387-fp.o"
 			srv_tgtobj="${srv_tgtobj} linux-btrace.o"
 			srv_xmlfiles="$srv_i386_linux_xmlfiles $srv_amd64_linux_xmlfiles"
 			srv_linux_usrregs=yes # This is for i386 progs.
@@ -325,12 +325,12 @@ case "${target}" in
 			ipa_obj="${ipa_amd64_linux_regobj} linux-amd64-ipa.o"
 			;;
   x86_64-*-mingw*)	srv_regobj="$srv_amd64_regobj"
-			srv_tgtobj="i386-low.o i386-dregs.o i387-fp.o win32-low.o win32-i386-low.o"
+			srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o"
 			srv_xmlfiles="$srv_i386_xmlfiles $srv_amd64_xmlfiles"
 			srv_mingw=yes
 			;;
   x86_64-*-cygwin*)	srv_regobj="$srv_amd64_regobj"
-			srv_tgtobj="i386-low.o i386-dregs.o i387-fp.o win32-low.o win32-i386-low.o"
+			srv_tgtobj="x86-low.o x86-dregs.o i387-fp.o win32-low.o win32-i386-low.o"
 			srv_xmlfiles="$srv_i386_xmlfiles"
 			;;
 
diff --git a/gdb/gdbserver/i386-low.c b/gdb/gdbserver/i386-low.c
deleted file mode 100644
index 845c3b0..0000000
--- a/gdb/gdbserver/i386-low.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Debug register code for the i386.
-
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#include "server.h"
-#include "i386-low.h"
-
-/* Clear the reference counts and forget everything we knew about the
-   debug registers.  */
-
-void
-i386_low_init_dregs (struct i386_debug_reg_state *state)
-{
-  int i;
-
-  ALL_DEBUG_REGISTERS (i)
-    {
-      state->dr_mirror[i] = 0;
-      state->dr_ref_count[i] = 0;
-    }
-  state->dr_control_mirror = 0;
-  state->dr_status_mirror  = 0;
-}
diff --git a/gdb/gdbserver/i386-low.h b/gdb/gdbserver/i386-low.h
deleted file mode 100644
index e726038..0000000
--- a/gdb/gdbserver/i386-low.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Misc. low level support for i386.
-
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-
-#include "nat/i386-dregs.h"
-
-/* Initialize STATE.  */
-extern void i386_low_init_dregs (struct i386_debug_reg_state *state);
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index 5175019..b15b194 100644
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -23,7 +23,7 @@
 #include <inttypes.h>
 #include "linux-low.h"
 #include "i387-fp.h"
-#include "i386-low.h"
+#include "x86-low.h"
 #include "i386-xstate.h"
 
 #include "gdb_proc_service.h"
@@ -148,7 +148,7 @@ static const char *xmltarget_amd64_linux_no_xml = "@<target>\
 
 struct arch_process_info
 {
-  struct i386_debug_reg_state debug_reg_state;
+  struct x86_debug_reg_state debug_reg_state;
 };
 
 /* Per-thread arch-specific data we want to keep.  */
@@ -587,7 +587,7 @@ update_debug_registers_callback (struct inferior_list_entry *entry,
 /* Update the inferior's debug register REGNUM from STATE.  */
 
 static void
-i386_dr_low_set_addr (int regnum, CORE_ADDR addr)
+x86_dr_low_set_addr (int regnum, CORE_ADDR addr)
 {
   /* Only update the threads of this process.  */
   int pid = pid_of (current_inferior);
@@ -600,7 +600,7 @@ i386_dr_low_set_addr (int regnum, CORE_ADDR addr)
 /* Return the inferior's debug register REGNUM.  */
 
 static CORE_ADDR
-i386_dr_low_get_addr (int regnum)
+x86_dr_low_get_addr (int regnum)
 {
   ptid_t ptid = ptid_of (current_inferior);
 
@@ -612,7 +612,7 @@ i386_dr_low_get_addr (int regnum)
 /* Update the inferior's DR7 debug control register from STATE.  */
 
 static void
-i386_dr_low_set_control (unsigned long control)
+x86_dr_low_set_control (unsigned long control)
 {
   /* Only update the threads of this process.  */
   int pid = pid_of (current_inferior);
@@ -623,7 +623,7 @@ i386_dr_low_set_control (unsigned long control)
 /* Return the inferior's DR7 debug control register.  */
 
 static unsigned long
-i386_dr_low_get_control (void)
+x86_dr_low_get_control (void)
 {
   ptid_t ptid = ptid_of (current_inferior);
 
@@ -634,7 +634,7 @@ i386_dr_low_get_control (void)
    and record it in STATE.  */
 
 static unsigned long
-i386_dr_low_get_status (void)
+x86_dr_low_get_status (void)
 {
   ptid_t ptid = ptid_of (current_inferior);
 
@@ -642,13 +642,13 @@ i386_dr_low_get_status (void)
 }
 
 /* Low-level function vector.  */
-struct i386_dr_low_type i386_dr_low =
+struct x86_dr_low_type x86_dr_low =
   {
-    i386_dr_low_set_control,
-    i386_dr_low_set_addr,
-    i386_dr_low_get_addr,
-    i386_dr_low_get_status,
-    i386_dr_low_get_control,
+    x86_dr_low_set_control,
+    x86_dr_low_set_addr,
+    x86_dr_low_get_addr,
+    x86_dr_low_get_status,
+    x86_dr_low_get_control,
     sizeof (void *),
   };
 
@@ -686,10 +686,10 @@ x86_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
       {
 	enum target_hw_bp_type hw_type
 	  = raw_bkpt_type_to_target_hw_bp_type (type);
-	struct i386_debug_reg_state *state
+	struct x86_debug_reg_state *state
 	  = &proc->private->arch_private->debug_reg_state;
 
-	return i386_dr_insert_watchpoint (state, hw_type, addr, size);
+	return x86_dr_insert_watchpoint (state, hw_type, addr, size);
       }
 
     default:
@@ -715,10 +715,10 @@ x86_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
       {
 	enum target_hw_bp_type hw_type
 	  = raw_bkpt_type_to_target_hw_bp_type (type);
-	struct i386_debug_reg_state *state
+	struct x86_debug_reg_state *state
 	  = &proc->private->arch_private->debug_reg_state;
 
-	return i386_dr_remove_watchpoint (state, hw_type, addr, size);
+	return x86_dr_remove_watchpoint (state, hw_type, addr, size);
       }
     default:
       /* Unsupported.  */
@@ -730,7 +730,7 @@ static int
 x86_stopped_by_watchpoint (void)
 {
   struct process_info *proc = current_process ();
-  return i386_dr_stopped_by_watchpoint (&proc->private->arch_private->debug_reg_state);
+  return x86_dr_stopped_by_watchpoint (&proc->private->arch_private->debug_reg_state);
 }
 
 static CORE_ADDR
@@ -738,8 +738,8 @@ x86_stopped_data_address (void)
 {
   struct process_info *proc = current_process ();
   CORE_ADDR addr;
-  if (i386_dr_stopped_data_address (&proc->private->arch_private->debug_reg_state,
-				    &addr))
+  if (x86_dr_stopped_data_address (&proc->private->arch_private->debug_reg_state,
+				   &addr))
     return addr;
   return 0;
 }
@@ -751,7 +751,7 @@ x86_linux_new_process (void)
 {
   struct arch_process_info *info = xcalloc (1, sizeof (*info));
 
-  i386_low_init_dregs (&info->debug_reg_state);
+  x86_low_init_dregs (&info->debug_reg_state);
 
   return info;
 }
@@ -782,7 +782,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp)
       int i;
       int pid = ptid_get_pid (ptid);
       struct process_info *proc = find_process_pid (pid);
-      struct i386_debug_reg_state *state
+      struct x86_debug_reg_state *state
 	= &proc->private->arch_private->debug_reg_state;
 
       x86_linux_dr_set (ptid, DR_CONTROL, 0);
@@ -794,7 +794,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp)
 
 	    /* If we're setting a watchpoint, any change the inferior
 	       had done itself to the debug registers needs to be
-	       discarded, otherwise, i386_dr_stopped_data_address can
+	       discarded, otherwise, x86_dr_stopped_data_address can
 	       get confused.  */
 	    clear_status = 1;
 	  }
diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 39149f3..b4b99e8 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -17,7 +17,7 @@
 
 #include "server.h"
 #include "win32-low.h"
-#include "i386-low.h"
+#include "x86-low.h"
 
 #ifndef CONTEXT_EXTENDED_REGISTERS
 #define CONTEXT_EXTENDED_REGISTERS 0
@@ -38,7 +38,7 @@ void init_registers_i386 (void);
 extern const struct target_desc *tdesc_i386;
 #endif
 
-static struct i386_debug_reg_state debug_reg_state;
+static struct x86_debug_reg_state debug_reg_state;
 
 static int debug_registers_changed = 0;
 static int debug_registers_used = 0;
@@ -46,7 +46,7 @@ static int debug_registers_used = 0;
 /* Update the inferior's debug register REGNUM from STATE.  */
 
 static void
-i386_dr_low_set_addr (int regnum, CORE_ADDR addr)
+x86_dr_low_set_addr (int regnum, CORE_ADDR addr)
 {
   gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
 
@@ -58,7 +58,7 @@ i386_dr_low_set_addr (int regnum, CORE_ADDR addr)
 }
 
 static CORE_ADDR
-i386_dr_low_get_addr (int regnum)
+x86_dr_low_get_addr (int regnum)
 {
   gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
 
@@ -68,7 +68,7 @@ i386_dr_low_get_addr (int regnum)
 /* Update the inferior's DR7 debug control register from STATE.  */
 
 static void
-i386_dr_low_set_control (unsigned long control)
+x86_dr_low_set_control (unsigned long control)
 {
   /* debug_reg_state.dr_control_mirror is already set.
      Just notify i386_set_thread_context, i386_thread_added
@@ -78,7 +78,7 @@ i386_dr_low_set_control (unsigned long control)
 }
 
 static unsigned long
-i386_dr_low_get_control (void)
+x86_dr_low_get_control (void)
 {
   return debug_reg_state.dr_control_mirror;
 }
@@ -87,7 +87,7 @@ i386_dr_low_get_control (void)
    and record it in STATE.  */
 
 static unsigned long
-i386_dr_low_get_status (void)
+x86_dr_low_get_status (void)
 {
   /* We don't need to do anything here, the last call to thread_rec for
      current_event.dwThreadId id has already set it.  */
@@ -95,13 +95,13 @@ i386_dr_low_get_status (void)
 }
 
 /* Low-level function vector.  */
-struct i386_dr_low_type i386_dr_low =
+struct x86_dr_low_type x86_dr_low =
   {
-    i386_dr_low_set_control,
-    i386_dr_low_set_addr,
-    i386_dr_low_get_addr,
-    i386_dr_low_get_status,
-    i386_dr_low_get_control,
+    x86_dr_low_set_control,
+    x86_dr_low_set_addr,
+    x86_dr_low_get_addr,
+    x86_dr_low_get_status,
+    x86_dr_low_get_control,
     sizeof (void *),
   };
 
@@ -132,8 +132,8 @@ i386_insert_point (enum raw_bkpt_type type, CORE_ADDR addr,
 	enum target_hw_bp_type hw_type
 	  = raw_bkpt_type_to_target_hw_bp_type (type);
 
-	return i386_dr_insert_watchpoint (&debug_reg_state,
-					  hw_type, addr, size);
+	return x86_dr_insert_watchpoint (&debug_reg_state,
+					 hw_type, addr, size);
       }
     default:
       /* Unsupported.  */
@@ -153,8 +153,8 @@ i386_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
 	enum target_hw_bp_type hw_type
 	  = raw_bkpt_type_to_target_hw_bp_type (type);
 
-	return i386_dr_remove_watchpoint (&debug_reg_state,
-					  hw_type, addr, size);
+	return x86_dr_remove_watchpoint (&debug_reg_state,
+					 hw_type, addr, size);
       }
     default:
       /* Unsupported.  */
@@ -163,16 +163,16 @@ i386_remove_point (enum raw_bkpt_type type, CORE_ADDR addr,
 }
 
 static int
-i386_stopped_by_watchpoint (void)
+x86_stopped_by_watchpoint (void)
 {
-  return i386_dr_stopped_by_watchpoint (&debug_reg_state);
+  return x86_dr_stopped_by_watchpoint (&debug_reg_state);
 }
 
 static CORE_ADDR
-i386_stopped_data_address (void)
+x86_stopped_data_address (void)
 {
   CORE_ADDR addr;
-  if (i386_dr_stopped_data_address (&debug_reg_state, &addr))
+  if (x86_dr_stopped_data_address (&debug_reg_state, &addr))
     return addr;
   return 0;
 }
@@ -180,7 +180,7 @@ i386_stopped_data_address (void)
 static void
 i386_initial_stuff (void)
 {
-  i386_low_init_dregs (&debug_reg_state);
+  x86_low_init_dregs (&debug_reg_state);
   debug_registers_changed = 0;
   debug_registers_used = 0;
 }
@@ -216,7 +216,7 @@ i386_get_thread_context (win32_thread_info *th, DEBUG_EVENT* current_event)
   if (th->tid == current_event->dwThreadId)
     {
       /* Copy dr values from the current thread.  */
-      struct i386_debug_reg_state *dr = &debug_reg_state;
+      struct x86_debug_reg_state *dr = &debug_reg_state;
       dr->dr_mirror[0] = th->context.Dr0;
       dr->dr_mirror[1] = th->context.Dr1;
       dr->dr_mirror[2] = th->context.Dr2;
@@ -231,7 +231,7 @@ i386_set_thread_context (win32_thread_info *th, DEBUG_EVENT* current_event)
 {
   if (debug_registers_changed)
     {
-      struct i386_debug_reg_state *dr = &debug_reg_state;
+      struct x86_debug_reg_state *dr = &debug_reg_state;
       th->context.Dr0 = dr->dr_mirror[0];
       th->context.Dr1 = dr->dr_mirror[1];
       th->context.Dr2 = dr->dr_mirror[2];
@@ -250,7 +250,7 @@ i386_thread_added (win32_thread_info *th)
   /* Set the debug registers for the new thread if they are used.  */
   if (debug_registers_used)
     {
-      struct i386_debug_reg_state *dr = &debug_reg_state;
+      struct x86_debug_reg_state *dr = &debug_reg_state;
       th->context.ContextFlags = CONTEXT_DEBUG_REGISTERS;
       GetThreadContext (th->h, &th->context);
 
@@ -460,6 +460,6 @@ struct win32_target_ops the_low_target = {
   i386_supports_z_point_type,
   i386_insert_point,
   i386_remove_point,
-  i386_stopped_by_watchpoint,
-  i386_stopped_data_address
+  x86_stopped_by_watchpoint,
+  x86_stopped_data_address
 };
diff --git a/gdb/gdbserver/x86-low.c b/gdb/gdbserver/x86-low.c
new file mode 100644
index 0000000..aaa110e
--- /dev/null
+++ b/gdb/gdbserver/x86-low.c
@@ -0,0 +1,38 @@
+/* Low level support for x86 (i386 and x86-64).
+
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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/>.  */
+
+#include "server.h"
+#include "x86-low.h"
+
+/* Clear the reference counts and forget everything we knew about the
+   debug registers.  */
+
+void
+x86_low_init_dregs (struct x86_debug_reg_state *state)
+{
+  int i;
+
+  ALL_DEBUG_REGISTERS (i)
+    {
+      state->dr_mirror[i] = 0;
+      state->dr_ref_count[i] = 0;
+    }
+  state->dr_control_mirror = 0;
+  state->dr_status_mirror  = 0;
+}
diff --git a/gdb/gdbserver/x86-low.h b/gdb/gdbserver/x86-low.h
new file mode 100644
index 0000000..9aecff4
--- /dev/null
+++ b/gdb/gdbserver/x86-low.h
@@ -0,0 +1,24 @@
+/* Low level support for x86 (i386 and x86-64).
+
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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/>.  */
+
+
+#include "nat/x86-dregs.h"
+
+/* Initialize STATE.  */
+extern void x86_low_init_dregs (struct x86_debug_reg_state *state);
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index ed54247..f232d39 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -85,7 +85,7 @@
 
 #include <fcntl.h>
 
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "gdbthread.h"
@@ -735,7 +735,7 @@ go32_mourn_inferior (struct target_ops *ops)
      be nice if GDB itself would take care to remove all breakpoints
      at all times, but it doesn't, probably under an assumption that
      the OS cleans up when the debuggee exits.  */
-  i386_cleanup_dregs ();
+  x86_cleanup_dregs ();
 
   ptid = inferior_ptid;
   inferior_ptid = null_ptid;
@@ -2062,14 +2062,14 @@ _initialize_go32_nat (void)
 {
   struct target_ops *t = go32_target ();
 
-  i386_dr_low.set_control = go32_set_dr7;
-  i386_dr_low.set_addr = go32_set_dr;
-  i386_dr_low.get_status = go32_get_dr6;
-  i386_dr_low.get_control = go32_get_dr7;
-  i386_dr_low.get_addr = go32_get_dr;
-  i386_set_debug_register_length (4);
+  x86_dr_low.set_control = go32_set_dr7;
+  x86_dr_low.set_addr = go32_set_dr;
+  x86_dr_low.get_status = go32_get_dr6;
+  x86_dr_low.get_control = go32_get_dr7;
+  x86_dr_low.get_addr = go32_get_dr;
+  x86_set_debug_register_length (4);
 
-  i386_use_watchpoints (t);
+  x86_use_watchpoints (t);
   add_target (t);
 
   /* Initialize child's cwd as empty to be initialized when starting
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index f94c053..a60bc6c 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -33,7 +33,7 @@
 #include "arch-utils.h"
 #include "gdbcore.h"
 
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "darwin-nat.h"
 #include "i386-darwin-tdep.h"
 
@@ -628,19 +628,19 @@ darwin_complete_target (struct target_ops *target)
   amd64_native_gregset32_num_regs = i386_darwin_thread_state_num_regs;
 #endif
 
-  i386_use_watchpoints (target);
+  x86_use_watchpoints (target);
 
-  i386_dr_low.set_control = i386_darwin_dr_set_control;
-  i386_dr_low.set_addr = i386_darwin_dr_set_addr;
-  i386_dr_low.get_addr = i386_darwin_dr_get_addr;
-  i386_dr_low.get_status = i386_darwin_dr_get_status;
-  i386_dr_low.get_control = i386_darwin_dr_get_control;
+  x86_dr_low.set_control = i386_darwin_dr_set_control;
+  x86_dr_low.set_addr = i386_darwin_dr_set_addr;
+  x86_dr_low.get_addr = i386_darwin_dr_get_addr;
+  x86_dr_low.get_status = i386_darwin_dr_get_status;
+  x86_dr_low.get_control = i386_darwin_dr_get_control;
 
   /* Let's assume that the kernel is 64 bits iff the executable is.  */
 #ifdef __x86_64__
-  i386_set_debug_register_length (8);
+  x86_set_debug_register_length (8);
 #else
-  i386_set_debug_register_length (4);
+  x86_set_debug_register_length (4);
 #endif
 
   target->to_fetch_registers = i386_darwin_fetch_inferior_registers;
diff --git a/gdb/i386-nat.c b/gdb/i386-nat.c
deleted file mode 100644
index 4a64759..0000000
--- a/gdb/i386-nat.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/* Native-dependent code for the i386.
-
-   Copyright (C) 2001-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#include "defs.h"
-#include "i386-nat.h"
-#include "gdbcmd.h"
-#include "inferior.h"
-
-/* Support for hardware watchpoints and breakpoints using the i386
-   debug registers.
-
-   This provides several functions for inserting and removing
-   hardware-assisted breakpoints and watchpoints, testing if one or
-   more of the watchpoints triggered and at what address, checking
-   whether a given region can be watched, etc.
-
-   The functions below implement debug registers sharing by reference
-   counts, and allow to watch regions up to 16 bytes long.  */
-
-/* Low-level function vector.  */
-struct i386_dr_low_type i386_dr_low;
-
-/* Per-process data.  We don't bind this to a per-inferior registry
-   because of targets like x86 GNU/Linux that need to keep track of
-   processes that aren't bound to any inferior (e.g., fork children,
-   checkpoints).  */
-
-struct i386_process_info
-{
-  /* Linked list.  */
-  struct i386_process_info *next;
-
-  /* The process identifier.  */
-  pid_t pid;
-
-  /* Copy of i386 hardware debug registers.  */
-  struct i386_debug_reg_state state;
-};
-
-static struct i386_process_info *i386_process_list = NULL;
-
-/* Find process data for process PID.  */
-
-static struct i386_process_info *
-i386_find_process_pid (pid_t pid)
-{
-  struct i386_process_info *proc;
-
-  for (proc = i386_process_list; proc; proc = proc->next)
-    if (proc->pid == pid)
-      return proc;
-
-  return NULL;
-}
-
-/* Add process data for process PID.  Returns newly allocated info
-   object.  */
-
-static struct i386_process_info *
-i386_add_process (pid_t pid)
-{
-  struct i386_process_info *proc;
-
-  proc = xcalloc (1, sizeof (*proc));
-  proc->pid = pid;
-
-  proc->next = i386_process_list;
-  i386_process_list = proc;
-
-  return proc;
-}
-
-/* Get data specific info for process PID, creating it if necessary.
-   Never returns NULL.  */
-
-static struct i386_process_info *
-i386_process_info_get (pid_t pid)
-{
-  struct i386_process_info *proc;
-
-  proc = i386_find_process_pid (pid);
-  if (proc == NULL)
-    proc = i386_add_process (pid);
-
-  return proc;
-}
-
-/* Get debug registers state for process PID.  */
-
-struct i386_debug_reg_state *
-i386_debug_reg_state (pid_t pid)
-{
-  return &i386_process_info_get (pid)->state;
-}
-
-/* See declaration in i386-nat.h.  */
-
-void
-i386_forget_process (pid_t pid)
-{
-  struct i386_process_info *proc, **proc_link;
-
-  proc = i386_process_list;
-  proc_link = &i386_process_list;
-
-  while (proc != NULL)
-    {
-      if (proc->pid == pid)
-	{
-	  *proc_link = proc->next;
-
-	  xfree (proc);
-	  return;
-	}
-
-      proc_link = &proc->next;
-      proc = *proc_link;
-    }
-}
-
-/* Clear the reference counts and forget everything we knew about the
-   debug registers.  */
-
-void
-i386_cleanup_dregs (void)
-{
-  /* Starting from scratch has the same effect.  */
-  i386_forget_process (ptid_get_pid (inferior_ptid));
-}
-
-/* Insert a watchpoint to watch a memory region which starts at
-   address ADDR and whose length is LEN bytes.  Watch memory accesses
-   of the type TYPE.  Return 0 on success, -1 on failure.  */
-
-static int
-i386_insert_watchpoint (struct target_ops *self,
-			CORE_ADDR addr, int len, int type,
-			struct expression *cond)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_insert_watchpoint (state, type, addr, len);
-}
-
-/* Remove a watchpoint that watched the memory region which starts at
-   address ADDR, whose length is LEN bytes, and for accesses of the
-   type TYPE.  Return 0 on success, -1 on failure.  */
-static int
-i386_remove_watchpoint (struct target_ops *self,
-			CORE_ADDR addr, int len, int type,
-			struct expression *cond)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_remove_watchpoint (state, type, addr, len);
-}
-
-/* Return non-zero if we can watch a memory region that starts at
-   address ADDR and whose length is LEN bytes.  */
-
-static int
-i386_region_ok_for_watchpoint (struct target_ops *self,
-			       CORE_ADDR addr, int len)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_region_ok_for_watchpoint (state, addr, len);
-}
-
-/* If the inferior has some break/watchpoint that triggered, set the
-   address associated with that break/watchpoint and return non-zero.
-   Otherwise, return zero.  */
-
-static int
-i386_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_stopped_data_address (state, addr_p);
-}
-
-/* Return non-zero if the inferior has some watchpoint that triggered.
-   Otherwise return zero.  */
-
-static int
-i386_stopped_by_watchpoint (struct target_ops *ops)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_stopped_by_watchpoint (state);
-}
-
-/* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
-   Return 0 on success, EBUSY on failure.  */
-
-static int
-i386_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
-			   struct bp_target_info *bp_tgt)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_insert_watchpoint (state, hw_execute,
-				    bp_tgt->placed_address, 1) ? EBUSY : 0;
-}
-
-/* Remove a hardware-assisted breakpoint at BP_TGT->placed_address.
-   Return 0 on success, -1 on failure.  */
-
-static int
-i386_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
-			   struct bp_target_info *bp_tgt)
-{
-  struct i386_debug_reg_state *state
-    = i386_debug_reg_state (ptid_get_pid (inferior_ptid));
-
-  return i386_dr_remove_watchpoint (state, hw_execute,
-				    bp_tgt->placed_address, 1);
-}
-
-/* Returns the number of hardware watchpoints of type TYPE that we can
-   set.  Value is positive if we can set CNT watchpoints, zero if
-   setting watchpoints of type TYPE is not supported, and negative if
-   CNT is more than the maximum number of watchpoints of type TYPE
-   that we can support.  TYPE is one of bp_hardware_watchpoint,
-   bp_read_watchpoint, bp_write_watchpoint, or bp_hardware_breakpoint.
-   CNT is the number of such watchpoints used so far (including this
-   one).  OTHERTYPE is non-zero if other types of watchpoints are
-   currently enabled.
-
-   We always return 1 here because we don't have enough information
-   about possible overlap of addresses that they want to watch.  As an
-   extreme example, consider the case where all the watchpoints watch
-   the same address and the same region length: then we can handle a
-   virtually unlimited number of watchpoints, due to debug register
-   sharing implemented via reference counts in i386-nat.c.  */
-
-static int
-i386_can_use_hw_breakpoint (struct target_ops *self,
-			    int type, int cnt, int othertype)
-{
-  return 1;
-}
-
-static void
-add_show_debug_regs_command (void)
-{
-  /* A maintenance command to enable printing the internal DRi mirror
-     variables.  */
-  add_setshow_boolean_cmd ("show-debug-regs", class_maintenance,
-			   &show_debug_regs, _("\
-Set whether to show variables that mirror the x86 debug registers."), _("\
-Show whether to show variables that mirror the x86 debug registers."), _("\
-Use \"on\" to enable, \"off\" to disable.\n\
-If enabled, the debug registers values are shown when GDB inserts\n\
-or removes a hardware breakpoint or watchpoint, and when the inferior\n\
-triggers a breakpoint or watchpoint."),
-			   NULL,
-			   NULL,
-			   &maintenance_set_cmdlist,
-			   &maintenance_show_cmdlist);
-}
-
-/* There are only two global functions left.  */
-
-void
-i386_use_watchpoints (struct target_ops *t)
-{
-  /* 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.  */
-  t->to_have_continuable_watchpoint = 1;
-
-  t->to_can_use_hw_breakpoint = i386_can_use_hw_breakpoint;
-  t->to_region_ok_for_hw_watchpoint = i386_region_ok_for_watchpoint;
-  t->to_stopped_by_watchpoint = i386_stopped_by_watchpoint;
-  t->to_stopped_data_address = i386_stopped_data_address;
-  t->to_insert_watchpoint = i386_insert_watchpoint;
-  t->to_remove_watchpoint = i386_remove_watchpoint;
-  t->to_insert_hw_breakpoint = i386_insert_hw_breakpoint;
-  t->to_remove_hw_breakpoint = i386_remove_hw_breakpoint;
-}
-
-void
-i386_set_debug_register_length (int len)
-{
-  /* This function should be called only once for each native target.  */
-  gdb_assert (i386_dr_low.debug_register_length == 0);
-  gdb_assert (len == 4 || len == 8);
-  i386_dr_low.debug_register_length = len;
-  add_show_debug_regs_command ();
-}
diff --git a/gdb/i386-nat.h b/gdb/i386-nat.h
deleted file mode 100644
index acac71a..0000000
--- a/gdb/i386-nat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Native-dependent code for the i386.
-
-   Low level functions to implement Oeprating System specific
-   code to manipulate I386 debug registers.
-
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#ifndef I386_NAT_H
-#define I386_NAT_H 1
-
-#include "nat/i386-dregs.h"
-
-/* Hardware-assisted breakpoints and watchpoints.  */
-
-/* Add watchpoint methods to the provided target_ops.  
-   Targets using i386 family debug registers for watchpoints should call
-   this.  */
-struct target_ops;
-extern void i386_use_watchpoints (struct target_ops *);
-
-/* Use this function to set i386_dr_low debug_register_length field
-   rather than setting it directly to check that the length is only
-   set once.  It also enables the 'maint set/show show-debug-regs' 
-   command.  */
-
-extern void i386_set_debug_register_length (int len);
-
-/* Use this function to reset the i386-nat.c debug register state.  */
-
-extern void i386_cleanup_dregs (void);
-
-/* Return a pointer to the local mirror of the debug registers of
-   process PID.  */
-
-extern struct i386_debug_reg_state *i386_debug_reg_state (pid_t pid);
-
-/* Called whenever GDB is no longer debugging process PID.  It deletes
-   data structures that keep track of debug register state.  */
-
-extern void i386_forget_process (pid_t pid);
-
-#endif /* I386_NAT_H */
diff --git a/gdb/i386-windows-nat.c b/gdb/i386-windows-nat.c
index caa645a..37c6166 100644
--- a/gdb/i386-windows-nat.c
+++ b/gdb/i386-windows-nat.c
@@ -17,7 +17,7 @@
 
 #include "defs.h"
 #include "windows-nat.h"
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "i386-tdep.h"
 
 #include <windows.h>
@@ -87,5 +87,5 @@ _initialize_i386_windows_nat (void)
 {
   windows_set_context_register_offsets (mappings);
   windows_set_segment_register_p (i386_windows_segment_register_p);
-  i386_set_debug_register_length (4);
+  x86_set_debug_register_length (4);
 }
diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
index 6d78171..754677f 100644
--- a/gdb/i386fbsd-nat.c
+++ b/gdb/i386fbsd-nat.c
@@ -28,7 +28,7 @@
 
 #include "fbsd-nat.h"
 #include "i386-tdep.h"
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "i386bsd-nat.h"
 
 /* Resume execution of the inferior process.  If STEP is nonzero,
@@ -128,14 +128,14 @@ _initialize_i386fbsd_nat (void)
 
 #ifdef HAVE_PT_GETDBREGS
 
-  i386_use_watchpoints (t);
+  x86_use_watchpoints (t);
 
-  i386_dr_low.set_control = i386bsd_dr_set_control;
-  i386_dr_low.set_addr = i386bsd_dr_set_addr;
-  i386_dr_low.get_addr = i386bsd_dr_get_addr;
-  i386_dr_low.get_status = i386bsd_dr_get_status;
-  i386_dr_low.get_control = i386bsd_dr_get_control;
-  i386_set_debug_register_length (4);
+  x86_dr_low.set_control = i386bsd_dr_set_control;
+  x86_dr_low.set_addr = i386bsd_dr_set_addr;
+  x86_dr_low.get_addr = i386bsd_dr_get_addr;
+  x86_dr_low.get_status = i386bsd_dr_get_status;
+  x86_dr_low.get_control = i386bsd_dr_get_control;
+  x86_set_debug_register_length (4);
 
 #endif /* HAVE_PT_GETDBREGS */
 
diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c
deleted file mode 100644
index 2f22299..0000000
--- a/gdb/nat/i386-dregs.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* Debug register code for the i386.
-
-   Copyright (C) 2001-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-#include "common-defs.h"
-#include "i386-dregs.h"
-#include "break-common.h"
-
-/* Support for hardware watchpoints and breakpoints using the i386
-   debug registers.
-
-   This provides several functions for inserting and removing
-   hardware-assisted breakpoints and watchpoints, testing if one or
-   more of the watchpoints triggered and at what address, checking
-   whether a given region can be watched, etc.
-
-   The functions below implement debug registers sharing by reference
-   counts, and allow to watch regions up to 16 bytes long.  */
-
-/* Accessor macros for low-level function vector.  */
-
-/* Can we update the inferior's debug registers?  */
-#define i386_dr_low_can_set_addr() (i386_dr_low.set_addr != NULL)
-
-/* Update the inferior's debug register REGNUM from STATE.  */
-#define i386_dr_low_set_addr(new_state, i) \
-  (i386_dr_low.set_addr ((i), (new_state)->dr_mirror[(i)]))
-
-/* Return the inferior's debug register REGNUM.  */
-#define i386_dr_low_get_addr(i) (i386_dr_low.get_addr ((i)))
-
-/* Can we update the inferior's DR7 control register?  */
-#define i386_dr_low_can_set_control() (i386_dr_low.set_control != NULL)
-
-/* Update the inferior's DR7 debug control register from STATE.  */
-#define i386_dr_low_set_control(new_state) \
-  (i386_dr_low.set_control ((new_state)->dr_control_mirror))
-
-/* Return the value of the inferior's DR7 debug control register.  */
-#define i386_dr_low_get_control() (i386_dr_low.get_control ())
-
-/* Return the value of the inferior's DR6 debug status register.  */
-#define i386_dr_low_get_status() (i386_dr_low.get_status ())
-
-/* Return the debug register size, in bytes.  */
-#define i386_get_debug_register_length() \
-  (i386_dr_low.debug_register_length)
-
-/* Support for 8-byte wide hw watchpoints.  */
-#define TARGET_HAS_DR_LEN_8 (i386_get_debug_register_length () == 8)
-
-/* DR7 Debug Control register fields.  */
-
-/* How many bits to skip in DR7 to get to R/W and LEN fields.  */
-#define DR_CONTROL_SHIFT	16
-/* How many bits in DR7 per R/W and LEN field for each watchpoint.  */
-#define DR_CONTROL_SIZE		4
-
-/* Watchpoint/breakpoint read/write fields in DR7.  */
-#define DR_RW_EXECUTE	(0x0)	/* Break on instruction execution.  */
-#define DR_RW_WRITE	(0x1)	/* Break on data writes.  */
-#define DR_RW_READ	(0x3)	/* Break on data reads or writes.  */
-
-/* This is here for completeness.  No platform supports this
-   functionality yet (as of March 2001).  Note that the DE flag in the
-   CR4 register needs to be set to support this.  */
-#ifndef DR_RW_IORW
-#define DR_RW_IORW	(0x2)	/* Break on I/O reads or writes.  */
-#endif
-
-/* Watchpoint/breakpoint length fields in DR7.  The 2-bit left shift
-   is so we could OR this with the read/write field defined above.  */
-#define DR_LEN_1	(0x0 << 2) /* 1-byte region watch or breakpoint.  */
-#define DR_LEN_2	(0x1 << 2) /* 2-byte region watch.  */
-#define DR_LEN_4	(0x3 << 2) /* 4-byte region watch.  */
-#define DR_LEN_8	(0x2 << 2) /* 8-byte region watch (AMD64).  */
-
-/* Local and Global Enable flags in DR7.
-
-   When the Local Enable flag is set, the breakpoint/watchpoint is
-   enabled only for the current task; the processor automatically
-   clears this flag on every task switch.  When the Global Enable flag
-   is set, the breakpoint/watchpoint is enabled for all tasks; the
-   processor never clears this flag.
-
-   Currently, all watchpoint are locally enabled.  If you need to
-   enable them globally, read the comment which pertains to this in
-   i386_insert_aligned_watchpoint below.  */
-#define DR_LOCAL_ENABLE_SHIFT	0 /* Extra shift to the local enable bit.  */
-#define DR_GLOBAL_ENABLE_SHIFT	1 /* Extra shift to the global enable bit.  */
-#define DR_ENABLE_SIZE		2 /* Two enable bits per debug register.  */
-
-/* Local and global exact breakpoint enable flags (a.k.a. slowdown
-   flags).  These are only required on i386, to allow detection of the
-   exact instruction which caused a watchpoint to break; i486 and
-   later processors do that automatically.  We set these flags for
-   backwards compatibility.  */
-#define DR_LOCAL_SLOWDOWN	(0x100)
-#define DR_GLOBAL_SLOWDOWN	(0x200)
-
-/* Fields reserved by Intel.  This includes the GD (General Detect
-   Enable) flag, which causes a debug exception to be generated when a
-   MOV instruction accesses one of the debug registers.
-
-   FIXME: My Intel manual says we should use 0xF800, not 0xFC00.  */
-#define DR_CONTROL_RESERVED	(0xFC00)
-
-/* Auxiliary helper macros.  */
-
-/* A value that masks all fields in DR7 that are reserved by Intel.  */
-#define I386_DR_CONTROL_MASK	(~DR_CONTROL_RESERVED)
-
-/* The I'th debug register is vacant if its Local and Global Enable
-   bits are reset in the Debug Control register.  */
-#define I386_DR_VACANT(state, i) \
-  (((state)->dr_control_mirror & (3 << (DR_ENABLE_SIZE * (i)))) == 0)
-
-/* Locally enable the break/watchpoint in the I'th debug register.  */
-#define I386_DR_LOCAL_ENABLE(state, i) \
-  do { \
-    (state)->dr_control_mirror |= \
-      (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i))); \
-  } while (0)
-
-/* Globally enable the break/watchpoint in the I'th debug register.  */
-#define I386_DR_GLOBAL_ENABLE(state, i) \
-  do { \
-    (state)->dr_control_mirror |= \
-      (1 << (DR_GLOBAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i))); \
-  } while (0)
-
-/* Disable the break/watchpoint in the I'th debug register.  */
-#define I386_DR_DISABLE(state, i) \
-  do { \
-    (state)->dr_control_mirror &= \
-      ~(3 << (DR_ENABLE_SIZE * (i))); \
-  } while (0)
-
-/* Set in DR7 the RW and LEN fields for the I'th debug register.  */
-#define I386_DR_SET_RW_LEN(state, i, rwlen) \
-  do { \
-    (state)->dr_control_mirror &= \
-      ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
-    (state)->dr_control_mirror |= \
-      ((rwlen) << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
-  } while (0)
-
-/* Get from DR7 the RW and LEN fields for the I'th debug register.  */
-#define I386_DR_GET_RW_LEN(dr7, i) \
-  (((dr7) \
-    >> (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))) & 0x0f)
-
-/* Did the watchpoint whose address is in the I'th register break?  */
-#define I386_DR_WATCH_HIT(dr6, i) ((dr6) & (1 << (i)))
-
-/* Types of operations supported by i386_handle_nonaligned_watchpoint.  */
-typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t;
-
-/* Print the values of the mirrored debug registers.  */
-
-static void
-i386_show_dr (struct i386_debug_reg_state *state,
-	      const char *func, CORE_ADDR addr,
-	      int len, enum target_hw_bp_type type)
-{
-  int i;
-
-  debug_printf ("%s", func);
-  if (addr || len)
-    debug_printf (" (addr=%s, len=%d, type=%s)",
-		  phex (addr, 8), len,
-		  type == hw_write ? "data-write"
-		  : (type == hw_read ? "data-read"
-		     : (type == hw_access ? "data-read/write"
-			: (type == hw_execute ? "instruction-execute"
-			   /* FIXME: if/when I/O read/write
-			      watchpoints are supported, add them
-			      here.  */
-			   : "??unknown??"))));
-  debug_printf (":\n");
-  debug_printf ("\tCONTROL (DR7): %s          STATUS (DR6): %s\n",
-		phex (state->dr_control_mirror, 8),
-		phex (state->dr_status_mirror, 8));
-  ALL_DEBUG_REGISTERS (i)
-    {
-      debug_printf ("\
-\tDR%d: addr=0x%s, ref.count=%d  DR%d: addr=0x%s, ref.count=%d\n",
-		    i, phex (state->dr_mirror[i],
-			     i386_get_debug_register_length ()),
-		    state->dr_ref_count[i],
-		    i + 1, phex (state->dr_mirror[i + 1],
-				 i386_get_debug_register_length ()),
-		    state->dr_ref_count[i + 1]);
-      i++;
-    }
-}
-
-/* Return the value of a 4-bit field for DR7 suitable for watching a
-   region of LEN bytes for accesses of type TYPE.  LEN is assumed to
-   have the value of 1, 2, or 4.  */
-
-static unsigned
-i386_length_and_rw_bits (int len, enum target_hw_bp_type type)
-{
-  unsigned rw;
-
-  switch (type)
-    {
-      case hw_execute:
-	rw = DR_RW_EXECUTE;
-	break;
-      case hw_write:
-	rw = DR_RW_WRITE;
-	break;
-      case hw_read:
-	internal_error (__FILE__, __LINE__,
-			_("The i386 doesn't support "
-			  "data-read watchpoints.\n"));
-      case hw_access:
-	rw = DR_RW_READ;
-	break;
-#if 0
-	/* Not yet supported.  */
-      case hw_io_access:
-	rw = DR_RW_IORW;
-	break;
-#endif
-      default:
-	internal_error (__FILE__, __LINE__, _("\
-Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n"),
-			(int) type);
-    }
-
-  switch (len)
-    {
-      case 1:
-	return (DR_LEN_1 | rw);
-      case 2:
-	return (DR_LEN_2 | rw);
-      case 4:
-	return (DR_LEN_4 | rw);
-      case 8:
-        if (TARGET_HAS_DR_LEN_8)
- 	  return (DR_LEN_8 | rw);
-	/* ELSE FALL THROUGH */
-      default:
-	internal_error (__FILE__, __LINE__, _("\
-Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n"), len);
-    }
-}
-
-/* Insert a watchpoint at address ADDR, which is assumed to be aligned
-   according to the length of the region to watch.  LEN_RW_BITS is the
-   value of the bits from DR7 which describes the length and access
-   type of the region to be watched by this watchpoint.  Return 0 on
-   success, -1 on failure.  */
-
-static int
-i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
-				CORE_ADDR addr, unsigned len_rw_bits)
-{
-  int i;
-
-  if (!i386_dr_low_can_set_addr () || !i386_dr_low_can_set_control ())
-    return -1;
-
-  /* First, look for an occupied debug register with the same address
-     and the same RW and LEN definitions.  If we find one, we can
-     reuse it for this watchpoint as well (and save a register).  */
-  ALL_DEBUG_REGISTERS (i)
-    {
-      if (!I386_DR_VACANT (state, i)
-	  && state->dr_mirror[i] == addr
-	  && I386_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
-	{
-	  state->dr_ref_count[i]++;
-	  return 0;
-	}
-    }
-
-  /* Next, look for a vacant debug register.  */
-  ALL_DEBUG_REGISTERS (i)
-    {
-      if (I386_DR_VACANT (state, i))
-	break;
-    }
-
-  /* No more debug registers!  */
-  if (i >= DR_NADDR)
-    return -1;
-
-  /* Now set up the register I to watch our region.  */
-
-  /* Record the info in our local mirrored array.  */
-  state->dr_mirror[i] = addr;
-  state->dr_ref_count[i] = 1;
-  I386_DR_SET_RW_LEN (state, i, len_rw_bits);
-  /* Note: we only enable the watchpoint locally, i.e. in the current
-     task.  Currently, no i386 target allows or supports global
-     watchpoints; however, if any target would want that in the
-     future, GDB should probably provide a command to control whether
-     to enable watchpoints globally or locally, and the code below
-     should use global or local enable and slow-down flags as
-     appropriate.  */
-  I386_DR_LOCAL_ENABLE (state, i);
-  state->dr_control_mirror |= DR_LOCAL_SLOWDOWN;
-  state->dr_control_mirror &= I386_DR_CONTROL_MASK;
-
-  return 0;
-}
-
-/* Remove a watchpoint at address ADDR, which is assumed to be aligned
-   according to the length of the region to watch.  LEN_RW_BITS is the
-   value of the bits from DR7 which describes the length and access
-   type of the region watched by this watchpoint.  Return 0 on
-   success, -1 on failure.  */
-
-static int
-i386_remove_aligned_watchpoint (struct i386_debug_reg_state *state,
-				CORE_ADDR addr, unsigned len_rw_bits)
-{
-  int i, retval = -1;
-  int all_vacant = 1;
-
-  ALL_DEBUG_REGISTERS (i)
-    {
-      if (!I386_DR_VACANT (state, i)
-	  && state->dr_mirror[i] == addr
-	  && I386_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
-	{
-	  if (--state->dr_ref_count[i] == 0) /* No longer in use?  */
-	    {
-	      /* Reset our mirror.  */
-	      state->dr_mirror[i] = 0;
-	      I386_DR_DISABLE (state, i);
-	      /* Even though not strictly necessary, clear out all
-		 bits in DR_CONTROL related to this debug register.
-		 Debug output is clearer when we don't have stale bits
-		 in place.  This also allows the assertion below.  */
-	      I386_DR_SET_RW_LEN (state, i, 0);
-	    }
-	  retval = 0;
-	}
-
-      if (!I386_DR_VACANT (state, i))
-	all_vacant = 0;
-    }
-
-  if (all_vacant)
-    {
-      /* Even though not strictly necessary, clear out all of
-	 DR_CONTROL, so that when we have no debug registers in use,
-	 we end up with DR_CONTROL == 0.  The Linux support relies on
-	 this for an optimization.  Plus, it makes for clearer debug
-	 output.  */
-      state->dr_control_mirror &= ~DR_LOCAL_SLOWDOWN;
-
-      gdb_assert (state->dr_control_mirror == 0);
-    }
-  return retval;
-}
-
-/* Insert or remove a (possibly non-aligned) watchpoint, or count the
-   number of debug registers required to watch a region at address
-   ADDR whose length is LEN for accesses of type TYPE.  Return 0 on
-   successful insertion or removal, a positive number when queried
-   about the number of registers, or -1 on failure.  If WHAT is not a
-   valid value, bombs through internal_error.  */
-
-static int
-i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state,
-				   i386_wp_op_t what, CORE_ADDR addr, int len,
-				   enum target_hw_bp_type type)
-{
-  int retval = 0;
-  int max_wp_len = TARGET_HAS_DR_LEN_8 ? 8 : 4;
-
-  static const int size_try_array[8][8] =
-  {
-    {1, 1, 1, 1, 1, 1, 1, 1},	/* Trying size one.  */
-    {2, 1, 2, 1, 2, 1, 2, 1},	/* Trying size two.  */
-    {2, 1, 2, 1, 2, 1, 2, 1},	/* Trying size three.  */
-    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size four.  */
-    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size five.  */
-    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size six.  */
-    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size seven.  */
-    {8, 1, 2, 1, 4, 1, 2, 1},	/* Trying size eight.  */
-  };
-
-  while (len > 0)
-    {
-      int align = addr % max_wp_len;
-      /* Four (eight on AMD64) is the maximum length a debug register
-	 can watch.  */
-      int try = (len > max_wp_len ? (max_wp_len - 1) : len - 1);
-      int size = size_try_array[try][align];
-
-      if (what == WP_COUNT)
-	{
-	  /* size_try_array[] is defined such that each iteration
-	     through the loop is guaranteed to produce an address and a
-	     size that can be watched with a single debug register.
-	     Thus, for counting the registers required to watch a
-	     region, we simply need to increment the count on each
-	     iteration.  */
-	  retval++;
-	}
-      else
-	{
-	  unsigned len_rw = i386_length_and_rw_bits (size, type);
-
-	  if (what == WP_INSERT)
-	    retval = i386_insert_aligned_watchpoint (state, addr, len_rw);
-	  else if (what == WP_REMOVE)
-	    retval = i386_remove_aligned_watchpoint (state, addr, len_rw);
-	  else
-	    internal_error (__FILE__, __LINE__, _("\
-Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"),
-			    (int) what);
-	  if (retval)
-	    break;
-	}
-
-      addr += size;
-      len -= size;
-    }
-
-  return retval;
-}
-
-/* Update the inferior debug registers state, in STATE, with the
-   new debug registers state, in NEW_STATE.  */
-
-static void
-i386_update_inferior_debug_regs (struct i386_debug_reg_state *state,
-				 struct i386_debug_reg_state *new_state)
-{
-  int i;
-
-  ALL_DEBUG_REGISTERS (i)
-    {
-      if (I386_DR_VACANT (new_state, i) != I386_DR_VACANT (state, i))
-	i386_dr_low_set_addr (new_state, i);
-      else
-	gdb_assert (new_state->dr_mirror[i] == state->dr_mirror[i]);
-    }
-
-  if (new_state->dr_control_mirror != state->dr_control_mirror)
-    i386_dr_low_set_control (new_state);
-
-  *state = *new_state;
-}
-
-/* Insert a watchpoint to watch a memory region which starts at
-   address ADDR and whose length is LEN bytes.  Watch memory accesses
-   of the type TYPE.  Return 0 on success, -1 on failure.  */
-
-int
-i386_dr_insert_watchpoint (struct i386_debug_reg_state *state,
-			   enum target_hw_bp_type type,
-			   CORE_ADDR addr, int len)
-{
-  int retval;
-  /* Work on a local copy of the debug registers, and on success,
-     commit the change back to the inferior.  */
-  struct i386_debug_reg_state local_state = *state;
-
-  if (type == hw_read)
-    return 1; /* unsupported */
-
-  if (((len != 1 && len != 2 && len != 4)
-       && !(TARGET_HAS_DR_LEN_8 && len == 8))
-      || addr % len != 0)
-    {
-      retval = i386_handle_nonaligned_watchpoint (&local_state,
-						  WP_INSERT,
-						  addr, len, type);
-    }
-  else
-    {
-      unsigned len_rw = i386_length_and_rw_bits (len, type);
-
-      retval = i386_insert_aligned_watchpoint (&local_state,
-					       addr, len_rw);
-    }
-
-  if (retval == 0)
-    i386_update_inferior_debug_regs (state, &local_state);
-
-  if (show_debug_regs)
-    i386_show_dr (state, "insert_watchpoint", addr, len, type);
-
-  return retval;
-}
-
-/* Remove a watchpoint that watched the memory region which starts at
-   address ADDR, whose length is LEN bytes, and for accesses of the
-   type TYPE.  Return 0 on success, -1 on failure.  */
-
-int
-i386_dr_remove_watchpoint (struct i386_debug_reg_state *state,
-			   enum target_hw_bp_type type,
-			   CORE_ADDR addr, int len)
-{
-  int retval;
-  /* Work on a local copy of the debug registers, and on success,
-     commit the change back to the inferior.  */
-  struct i386_debug_reg_state local_state = *state;
-
-  if (((len != 1 && len != 2 && len != 4)
-       && !(TARGET_HAS_DR_LEN_8 && len == 8))
-      || addr % len != 0)
-    {
-      retval = i386_handle_nonaligned_watchpoint (&local_state,
-						  WP_REMOVE,
-						  addr, len, type);
-    }
-  else
-    {
-      unsigned len_rw = i386_length_and_rw_bits (len, type);
-
-      retval = i386_remove_aligned_watchpoint (&local_state,
-					       addr, len_rw);
-    }
-
-  if (retval == 0)
-    i386_update_inferior_debug_regs (state, &local_state);
-
-  if (show_debug_regs)
-    i386_show_dr (state, "remove_watchpoint", addr, len, type);
-
-  return retval;
-}
-
-/* Return non-zero if we can watch a memory region that starts at
-   address ADDR and whose length is LEN bytes.  */
-
-int
-i386_dr_region_ok_for_watchpoint (struct i386_debug_reg_state *state,
-				  CORE_ADDR addr, int len)
-{
-  int nregs;
-
-  /* Compute how many aligned watchpoints we would need to cover this
-     region.  */
-  nregs = i386_handle_nonaligned_watchpoint (state, WP_COUNT,
-					     addr, len, hw_write);
-  return nregs <= DR_NADDR ? 1 : 0;
-}
-
-/* If the inferior has some break/watchpoint that triggered, set the
-   address associated with that break/watchpoint and return non-zero.
-   Otherwise, return zero.  */
-
-int
-i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
-			      CORE_ADDR *addr_p)
-{
-  CORE_ADDR addr = 0;
-  int i;
-  int rc = 0;
-  /* The current thread's DR_STATUS.  We always need to read this to
-     check whether some watchpoint caused the trap.  */
-  unsigned status;
-  /* We need DR_CONTROL as well, but only iff DR_STATUS indicates a
-     data breakpoint trap.  Only fetch it when necessary, to avoid an
-     unnecessary extra syscall when no watchpoint triggered.  */
-  int control_p = 0;
-  unsigned control = 0;
-
-  /* In non-stop/async, threads can be running while we change the
-     global dr_mirror (and friends).  Say, we set a watchpoint, and
-     let threads resume.  Now, say you delete the watchpoint, or
-     add/remove watchpoints such that dr_mirror changes while threads
-     are running.  On targets that support non-stop,
-     inserting/deleting watchpoints updates the global dr_mirror only.
-     It does not update the real thread's debug registers; that's only
-     done prior to resume.  Instead, if threads are running when the
-     mirror changes, a temporary and transparent stop on all threads
-     is forced so they can get their copy of the debug registers
-     updated on re-resume.  Now, say, a thread hit a watchpoint before
-     having been updated with the new dr_mirror contents, and we
-     haven't yet handled the corresponding SIGTRAP.  If we trusted
-     dr_mirror below, we'd mistake the real trapped address (from the
-     last time we had updated debug registers in the thread) with
-     whatever was currently in dr_mirror.  So to fix this, dr_mirror
-     always represents intention, what we _want_ threads to have in
-     debug registers.  To get at the address and cause of the trap, we
-     need to read the state the thread still has in its debug
-     registers.
-
-     In sum, always get the current debug register values the current
-     thread has, instead of trusting the global mirror.  If the thread
-     was running when we last changed watchpoints, the mirror no
-     longer represents what was set in this thread's debug
-     registers.  */
-  status = i386_dr_low_get_status ();
-
-  ALL_DEBUG_REGISTERS (i)
-    {
-      if (!I386_DR_WATCH_HIT (status, i))
-	continue;
-
-      if (!control_p)
-	{
-	  control = i386_dr_low_get_control ();
-	  control_p = 1;
-	}
-
-      /* This second condition makes sure DRi is set up for a data
-	 watchpoint, not a hardware breakpoint.  The reason is that
-	 GDB doesn't call the target_stopped_data_address method
-	 except for data watchpoints.  In other words, I'm being
-	 paranoiac.  */
-      if (I386_DR_GET_RW_LEN (control, i) != 0)
-	{
-	  addr = i386_dr_low_get_addr (i);
-	  rc = 1;
-	  if (show_debug_regs)
-	    i386_show_dr (state, "watchpoint_hit", addr, -1, hw_write);
-	}
-    }
-
-  if (show_debug_regs && addr == 0)
-    i386_show_dr (state, "stopped_data_addr", 0, 0, hw_write);
-
-  if (rc)
-    *addr_p = addr;
-  return rc;
-}
-
-/* Return non-zero if the inferior has some watchpoint that triggered.
-   Otherwise return zero.  */
-
-int
-i386_dr_stopped_by_watchpoint (struct i386_debug_reg_state *state)
-{
-  CORE_ADDR addr = 0;
-  return i386_dr_stopped_data_address (state, &addr);
-}
diff --git a/gdb/nat/i386-dregs.h b/gdb/nat/i386-dregs.h
deleted file mode 100644
index 16edf63..0000000
--- a/gdb/nat/i386-dregs.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Debug register code for the i386.
-
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   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/>.  */
-
-/* Support for hardware watchpoints and breakpoints using the i386
-   debug registers.
-
-   This provides several functions for inserting and removing
-   hardware-assisted breakpoints and watchpoints, testing if one or
-   more of the watchpoints triggered and at what address, checking
-   whether a given region can be watched, etc.
-
-   The functions below implement debug registers sharing by reference
-   counts, and allow to watch regions up to 16 bytes long
-   (32 bytes on 64 bit hosts).  */
-
-#ifndef I386_DREGS_H
-#define I386_DREGS_H 1
-
-/* Forward declaration.  */
-enum target_hw_bp_type;
-
-/* Low-level function vector.  */
-
-struct i386_dr_low_type
-  {
-    /* Set the debug control (DR7) register to a given value for
-       all LWPs.  May be NULL if the debug control register cannot
-       be set.  */
-    void (*set_control) (unsigned long);
-
-    /* Put an address into one debug register for all LWPs.  May
-       be NULL if debug registers cannot be set*/
-    void (*set_addr) (int, CORE_ADDR);
-
-    /* Return the address in a given debug register of the current
-       LWP.  */
-    CORE_ADDR (*get_addr) (int);
-
-    /* Return the value of the debug status (DR6) register for
-       current LWP.  */
-    unsigned long (*get_status) (void);
-
-    /* Return the value of the debug control (DR7) register for
-       current LWP.  */
-    unsigned long (*get_control) (void);
-
-    /* Number of bytes used for debug registers (4 or 8).  */
-    int debug_register_length;
-  };
-
-extern struct i386_dr_low_type i386_dr_low;
-
-/* Debug registers' indices.  */
-#define DR_FIRSTADDR 0
-#define DR_LASTADDR  3
-#define DR_NADDR     4	/* The number of debug address registers.  */
-#define DR_STATUS    6	/* Index of debug status register (DR6).  */
-#define DR_CONTROL   7	/* Index of debug control register (DR7).  */
-
-/* Global state needed to track h/w watchpoints.  */
-
-struct i386_debug_reg_state
-{
-  /* Mirror the inferior's DRi registers.  We keep the status and
-     control registers separated because they don't hold addresses.
-     Note that since we can change these mirrors while threads are
-     running, we never trust them to explain a cause of a trap.
-     For that, we need to peek directly in the inferior registers.  */
-  CORE_ADDR dr_mirror[DR_NADDR];
-  unsigned dr_status_mirror, dr_control_mirror;
-
-  /* Reference counts for each debug register.  */
-  int dr_ref_count[DR_NADDR];
-};
-
-/* A macro to loop over all debug registers.  */
-#define ALL_DEBUG_REGISTERS(i)	for (i = 0; i < DR_NADDR; i++)
-
-/* Insert a watchpoint to watch a memory region which starts at
-   address ADDR and whose length is LEN bytes.  Watch memory accesses
-   of the type TYPE.  Return 0 on success, -1 on failure.  */
-extern int i386_dr_insert_watchpoint (struct i386_debug_reg_state *state,
-				      enum target_hw_bp_type type,
-				      CORE_ADDR addr,
-				      int len);
-
-/* Remove a watchpoint that watched the memory region which starts at
-   address ADDR, whose length is LEN bytes, and for accesses of the
-   type TYPE.  Return 0 on success, -1 on failure.  */
-extern int i386_dr_remove_watchpoint (struct i386_debug_reg_state *state,
-				      enum target_hw_bp_type type,
-				      CORE_ADDR addr,
-				      int len);
-
-/* Return non-zero if we can watch a memory region that starts at
-   address ADDR and whose length is LEN bytes.  */
-extern int i386_dr_region_ok_for_watchpoint (struct i386_debug_reg_state *state,
-					     CORE_ADDR addr, int len);
-
-/* If the inferior has some break/watchpoint that triggered, set the
-   address associated with that break/watchpoint and return true.
-   Otherwise, return false.  */
-extern int i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
-					 CORE_ADDR *addr_p);
-
-/* Return true if the inferior has some watchpoint that triggered.
-   Otherwise return false.  */
-extern int i386_dr_stopped_by_watchpoint (struct i386_debug_reg_state *state);
-
-#endif /* I386_DREGS_H */
diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c
new file mode 100644
index 0000000..d571804
--- /dev/null
+++ b/gdb/nat/x86-dregs.c
@@ -0,0 +1,655 @@
+/* Debug register code for x86 (i386 and x86-64).
+
+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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/>.  */
+
+#include "common-defs.h"
+#include "x86-dregs.h"
+#include "break-common.h"
+
+/* Support for hardware watchpoints and breakpoints using the x86
+   debug registers.
+
+   This provides several functions for inserting and removing
+   hardware-assisted breakpoints and watchpoints, testing if one or
+   more of the watchpoints triggered and at what address, checking
+   whether a given region can be watched, etc.
+
+   The functions below implement debug registers sharing by reference
+   counts, and allow to watch regions up to 16 bytes long.  */
+
+/* Accessor macros for low-level function vector.  */
+
+/* Can we update the inferior's debug registers?  */
+#define x86_dr_low_can_set_addr() (x86_dr_low.set_addr != NULL)
+
+/* Update the inferior's debug register REGNUM from STATE.  */
+#define x86_dr_low_set_addr(new_state, i) \
+  (x86_dr_low.set_addr ((i), (new_state)->dr_mirror[(i)]))
+
+/* Return the inferior's debug register REGNUM.  */
+#define x86_dr_low_get_addr(i) (x86_dr_low.get_addr ((i)))
+
+/* Can we update the inferior's DR7 control register?  */
+#define x86_dr_low_can_set_control() (x86_dr_low.set_control != NULL)
+
+/* Update the inferior's DR7 debug control register from STATE.  */
+#define x86_dr_low_set_control(new_state) \
+  (x86_dr_low.set_control ((new_state)->dr_control_mirror))
+
+/* Return the value of the inferior's DR7 debug control register.  */
+#define x86_dr_low_get_control() (x86_dr_low.get_control ())
+
+/* Return the value of the inferior's DR6 debug status register.  */
+#define x86_dr_low_get_status() (x86_dr_low.get_status ())
+
+/* Return the debug register size, in bytes.  */
+#define x86_get_debug_register_length() \
+  (x86_dr_low.debug_register_length)
+
+/* Support for 8-byte wide hw watchpoints.  */
+#define TARGET_HAS_DR_LEN_8 (x86_get_debug_register_length () == 8)
+
+/* DR7 Debug Control register fields.  */
+
+/* How many bits to skip in DR7 to get to R/W and LEN fields.  */
+#define DR_CONTROL_SHIFT	16
+/* How many bits in DR7 per R/W and LEN field for each watchpoint.  */
+#define DR_CONTROL_SIZE		4
+
+/* Watchpoint/breakpoint read/write fields in DR7.  */
+#define DR_RW_EXECUTE	(0x0)	/* Break on instruction execution.  */
+#define DR_RW_WRITE	(0x1)	/* Break on data writes.  */
+#define DR_RW_READ	(0x3)	/* Break on data reads or writes.  */
+
+/* This is here for completeness.  No platform supports this
+   functionality yet (as of March 2001).  Note that the DE flag in the
+   CR4 register needs to be set to support this.  */
+#ifndef DR_RW_IORW
+#define DR_RW_IORW	(0x2)	/* Break on I/O reads or writes.  */
+#endif
+
+/* Watchpoint/breakpoint length fields in DR7.  The 2-bit left shift
+   is so we could OR this with the read/write field defined above.  */
+#define DR_LEN_1	(0x0 << 2) /* 1-byte region watch or breakpoint.  */
+#define DR_LEN_2	(0x1 << 2) /* 2-byte region watch.  */
+#define DR_LEN_4	(0x3 << 2) /* 4-byte region watch.  */
+#define DR_LEN_8	(0x2 << 2) /* 8-byte region watch (AMD64).  */
+
+/* Local and Global Enable flags in DR7.
+
+   When the Local Enable flag is set, the breakpoint/watchpoint is
+   enabled only for the current task; the processor automatically
+   clears this flag on every task switch.  When the Global Enable flag
+   is set, the breakpoint/watchpoint is enabled for all tasks; the
+   processor never clears this flag.
+
+   Currently, all watchpoint are locally enabled.  If you need to
+   enable them globally, read the comment which pertains to this in
+   x86_insert_aligned_watchpoint below.  */
+#define DR_LOCAL_ENABLE_SHIFT	0 /* Extra shift to the local enable bit.  */
+#define DR_GLOBAL_ENABLE_SHIFT	1 /* Extra shift to the global enable bit.  */
+#define DR_ENABLE_SIZE		2 /* Two enable bits per debug register.  */
+
+/* Local and global exact breakpoint enable flags (a.k.a. slowdown
+   flags).  These are only required on i386, to allow detection of the
+   exact instruction which caused a watchpoint to break; i486 and
+   later processors do that automatically.  We set these flags for
+   backwards compatibility.  */
+#define DR_LOCAL_SLOWDOWN	(0x100)
+#define DR_GLOBAL_SLOWDOWN	(0x200)
+
+/* Fields reserved by Intel.  This includes the GD (General Detect
+   Enable) flag, which causes a debug exception to be generated when a
+   MOV instruction accesses one of the debug registers.
+
+   FIXME: My Intel manual says we should use 0xF800, not 0xFC00.  */
+#define DR_CONTROL_RESERVED	(0xFC00)
+
+/* Auxiliary helper macros.  */
+
+/* A value that masks all fields in DR7 that are reserved by Intel.  */
+#define X86_DR_CONTROL_MASK	(~DR_CONTROL_RESERVED)
+
+/* The I'th debug register is vacant if its Local and Global Enable
+   bits are reset in the Debug Control register.  */
+#define X86_DR_VACANT(state, i) \
+  (((state)->dr_control_mirror & (3 << (DR_ENABLE_SIZE * (i)))) == 0)
+
+/* Locally enable the break/watchpoint in the I'th debug register.  */
+#define X86_DR_LOCAL_ENABLE(state, i) \
+  do { \
+    (state)->dr_control_mirror |= \
+      (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i))); \
+  } while (0)
+
+/* Globally enable the break/watchpoint in the I'th debug register.  */
+#define X86_DR_GLOBAL_ENABLE(state, i) \
+  do { \
+    (state)->dr_control_mirror |= \
+      (1 << (DR_GLOBAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i))); \
+  } while (0)
+
+/* Disable the break/watchpoint in the I'th debug register.  */
+#define X86_DR_DISABLE(state, i) \
+  do { \
+    (state)->dr_control_mirror &= \
+      ~(3 << (DR_ENABLE_SIZE * (i))); \
+  } while (0)
+
+/* Set in DR7 the RW and LEN fields for the I'th debug register.  */
+#define X86_DR_SET_RW_LEN(state, i, rwlen) \
+  do { \
+    (state)->dr_control_mirror &= \
+      ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
+    (state)->dr_control_mirror |= \
+      ((rwlen) << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
+  } while (0)
+
+/* Get from DR7 the RW and LEN fields for the I'th debug register.  */
+#define X86_DR_GET_RW_LEN(dr7, i) \
+  (((dr7) \
+    >> (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))) & 0x0f)
+
+/* Did the watchpoint whose address is in the I'th register break?  */
+#define X86_DR_WATCH_HIT(dr6, i) ((dr6) & (1 << (i)))
+
+/* Types of operations supported by x86_handle_nonaligned_watchpoint.  */
+typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } x86_wp_op_t;
+
+/* Print the values of the mirrored debug registers.  */
+
+static void
+x86_show_dr (struct x86_debug_reg_state *state,
+	     const char *func, CORE_ADDR addr,
+	     int len, enum target_hw_bp_type type)
+{
+  int i;
+
+  debug_printf ("%s", func);
+  if (addr || len)
+    debug_printf (" (addr=%s, len=%d, type=%s)",
+		  phex (addr, 8), len,
+		  type == hw_write ? "data-write"
+		  : (type == hw_read ? "data-read"
+		     : (type == hw_access ? "data-read/write"
+			: (type == hw_execute ? "instruction-execute"
+			   /* FIXME: if/when I/O read/write
+			      watchpoints are supported, add them
+			      here.  */
+			   : "??unknown??"))));
+  debug_printf (":\n");
+  debug_printf ("\tCONTROL (DR7): %s          STATUS (DR6): %s\n",
+		phex (state->dr_control_mirror, 8),
+		phex (state->dr_status_mirror, 8));
+  ALL_DEBUG_REGISTERS (i)
+    {
+      debug_printf ("\
+\tDR%d: addr=0x%s, ref.count=%d  DR%d: addr=0x%s, ref.count=%d\n",
+		    i, phex (state->dr_mirror[i],
+			     x86_get_debug_register_length ()),
+		    state->dr_ref_count[i],
+		    i + 1, phex (state->dr_mirror[i + 1],
+				 x86_get_debug_register_length ()),
+		    state->dr_ref_count[i + 1]);
+      i++;
+    }
+}
+
+/* Return the value of a 4-bit field for DR7 suitable for watching a
+   region of LEN bytes for accesses of type TYPE.  LEN is assumed to
+   have the value of 1, 2, or 4.  */
+
+static unsigned
+x86_length_and_rw_bits (int len, enum target_hw_bp_type type)
+{
+  unsigned rw;
+
+  switch (type)
+    {
+      case hw_execute:
+	rw = DR_RW_EXECUTE;
+	break;
+      case hw_write:
+	rw = DR_RW_WRITE;
+	break;
+      case hw_read:
+	internal_error (__FILE__, __LINE__,
+			_("The i386 doesn't support "
+			  "data-read watchpoints.\n"));
+      case hw_access:
+	rw = DR_RW_READ;
+	break;
+#if 0
+	/* Not yet supported.  */
+      case hw_io_access:
+	rw = DR_RW_IORW;
+	break;
+#endif
+      default:
+	internal_error (__FILE__, __LINE__, _("\
+Invalid hardware breakpoint type %d in x86_length_and_rw_bits.\n"),
+			(int) type);
+    }
+
+  switch (len)
+    {
+      case 1:
+	return (DR_LEN_1 | rw);
+      case 2:
+	return (DR_LEN_2 | rw);
+      case 4:
+	return (DR_LEN_4 | rw);
+      case 8:
+        if (TARGET_HAS_DR_LEN_8)
+ 	  return (DR_LEN_8 | rw);
+	/* ELSE FALL THROUGH */
+      default:
+	internal_error (__FILE__, __LINE__, _("\
+Invalid hardware breakpoint length %d in x86_length_and_rw_bits.\n"), len);
+    }
+}
+
+/* Insert a watchpoint at address ADDR, which is assumed to be aligned
+   according to the length of the region to watch.  LEN_RW_BITS is the
+   value of the bits from DR7 which describes the length and access
+   type of the region to be watched by this watchpoint.  Return 0 on
+   success, -1 on failure.  */
+
+static int
+x86_insert_aligned_watchpoint (struct x86_debug_reg_state *state,
+			       CORE_ADDR addr, unsigned len_rw_bits)
+{
+  int i;
+
+  if (!x86_dr_low_can_set_addr () || !x86_dr_low_can_set_control ())
+    return -1;
+
+  /* First, look for an occupied debug register with the same address
+     and the same RW and LEN definitions.  If we find one, we can
+     reuse it for this watchpoint as well (and save a register).  */
+  ALL_DEBUG_REGISTERS (i)
+    {
+      if (!X86_DR_VACANT (state, i)
+	  && state->dr_mirror[i] == addr
+	  && X86_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
+	{
+	  state->dr_ref_count[i]++;
+	  return 0;
+	}
+    }
+
+  /* Next, look for a vacant debug register.  */
+  ALL_DEBUG_REGISTERS (i)
+    {
+      if (X86_DR_VACANT (state, i))
+	break;
+    }
+
+  /* No more debug registers!  */
+  if (i >= DR_NADDR)
+    return -1;
+
+  /* Now set up the register I to watch our region.  */
+
+  /* Record the info in our local mirrored array.  */
+  state->dr_mirror[i] = addr;
+  state->dr_ref_count[i] = 1;
+  X86_DR_SET_RW_LEN (state, i, len_rw_bits);
+  /* Note: we only enable the watchpoint locally, i.e. in the current
+     task.  Currently, no x86 target allows or supports global
+     watchpoints; however, if any target would want that in the
+     future, GDB should probably provide a command to control whether
+     to enable watchpoints globally or locally, and the code below
+     should use global or local enable and slow-down flags as
+     appropriate.  */
+  X86_DR_LOCAL_ENABLE (state, i);
+  state->dr_control_mirror |= DR_LOCAL_SLOWDOWN;
+  state->dr_control_mirror &= X86_DR_CONTROL_MASK;
+
+  return 0;
+}
+
+/* Remove a watchpoint at address ADDR, which is assumed to be aligned
+   according to the length of the region to watch.  LEN_RW_BITS is the
+   value of the bits from DR7 which describes the length and access
+   type of the region watched by this watchpoint.  Return 0 on
+   success, -1 on failure.  */
+
+static int
+x86_remove_aligned_watchpoint (struct x86_debug_reg_state *state,
+			       CORE_ADDR addr, unsigned len_rw_bits)
+{
+  int i, retval = -1;
+  int all_vacant = 1;
+
+  ALL_DEBUG_REGISTERS (i)
+    {
+      if (!X86_DR_VACANT (state, i)
+	  && state->dr_mirror[i] == addr
+	  && X86_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
+	{
+	  if (--state->dr_ref_count[i] == 0) /* No longer in use?  */
+	    {
+	      /* Reset our mirror.  */
+	      state->dr_mirror[i] = 0;
+	      X86_DR_DISABLE (state, i);
+	      /* Even though not strictly necessary, clear out all
+		 bits in DR_CONTROL related to this debug register.
+		 Debug output is clearer when we don't have stale bits
+		 in place.  This also allows the assertion below.  */
+	      X86_DR_SET_RW_LEN (state, i, 0);
+	    }
+	  retval = 0;
+	}
+
+      if (!X86_DR_VACANT (state, i))
+	all_vacant = 0;
+    }
+
+  if (all_vacant)
+    {
+      /* Even though not strictly necessary, clear out all of
+	 DR_CONTROL, so that when we have no debug registers in use,
+	 we end up with DR_CONTROL == 0.  The Linux support relies on
+	 this for an optimization.  Plus, it makes for clearer debug
+	 output.  */
+      state->dr_control_mirror &= ~DR_LOCAL_SLOWDOWN;
+
+      gdb_assert (state->dr_control_mirror == 0);
+    }
+  return retval;
+}
+
+/* Insert or remove a (possibly non-aligned) watchpoint, or count the
+   number of debug registers required to watch a region at address
+   ADDR whose length is LEN for accesses of type TYPE.  Return 0 on
+   successful insertion or removal, a positive number when queried
+   about the number of registers, or -1 on failure.  If WHAT is not a
+   valid value, bombs through internal_error.  */
+
+static int
+x86_handle_nonaligned_watchpoint (struct x86_debug_reg_state *state,
+				  x86_wp_op_t what, CORE_ADDR addr, int len,
+				  enum target_hw_bp_type type)
+{
+  int retval = 0;
+  int max_wp_len = TARGET_HAS_DR_LEN_8 ? 8 : 4;
+
+  static const int size_try_array[8][8] =
+  {
+    {1, 1, 1, 1, 1, 1, 1, 1},	/* Trying size one.  */
+    {2, 1, 2, 1, 2, 1, 2, 1},	/* Trying size two.  */
+    {2, 1, 2, 1, 2, 1, 2, 1},	/* Trying size three.  */
+    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size four.  */
+    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size five.  */
+    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size six.  */
+    {4, 1, 2, 1, 4, 1, 2, 1},	/* Trying size seven.  */
+    {8, 1, 2, 1, 4, 1, 2, 1},	/* Trying size eight.  */
+  };
+
+  while (len > 0)
+    {
+      int align = addr % max_wp_len;
+      /* Four (eight on AMD64) is the maximum length a debug register
+	 can watch.  */
+      int try = (len > max_wp_len ? (max_wp_len - 1) : len - 1);
+      int size = size_try_array[try][align];
+
+      if (what == WP_COUNT)
+	{
+	  /* size_try_array[] is defined such that each iteration
+	     through the loop is guaranteed to produce an address and a
+	     size that can be watched with a single debug register.
+	     Thus, for counting the registers required to watch a
+	     region, we simply need to increment the count on each
+	     iteration.  */
+	  retval++;
+	}
+      else
+	{
+	  unsigned len_rw = x86_length_and_rw_bits (size, type);
+
+	  if (what == WP_INSERT)
+	    retval = x86_insert_aligned_watchpoint (state, addr, len_rw);
+	  else if (what == WP_REMOVE)
+	    retval = x86_remove_aligned_watchpoint (state, addr, len_rw);
+	  else
+	    internal_error (__FILE__, __LINE__, _("\
+Invalid value %d of operation in x86_handle_nonaligned_watchpoint.\n"),
+			    (int) what);
+	  if (retval)
+	    break;
+	}
+
+      addr += size;
+      len -= size;
+    }
+
+  return retval;
+}
+
+/* Update the inferior debug registers state, in STATE, with the
+   new debug registers state, in NEW_STATE.  */
+
+static void
+x86_update_inferior_debug_regs (struct x86_debug_reg_state *state,
+				struct x86_debug_reg_state *new_state)
+{
+  int i;
+
+  ALL_DEBUG_REGISTERS (i)
+    {
+      if (X86_DR_VACANT (new_state, i) != X86_DR_VACANT (state, i))
+	x86_dr_low_set_addr (new_state, i);
+      else
+	gdb_assert (new_state->dr_mirror[i] == state->dr_mirror[i]);
+    }
+
+  if (new_state->dr_control_mirror != state->dr_control_mirror)
+    x86_dr_low_set_control (new_state);
+
+  *state = *new_state;
+}
+
+/* Insert a watchpoint to watch a memory region which starts at
+   address ADDR and whose length is LEN bytes.  Watch memory accesses
+   of the type TYPE.  Return 0 on success, -1 on failure.  */
+
+int
+x86_dr_insert_watchpoint (struct x86_debug_reg_state *state,
+			  enum target_hw_bp_type type,
+			  CORE_ADDR addr, int len)
+{
+  int retval;
+  /* Work on a local copy of the debug registers, and on success,
+     commit the change back to the inferior.  */
+  struct x86_debug_reg_state local_state = *state;
+
+  if (type == hw_read)
+    return 1; /* unsupported */
+
+  if (((len != 1 && len != 2 && len != 4)
+       && !(TARGET_HAS_DR_LEN_8 && len == 8))
+      || addr % len != 0)
+    {
+      retval = x86_handle_nonaligned_watchpoint (&local_state,
+						 WP_INSERT,
+						 addr, len, type);
+    }
+  else
+    {
+      unsigned len_rw = x86_length_and_rw_bits (len, type);
+
+      retval = x86_insert_aligned_watchpoint (&local_state,
+					      addr, len_rw);
+    }
+
+  if (retval == 0)
+    x86_update_inferior_debug_regs (state, &local_state);
+
+  if (show_debug_regs)
+    x86_show_dr (state, "insert_watchpoint", addr, len, type);
+
+  return retval;
+}
+
+/* Remove a watchpoint that watched the memory region which starts at
+   address ADDR, whose length is LEN bytes, and for accesses of the
+   type TYPE.  Return 0 on success, -1 on failure.  */
+
+int
+x86_dr_remove_watchpoint (struct x86_debug_reg_state *state,
+			  enum target_hw_bp_type type,
+			  CORE_ADDR addr, int len)
+{
+  int retval;
+  /* Work on a local copy of the debug registers, and on success,
+     commit the change back to the inferior.  */
+  struct x86_debug_reg_state local_state = *state;
+
+  if (((len != 1 && len != 2 && len != 4)
+       && !(TARGET_HAS_DR_LEN_8 && len == 8))
+      || addr % len != 0)
+    {
+      retval = x86_handle_nonaligned_watchpoint (&local_state,
+						 WP_REMOVE,
+						 addr, len, type);
+    }
+  else
+    {
+      unsigned len_rw = x86_length_and_rw_bits (len, type);
+
+      retval = x86_remove_aligned_watchpoint (&local_state,
+					      addr, len_rw);
+    }
+
+  if (retval == 0)
+    x86_update_inferior_debug_regs (state, &local_state);
+
+  if (show_debug_regs)
+    x86_show_dr (state, "remove_watchpoint", addr, len, type);
+
+  return retval;
+}
+
+/* Return non-zero if we can watch a memory region that starts at
+   address ADDR and whose length is LEN bytes.  */
+
+int
+x86_dr_region_ok_for_watchpoint (struct x86_debug_reg_state *state,
+				 CORE_ADDR addr, int len)
+{
+  int nregs;
+
+  /* Compute how many aligned watchpoints we would need to cover this
+     region.  */
+  nregs = x86_handle_nonaligned_watchpoint (state, WP_COUNT,
+					     addr, len, hw_write);
+  return nregs <= DR_NADDR ? 1 : 0;
+}
+
+/* If the inferior has some break/watchpoint that triggered, set the
+   address associated with that break/watchpoint and return non-zero.
+   Otherwise, return zero.  */
+
+int
+x86_dr_stopped_data_address (struct x86_debug_reg_state *state,
+			     CORE_ADDR *addr_p)
+{
+  CORE_ADDR addr = 0;
+  int i;
+  int rc = 0;
+  /* The current thread's DR_STATUS.  We always need to read this to
+     check whether some watchpoint caused the trap.  */
+  unsigned status;
+  /* We need DR_CONTROL as well, but only iff DR_STATUS indicates a
+     data breakpoint trap.  Only fetch it when necessary, to avoid an
+     unnecessary extra syscall when no watchpoint triggered.  */
+  int control_p = 0;
+  unsigned control = 0;
+
+  /* In non-stop/async, threads can be running while we change the
+     global dr_mirror (and friends).  Say, we set a watchpoint, and
+     let threads resume.  Now, say you delete the watchpoint, or
+     add/remove watchpoints such that dr_mirror changes while threads
+     are running.  On targets that support non-stop,
+     inserting/deleting watchpoints updates the global dr_mirror only.
+     It does not update the real thread's debug registers; that's only
+     done prior to resume.  Instead, if threads are running when the
+     mirror changes, a temporary and transparent stop on all threads
+     is forced so they can get their copy of the debug registers
+     updated on re-resume.  Now, say, a thread hit a watchpoint before
+     having been updated with the new dr_mirror contents, and we
+     haven't yet handled the corresponding SIGTRAP.  If we trusted
+     dr_mirror below, we'd mistake the real trapped address (from the
+     last time we had updated debug registers in the thread) with
+     whatever was currently in dr_mirror.  So to fix this, dr_mirror
+     always represents intention, what we _want_ threads to have in
+     debug registers.  To get at the address and cause of the trap, we
+     need to read the state the thread still has in its debug
+     registers.
+
+     In sum, always get the current debug register values the current
+     thread has, instead of trusting the global mirror.  If the thread
+     was running when we last changed watchpoints, the mirror no
+     longer represents what was set in this thread's debug
+     registers.  */
+  status = x86_dr_low_get_status ();
+
+  ALL_DEBUG_REGISTERS (i)
+    {
+      if (!X86_DR_WATCH_HIT (status, i))
+	continue;
+
+      if (!control_p)
+	{
+	  control = x86_dr_low_get_control ();
+	  control_p = 1;
+	}
+
+      /* This second condition makes sure DRi is set up for a data
+	 watchpoint, not a hardware breakpoint.  The reason is that
+	 GDB doesn't call the target_stopped_data_address method
+	 except for data watchpoints.  In other words, I'm being
+	 paranoiac.  */
+      if (X86_DR_GET_RW_LEN (control, i) != 0)
+	{
+	  addr = x86_dr_low_get_addr (i);
+	  rc = 1;
+	  if (show_debug_regs)
+	    x86_show_dr (state, "watchpoint_hit", addr, -1, hw_write);
+	}
+    }
+
+  if (show_debug_regs && addr == 0)
+    x86_show_dr (state, "stopped_data_addr", 0, 0, hw_write);
+
+  if (rc)
+    *addr_p = addr;
+  return rc;
+}
+
+/* Return non-zero if the inferior has some watchpoint that triggered.
+   Otherwise return zero.  */
+
+int
+x86_dr_stopped_by_watchpoint (struct x86_debug_reg_state *state)
+{
+  CORE_ADDR addr = 0;
+  return x86_dr_stopped_data_address (state, &addr);
+}
diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
new file mode 100644
index 0000000..fb179a5
--- /dev/null
+++ b/gdb/nat/x86-dregs.h
@@ -0,0 +1,126 @@
+/* Debug register code for x86 (i386 and x86-64).
+
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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/>.  */
+
+/* Support for hardware watchpoints and breakpoints using the x86
+   debug registers.
+
+   This provides several functions for inserting and removing
+   hardware-assisted breakpoints and watchpoints, testing if one or
+   more of the watchpoints triggered and at what address, checking
+   whether a given region can be watched, etc.
+
+   The functions below implement debug registers sharing by reference
+   counts, and allow to watch regions up to 16 bytes long
+   (32 bytes on 64 bit hosts).  */
+
+#ifndef X86_DREGS_H
+#define X86_DREGS_H 1
+
+/* Forward declaration.  */
+enum target_hw_bp_type;
+
+/* Low-level function vector.  */
+
+struct x86_dr_low_type
+  {
+    /* Set the debug control (DR7) register to a given value for
+       all LWPs.  May be NULL if the debug control register cannot
+       be set.  */
+    void (*set_control) (unsigned long);
+
+    /* Put an address into one debug register for all LWPs.  May
+       be NULL if debug registers cannot be set*/
+    void (*set_addr) (int, CORE_ADDR);
+
+    /* Return the address in a given debug register of the current
+       LWP.  */
+    CORE_ADDR (*get_addr) (int);
+
+    /* Return the value of the debug status (DR6) register for
+       current LWP.  */
+    unsigned long (*get_status) (void);
+
+    /* Return the value of the debug control (DR7) register for
+       current LWP.  */
+    unsigned long (*get_control) (void);
+
+    /* Number of bytes used for debug registers (4 or 8).  */
+    int debug_register_length;
+  };
+
+extern struct x86_dr_low_type x86_dr_low;
+
+/* Debug registers' indices.  */
+#define DR_FIRSTADDR 0
+#define DR_LASTADDR  3
+#define DR_NADDR     4	/* The number of debug address registers.  */
+#define DR_STATUS    6	/* Index of debug status register (DR6).  */
+#define DR_CONTROL   7	/* Index of debug control register (DR7).  */
+
+/* Global state needed to track h/w watchpoints.  */
+
+struct x86_debug_reg_state
+{
+  /* Mirror the inferior's DRi registers.  We keep the status and
+     control registers separated because they don't hold addresses.
+     Note that since we can change these mirrors while threads are
+     running, we never trust them to explain a cause of a trap.
+     For that, we need to peek directly in the inferior registers.  */
+  CORE_ADDR dr_mirror[DR_NADDR];
+  unsigned dr_status_mirror, dr_control_mirror;
+
+  /* Reference counts for each debug register.  */
+  int dr_ref_count[DR_NADDR];
+};
+
+/* A macro to loop over all debug registers.  */
+#define ALL_DEBUG_REGISTERS(i)	for (i = 0; i < DR_NADDR; i++)
+
+/* Insert a watchpoint to watch a memory region which starts at
+   address ADDR and whose length is LEN bytes.  Watch memory accesses
+   of the type TYPE.  Return 0 on success, -1 on failure.  */
+extern int x86_dr_insert_watchpoint (struct x86_debug_reg_state *state,
+				     enum target_hw_bp_type type,
+				     CORE_ADDR addr,
+				     int len);
+
+/* Remove a watchpoint that watched the memory region which starts at
+   address ADDR, whose length is LEN bytes, and for accesses of the
+   type TYPE.  Return 0 on success, -1 on failure.  */
+extern int x86_dr_remove_watchpoint (struct x86_debug_reg_state *state,
+				     enum target_hw_bp_type type,
+				     CORE_ADDR addr,
+				     int len);
+
+/* Return non-zero if we can watch a memory region that starts at
+   address ADDR and whose length is LEN bytes.  */
+extern int x86_dr_region_ok_for_watchpoint (struct x86_debug_reg_state *state,
+					    CORE_ADDR addr, int len);
+
+/* If the inferior has some break/watchpoint that triggered, set the
+   address associated with that break/watchpoint and return true.
+   Otherwise, return false.  */
+extern int x86_dr_stopped_data_address (struct x86_debug_reg_state *state,
+					CORE_ADDR *addr_p);
+
+/* Return true if the inferior has some watchpoint that triggered.
+   Otherwise return false.  */
+extern int x86_dr_stopped_by_watchpoint (struct x86_debug_reg_state *state);
+
+#endif /* X86_DREGS_H */
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 73665e5..6f24e9c 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -63,7 +63,7 @@
 
 #include "windows-tdep.h"
 #include "windows-nat.h"
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "complaints.h"
 #include "inf-child.h"
 
@@ -1910,7 +1910,7 @@ windows_detach (struct target_ops *ops, const char *args, int from_tty)
       gdb_flush (gdb_stdout);
     }
 
-  i386_cleanup_dregs ();
+  x86_cleanup_dregs ();
   inferior_ptid = null_ptid;
   detach_inferior (current_event.dwProcessId);
 
@@ -2361,7 +2361,7 @@ static void
 windows_mourn_inferior (struct target_ops *ops)
 {
   (void) windows_continue (DBG_CONTINUE, -1, 0);
-  i386_cleanup_dregs();
+  x86_cleanup_dregs();
   if (open_process_used)
     {
       CHECK (CloseHandle (current_process_handle));
@@ -2593,16 +2593,16 @@ _initialize_windows_nat (void)
 
   t = windows_target ();
 
-  i386_use_watchpoints (t);
+  x86_use_watchpoints (t);
 
-  i386_dr_low.set_control = cygwin_set_dr7;
-  i386_dr_low.set_addr = cygwin_set_dr;
-  i386_dr_low.get_addr = cygwin_get_dr;
-  i386_dr_low.get_status = cygwin_get_dr6;
-  i386_dr_low.get_control = cygwin_get_dr7;
+  x86_dr_low.set_control = cygwin_set_dr7;
+  x86_dr_low.set_addr = cygwin_set_dr;
+  x86_dr_low.get_addr = cygwin_get_dr;
+  x86_dr_low.get_status = cygwin_get_dr6;
+  x86_dr_low.get_control = cygwin_get_dr7;
 
-  /* i386_dr_low.debug_register_length field is set by
-     calling i386_set_debug_register_length function
+  /* x86_dr_low.debug_register_length field is set by
+     calling x86_set_debug_register_length function
      in processor windows specific native file.  */
 
   add_target (t);
diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index 7527370..60e4e97 100644
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -25,7 +25,7 @@
 #include <sys/user.h>
 #include <sys/procfs.h>
 
-#include "i386-nat.h"
+#include "x86-nat.h"
 #include "linux-nat.h"
 #ifndef __x86_64__
 #include "i386-linux-nat.h"
@@ -179,8 +179,8 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp)
 
   if (lwp->arch_private->debug_registers_changed)
     {
-      struct i386_debug_reg_state *state
-	= i386_debug_reg_state (ptid_get_pid (lwp->ptid));
+      struct x86_debug_reg_state *state
+	= x86_debug_reg_state (ptid_get_pid (lwp->ptid));
       int i;
 
       /* On Linux kernel before 2.6.33 commit
@@ -202,7 +202,7 @@ x86_linux_prepare_to_resume (struct lwp_info *lwp)
 
 	    /* If we're setting a watchpoint, any change the inferior
 	       had done itself to the debug registers needs to be
-	       discarded, otherwise, i386_stopped_data_address can get
+	       discarded, otherwise, x86_stopped_data_address can get
 	       confused.  */
 	    clear_status = 1;
 	  }
@@ -236,8 +236,8 @@ static void
 x86_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
 {
   pid_t parent_pid;
-  struct i386_debug_reg_state *parent_state;
-  struct i386_debug_reg_state *child_state;
+  struct x86_debug_reg_state *parent_state;
+  struct x86_debug_reg_state *child_state;
 
   /* NULL means no watchpoint has ever been set in the parent.  In
      that case, there's nothing to do.  */
@@ -259,8 +259,8 @@ x86_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
      this compatible with older Linux kernels too.  */
 
   parent_pid = ptid_get_pid (parent->ptid);
-  parent_state = i386_debug_reg_state (parent_pid);
-  child_state = i386_debug_reg_state (child_pid);
+  parent_state = x86_debug_reg_state (parent_pid);
+  child_state = x86_debug_reg_state (child_pid);
   *child_state = *parent_state;
 }
 
@@ -271,7 +271,7 @@ static void (*super_post_startup_inferior) (struct target_ops *self,
 static void
 x86_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid)
 {
-  i386_cleanup_dregs ();
+  x86_cleanup_dregs ();
   super_post_startup_inferior (self, ptid);
 }
 
@@ -530,13 +530,13 @@ x86_linux_create_target (void)
   struct target_ops *t = linux_target ();
 
   /* Initialize the debug register function vectors.  */
-  i386_use_watchpoints (t);
-  i386_dr_low.set_control = x86_linux_dr_set_control;
-  i386_dr_low.set_addr = x86_linux_dr_set_addr;
-  i386_dr_low.get_addr = x86_linux_dr_get_addr;
-  i386_dr_low.get_status = x86_linux_dr_get_status;
-  i386_dr_low.get_control = x86_linux_dr_get_control;
-  i386_set_debug_register_length (sizeof (void *));
+  x86_use_watchpoints (t);
+  x86_dr_low.set_control = x86_linux_dr_set_control;
+  x86_dr_low.set_addr = x86_linux_dr_set_addr;
+  x86_dr_low.get_addr = x86_linux_dr_get_addr;
+  x86_dr_low.get_status = x86_linux_dr_get_status;
+  x86_dr_low.get_control = x86_linux_dr_get_control;
+  x86_set_debug_register_length (sizeof (void *));
 
   /* Override the GNU/Linux inferior startup hook.  */
   super_post_startup_inferior = t->to_post_startup_inferior;
@@ -563,6 +563,6 @@ x86_linux_add_target (struct target_ops *t)
   linux_nat_add_target (t);
   linux_nat_set_new_thread (t, x86_linux_new_thread);
   linux_nat_set_new_fork (t, x86_linux_new_fork);
-  linux_nat_set_forget_process (t, i386_forget_process);
+  linux_nat_set_forget_process (t, x86_forget_process);
   linux_nat_set_prepare_to_resume (t, x86_linux_prepare_to_resume);
 }
diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
new file mode 100644
index 0000000..a016e60
--- /dev/null
+++ b/gdb/x86-nat.c
@@ -0,0 +1,313 @@
+/* Native-dependent code for x86 (i386 and x86-64).
+
+   Copyright (C) 2001-2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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/>.  */
+
+#include "defs.h"
+#include "x86-nat.h"
+#include "gdbcmd.h"
+#include "inferior.h"
+
+/* Support for hardware watchpoints and breakpoints using the x86
+   debug registers.
+
+   This provides several functions for inserting and removing
+   hardware-assisted breakpoints and watchpoints, testing if one or
+   more of the watchpoints triggered and at what address, checking
+   whether a given region can be watched, etc.
+
+   The functions below implement debug registers sharing by reference
+   counts, and allow to watch regions up to 16 bytes long.  */
+
+/* Low-level function vector.  */
+struct x86_dr_low_type x86_dr_low;
+
+/* Per-process data.  We don't bind this to a per-inferior registry
+   because of targets like x86 GNU/Linux that need to keep track of
+   processes that aren't bound to any inferior (e.g., fork children,
+   checkpoints).  */
+
+struct x86_process_info
+{
+  /* Linked list.  */
+  struct x86_process_info *next;
+
+  /* The process identifier.  */
+  pid_t pid;
+
+  /* Copy of x86 hardware debug registers.  */
+  struct x86_debug_reg_state state;
+};
+
+static struct x86_process_info *x86_process_list = NULL;
+
+/* Find process data for process PID.  */
+
+static struct x86_process_info *
+x86_find_process_pid (pid_t pid)
+{
+  struct x86_process_info *proc;
+
+  for (proc = x86_process_list; proc; proc = proc->next)
+    if (proc->pid == pid)
+      return proc;
+
+  return NULL;
+}
+
+/* Add process data for process PID.  Returns newly allocated info
+   object.  */
+
+static struct x86_process_info *
+x86_add_process (pid_t pid)
+{
+  struct x86_process_info *proc;
+
+  proc = xcalloc (1, sizeof (*proc));
+  proc->pid = pid;
+
+  proc->next = x86_process_list;
+  x86_process_list = proc;
+
+  return proc;
+}
+
+/* Get data specific info for process PID, creating it if necessary.
+   Never returns NULL.  */
+
+static struct x86_process_info *
+x86_process_info_get (pid_t pid)
+{
+  struct x86_process_info *proc;
+
+  proc = x86_find_process_pid (pid);
+  if (proc == NULL)
+    proc = x86_add_process (pid);
+
+  return proc;
+}
+
+/* Get debug registers state for process PID.  */
+
+struct x86_debug_reg_state *
+x86_debug_reg_state (pid_t pid)
+{
+  return &x86_process_info_get (pid)->state;
+}
+
+/* See declaration in i386-nat.h.  */
+
+void
+x86_forget_process (pid_t pid)
+{
+  struct x86_process_info *proc, **proc_link;
+
+  proc = x86_process_list;
+  proc_link = &x86_process_list;
+
+  while (proc != NULL)
+    {
+      if (proc->pid == pid)
+	{
+	  *proc_link = proc->next;
+
+	  xfree (proc);
+	  return;
+	}
+
+      proc_link = &proc->next;
+      proc = *proc_link;
+    }
+}
+
+/* Clear the reference counts and forget everything we knew about the
+   debug registers.  */
+
+void
+x86_cleanup_dregs (void)
+{
+  /* Starting from scratch has the same effect.  */
+  x86_forget_process (ptid_get_pid (inferior_ptid));
+}
+
+/* Insert a watchpoint to watch a memory region which starts at
+   address ADDR and whose length is LEN bytes.  Watch memory accesses
+   of the type TYPE.  Return 0 on success, -1 on failure.  */
+
+static int
+x86_insert_watchpoint (struct target_ops *self,
+		       CORE_ADDR addr, int len, int type,
+		       struct expression *cond)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_insert_watchpoint (state, type, addr, len);
+}
+
+/* Remove a watchpoint that watched the memory region which starts at
+   address ADDR, whose length is LEN bytes, and for accesses of the
+   type TYPE.  Return 0 on success, -1 on failure.  */
+static int
+x86_remove_watchpoint (struct target_ops *self,
+		       CORE_ADDR addr, int len, int type,
+		       struct expression *cond)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_remove_watchpoint (state, type, addr, len);
+}
+
+/* Return non-zero if we can watch a memory region that starts at
+   address ADDR and whose length is LEN bytes.  */
+
+static int
+x86_region_ok_for_watchpoint (struct target_ops *self,
+			      CORE_ADDR addr, int len)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_region_ok_for_watchpoint (state, addr, len);
+}
+
+/* If the inferior has some break/watchpoint that triggered, set the
+   address associated with that break/watchpoint and return non-zero.
+   Otherwise, return zero.  */
+
+static int
+x86_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_stopped_data_address (state, addr_p);
+}
+
+/* Return non-zero if the inferior has some watchpoint that triggered.
+   Otherwise return zero.  */
+
+static int
+x86_stopped_by_watchpoint (struct target_ops *ops)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_stopped_by_watchpoint (state);
+}
+
+/* Insert a hardware-assisted breakpoint at BP_TGT->placed_address.
+   Return 0 on success, EBUSY on failure.  */
+
+static int
+x86_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
+			  struct bp_target_info *bp_tgt)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_insert_watchpoint (state, hw_execute,
+				   bp_tgt->placed_address, 1) ? EBUSY : 0;
+}
+
+/* Remove a hardware-assisted breakpoint at BP_TGT->placed_address.
+   Return 0 on success, -1 on failure.  */
+
+static int
+x86_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
+			  struct bp_target_info *bp_tgt)
+{
+  struct x86_debug_reg_state *state
+    = x86_debug_reg_state (ptid_get_pid (inferior_ptid));
+
+  return x86_dr_remove_watchpoint (state, hw_execute,
+				   bp_tgt->placed_address, 1);
+}
+
+/* Returns the number of hardware watchpoints of type TYPE that we can
+   set.  Value is positive if we can set CNT watchpoints, zero if
+   setting watchpoints of type TYPE is not supported, and negative if
+   CNT is more than the maximum number of watchpoints of type TYPE
+   that we can support.  TYPE is one of bp_hardware_watchpoint,
+   bp_read_watchpoint, bp_write_watchpoint, or bp_hardware_breakpoint.
+   CNT is the number of such watchpoints used so far (including this
+   one).  OTHERTYPE is non-zero if other types of watchpoints are
+   currently enabled.
+
+   We always return 1 here because we don't have enough information
+   about possible overlap of addresses that they want to watch.  As an
+   extreme example, consider the case where all the watchpoints watch
+   the same address and the same region length: then we can handle a
+   virtually unlimited number of watchpoints, due to debug register
+   sharing implemented via reference counts in i386-nat.c.  */
+
+static int
+x86_can_use_hw_breakpoint (struct target_ops *self,
+			   int type, int cnt, int othertype)
+{
+  return 1;
+}
+
+static void
+add_show_debug_regs_command (void)
+{
+  /* A maintenance command to enable printing the internal DRi mirror
+     variables.  */
+  add_setshow_boolean_cmd ("show-debug-regs", class_maintenance,
+			   &show_debug_regs, _("\
+Set whether to show variables that mirror the x86 debug registers."), _("\
+Show whether to show variables that mirror the x86 debug registers."), _("\
+Use \"on\" to enable, \"off\" to disable.\n\
+If enabled, the debug registers values are shown when GDB inserts\n\
+or removes a hardware breakpoint or watchpoint, and when the inferior\n\
+triggers a breakpoint or watchpoint."),
+			   NULL,
+			   NULL,
+			   &maintenance_set_cmdlist,
+			   &maintenance_show_cmdlist);
+}
+
+/* There are only two global functions left.  */
+
+void
+x86_use_watchpoints (struct target_ops *t)
+{
+  /* 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.  */
+  t->to_have_continuable_watchpoint = 1;
+
+  t->to_can_use_hw_breakpoint = x86_can_use_hw_breakpoint;
+  t->to_region_ok_for_hw_watchpoint = x86_region_ok_for_watchpoint;
+  t->to_stopped_by_watchpoint = x86_stopped_by_watchpoint;
+  t->to_stopped_data_address = x86_stopped_data_address;
+  t->to_insert_watchpoint = x86_insert_watchpoint;
+  t->to_remove_watchpoint = x86_remove_watchpoint;
+  t->to_insert_hw_breakpoint = x86_insert_hw_breakpoint;
+  t->to_remove_hw_breakpoint = x86_remove_hw_breakpoint;
+}
+
+void
+x86_set_debug_register_length (int len)
+{
+  /* This function should be called only once for each native target.  */
+  gdb_assert (x86_dr_low.debug_register_length == 0);
+  gdb_assert (len == 4 || len == 8);
+  x86_dr_low.debug_register_length = len;
+  add_show_debug_regs_command ();
+}
diff --git a/gdb/x86-nat.h b/gdb/x86-nat.h
new file mode 100644
index 0000000..df5e9f2
--- /dev/null
+++ b/gdb/x86-nat.h
@@ -0,0 +1,57 @@
+/* Native-dependent code for x86 (i386 and x86-64).
+
+   Low level functions to implement Oeprating System specific
+   code to manipulate x86 debug registers.
+
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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/>.  */
+
+#ifndef X86_NAT_H
+#define X86_NAT_H 1
+
+#include "nat/x86-dregs.h"
+
+/* Hardware-assisted breakpoints and watchpoints.  */
+
+/* Add watchpoint methods to the provided target_ops.  
+   Targets using x86 family debug registers for watchpoints should call
+   this.  */
+struct target_ops;
+extern void x86_use_watchpoints (struct target_ops *);
+
+/* Use this function to set x86_dr_low debug_register_length field
+   rather than setting it directly to check that the length is only
+   set once.  It also enables the 'maint set/show show-debug-regs' 
+   command.  */
+
+extern void x86_set_debug_register_length (int len);
+
+/* Use this function to reset the x86-nat.c debug register state.  */
+
+extern void x86_cleanup_dregs (void);
+
+/* Return a pointer to the local mirror of the debug registers of
+   process PID.  */
+
+extern struct x86_debug_reg_state *x86_debug_reg_state (pid_t pid);
+
+/* Called whenever GDB is no longer debugging process PID.  It deletes
+   data structures that keep track of debug register state.  */
+
+extern void x86_forget_process (pid_t pid);
+
+#endif /* X86_NAT_H */
