Rename 32- and 64-bit Intel files from "i386" to "x86"

This commit renames nine files that contain code used by both 32- and
64-bit Intel ports such that their names are prefixed with "x86"
rather than "i386".  All types, functions and variables within these
files are likewise renamed such that their names are prefixed with
"x86" rather than "i386".  This makes GDB follow the convention used
by gdbserver such that 32-bit Intel code lives in files called
"i386-*", 64-bit Intel code lives in files called "amd64-*", and code
for both 32- and 64-bit Intel lives in files called "x86-*".

This commit only renames OS-independent files.  The Linux ports of
both GDB and gdbserver now follow the i386/amd64/x86 convention fully.
Some ports still use the old convention where "i386" in file/function/
type/variable names can mean "32-bit only" or "32- and 64-bit" but I
don't want to touch ports I can't fully test except where absolutely
necessary.

gdb/ChangeLog:

	* i386-nat.h: Renamed as...
	* x86-nat.h: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.
	* i386-nat.c: Renamed as...
	* x86-nat.c: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.
	* common/i386-xstate.h: Renamed as...
	* common/x86-xstate.h: New file.  All type, function and variable
	name prefixes changed from "i386_" to "x86_".  All references
	updated.
	* nat/i386-cpuid.h: Renamed as...
	* nat/x86-cpuid.h: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.
	* nat/i386-gcc-cpuid.h: Renamed as...
	* nat/x86-gcc-cpuid.h: New file.  All type, function and variable
	name prefixes changed from "i386_" to "x86_".  All references
	updated.
	* nat/i386-dregs.h: Renamed as...
	* nat/x86-dregs.h: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.
	* nat/i386-dregs.c: Renamed as...
	* nat/x86-dregs.c: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.

gdb/gdbserver/ChangeLog:

	* i386-low.h: Renamed as...
	* x86-low.h: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.
	* i386-low.c: Renamed as...
	* x86-low.c: New file.  All type, function and variable name
	prefixes changed from "i386_" to "x86_".  All references updated.

5 files changed, 132 insertions, 132 deletions

diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index f6fdbda..e0106fa 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -29,7 +29,7 @@
 #include "regcache.h"
 #include "gdbthread.h"
 #include "gdb_wait.h"
-#include "i386-cpuid.h"
+#include "x86-cpuid.h"
 
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
@@ -348,7 +348,7 @@ intel_supports_btrace (void)
 {
   unsigned int cpuid, model, family;
 
-  if (!i386_cpuid (1, &cpuid, NULL, NULL, NULL))
+  if (!x86_cpuid (1, &cpuid, NULL, NULL, NULL))
     return 0;
 
   family = (cpuid >> 8) & 0xf;
@@ -389,7 +389,7 @@ cpu_supports_btrace (void)
 {
   unsigned int ebx, ecx, edx;
 
-  if (!i386_cpuid (0, NULL, &ebx, &ecx, &edx))
+  if (!x86_cpuid (0, NULL, &ebx, &ecx, &edx))
     return 0;
 
   if (ebx == signature_INTEL_ebx && ecx == signature_INTEL_ecx
diff --git a/gdb/nat/i386-cpuid.h b/gdb/nat/x86-cpuid.h
index 9aea054..3e4a481 100644
--- a/gdb/nat/i386-cpuid.h
+++ b/gdb/nat/x86-cpuid.h
@@ -16,11 +16,11 @@
    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_CPUID_COMMON_H
-#define I386_CPUID_COMMON_H
+#ifndef X86_CPUID_COMMON_H
+#define X86_CPUID_COMMON_H
 
 /* Always include the header for the cpu bit defines.  */
-#include "i386-gcc-cpuid.h"
+#include "x86-gcc-cpuid.h"
 
 #if defined(__i386__) || defined(__x86_64__)
 
@@ -30,7 +30,7 @@
    unsupported cpuid level.  Pointers may be non-null.  */
 
 static __inline int
-i386_cpuid (unsigned int __level,
+x86_cpuid (unsigned int __level,
 	    unsigned int *__eax, unsigned int *__ebx,
 	    unsigned int *__ecx, unsigned int *__edx)
 {
@@ -51,7 +51,7 @@ i386_cpuid (unsigned int __level,
 #else
 
 static __inline int
-i386_cpuid (unsigned int __level,
+x86_cpuid (unsigned int __level,
 	    unsigned int *__eax, unsigned int *__ebx,
 	    unsigned int *__ecx, unsigned int *__edx)
 {
@@ -60,4 +60,4 @@ i386_cpuid (unsigned int __level,
 
 #endif /* i386 && x86_64 */
 
-#endif /* I386_CPUID_COMMON_H */
+#endif /* X86_CPUID_COMMON_H */
diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/x86-dregs.c
index e3272cd..5381c77 100644
--- a/gdb/nat/i386-dregs.c
+++ b/gdb/nat/x86-dregs.c
@@ -1,4 +1,4 @@
-/* Debug register code for the i386.
+/* Debug register code for x86 (i386 and x86-64).
 
    Copyright (C) 2001-2014 Free Software Foundation, Inc.
 
@@ -23,9 +23,9 @@
 #include "defs.h"
 #include "inferior.h"
 #endif
-#include "i386-dregs.h"
+#include "x86-dregs.h"
 
-/* Support for hardware watchpoints and breakpoints using the i386
+/* Support for hardware watchpoints and breakpoints using the x86
    debug registers.
 
    This provides several functions for inserting and removing
@@ -39,34 +39,34 @@
 /* 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)
+#define x86_dr_low_can_set_addr() (x86_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)]))
+#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 i386_dr_low_get_addr(i) (i386_dr_low.get_addr ((i)))
+#define x86_dr_low_get_addr(i) (x86_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)
+#define x86_dr_low_can_set_control() (x86_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))
+#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 i386_dr_low_get_control() (i386_dr_low.get_control ())
+#define x86_dr_low_get_control() (x86_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 ())
+#define x86_dr_low_get_status() (x86_dr_low.get_status ())
 
 /* Return the debug register size, in bytes.  */
-#define i386_get_debug_register_length() \
-  (i386_dr_low.debug_register_length)
+#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 (i386_get_debug_register_length () == 8)
+#define TARGET_HAS_DR_LEN_8 (x86_get_debug_register_length () == 8)
 
 /* DR7 Debug Control register fields.  */
 
@@ -104,7 +104,7 @@
 
    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.  */
+   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.  */
@@ -127,36 +127,36 @@
 /* Auxiliary helper macros.  */
 
 /* A value that masks all fields in DR7 that are reserved by Intel.  */
-#define I386_DR_CONTROL_MASK	(~DR_CONTROL_RESERVED)
+#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 I386_DR_VACANT(state, i) \
+#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 I386_DR_LOCAL_ENABLE(state, i) \
+#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 I386_DR_GLOBAL_ENABLE(state, i) \
+#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 I386_DR_DISABLE(state, i) \
+#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 I386_DR_SET_RW_LEN(state, i, rwlen) \
+#define X86_DR_SET_RW_LEN(state, i, rwlen) \
   do { \
     (state)->dr_control_mirror &= \
       ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
@@ -165,15 +165,15 @@
   } while (0)
 
 /* Get from DR7 the RW and LEN fields for the I'th debug register.  */
-#define I386_DR_GET_RW_LEN(dr7, i) \
+#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 I386_DR_WATCH_HIT(dr6, i) ((dr6) & (1 << (i)))
+#define X86_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;
+/* Types of operations supported by x86_handle_nonaligned_watchpoint.  */
+typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } x86_wp_op_t;
 
 #ifndef GDBSERVER
 /* Whether or not to print the mirrored debug registers.  */
@@ -183,9 +183,9 @@ extern int debug_hw_points;
 /* 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)
+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;
 
@@ -210,10 +210,10 @@ i386_show_dr (struct i386_debug_reg_state *state,
       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 ()),
+			     x86_get_debug_register_length ()),
 		    state->dr_ref_count[i],
 		    i + 1, phex (state->dr_mirror[i + 1],
-				 i386_get_debug_register_length ()),
+				 x86_get_debug_register_length ()),
 		    state->dr_ref_count[i + 1]);
       i++;
     }
@@ -224,7 +224,7 @@ i386_show_dr (struct i386_debug_reg_state *state,
    have the value of 1, 2, or 4.  */
 
 static unsigned
-i386_length_and_rw_bits (int len, enum target_hw_bp_type type)
+x86_length_and_rw_bits (int len, enum target_hw_bp_type type)
 {
   unsigned rw;
 
@@ -251,7 +251,7 @@ i386_length_and_rw_bits (int len, enum target_hw_bp_type type)
 #endif
       default:
 	internal_error (__FILE__, __LINE__, _("\
-Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n"),
+Invalid hardware breakpoint type %d in x86_length_and_rw_bits.\n"),
 			(int) type);
     }
 
@@ -269,7 +269,7 @@ Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n"),
 	/* ELSE FALL THROUGH */
       default:
 	internal_error (__FILE__, __LINE__, _("\
-Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n"), len);
+Invalid hardware breakpoint length %d in x86_length_and_rw_bits.\n"), len);
     }
 }
 
@@ -280,12 +280,12 @@ Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n"), len);
    success, -1 on failure.  */
 
 static int
-i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
-				CORE_ADDR addr, unsigned len_rw_bits)
+x86_insert_aligned_watchpoint (struct x86_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 ())
+  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
@@ -293,9 +293,9 @@ i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
      reuse it for this watchpoint as well (and save a register).  */
   ALL_DEBUG_REGISTERS (i)
     {
-      if (!I386_DR_VACANT (state, i)
+      if (!X86_DR_VACANT (state, i)
 	  && state->dr_mirror[i] == addr
-	  && I386_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
+	  && X86_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
 	{
 	  state->dr_ref_count[i]++;
 	  return 0;
@@ -305,7 +305,7 @@ i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
   /* Next, look for a vacant debug register.  */
   ALL_DEBUG_REGISTERS (i)
     {
-      if (I386_DR_VACANT (state, i))
+      if (X86_DR_VACANT (state, i))
 	break;
     }
 
@@ -318,17 +318,17 @@ i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
   /* 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);
+  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 i386 target allows or supports global
+     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.  */
-  I386_DR_LOCAL_ENABLE (state, i);
+  X86_DR_LOCAL_ENABLE (state, i);
   state->dr_control_mirror |= DR_LOCAL_SLOWDOWN;
-  state->dr_control_mirror &= I386_DR_CONTROL_MASK;
+  state->dr_control_mirror &= X86_DR_CONTROL_MASK;
 
   return 0;
 }
@@ -340,33 +340,33 @@ i386_insert_aligned_watchpoint (struct i386_debug_reg_state *state,
    success, -1 on failure.  */
 
 static int
-i386_remove_aligned_watchpoint (struct i386_debug_reg_state *state,
-				CORE_ADDR addr, unsigned len_rw_bits)
+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 (!I386_DR_VACANT (state, i)
+      if (!X86_DR_VACANT (state, i)
 	  && state->dr_mirror[i] == addr
-	  && I386_DR_GET_RW_LEN (state->dr_control_mirror, i) == len_rw_bits)
+	  && 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;
-	      I386_DR_DISABLE (state, i);
+	      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.  */
-	      I386_DR_SET_RW_LEN (state, i, 0);
+	      X86_DR_SET_RW_LEN (state, i, 0);
 	    }
 	  retval = 0;
 	}
 
-      if (!I386_DR_VACANT (state, i))
+      if (!X86_DR_VACANT (state, i))
 	all_vacant = 0;
     }
 
@@ -392,9 +392,9 @@ i386_remove_aligned_watchpoint (struct i386_debug_reg_state *state,
    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)
+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;
@@ -431,15 +431,15 @@ i386_handle_nonaligned_watchpoint (struct i386_debug_reg_state *state,
 	}
       else
 	{
-	  unsigned len_rw = i386_length_and_rw_bits (size, type);
+	  unsigned len_rw = x86_length_and_rw_bits (size, type);
 
 	  if (what == WP_INSERT)
-	    retval = i386_insert_aligned_watchpoint (state, addr, len_rw);
+	    retval = x86_insert_aligned_watchpoint (state, addr, len_rw);
 	  else if (what == WP_REMOVE)
-	    retval = i386_remove_aligned_watchpoint (state, addr, len_rw);
+	    retval = x86_remove_aligned_watchpoint (state, addr, len_rw);
 	  else
 	    internal_error (__FILE__, __LINE__, _("\
-Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"),
+Invalid value %d of operation in x86_handle_nonaligned_watchpoint.\n"),
 			    (int) what);
 	  if (retval)
 	    break;
@@ -456,21 +456,21 @@ Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"),
    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)
+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 (I386_DR_VACANT (new_state, i) != I386_DR_VACANT (state, i))
-	i386_dr_low_set_addr (new_state, 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)
-    i386_dr_low_set_control (new_state);
+    x86_dr_low_set_control (new_state);
 
   *state = *new_state;
 }
@@ -480,14 +480,14 @@ i386_update_inferior_debug_regs (struct i386_debug_reg_state *state,
    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)
+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 i386_debug_reg_state local_state = *state;
+  struct x86_debug_reg_state local_state = *state;
 
   if (type == hw_read)
     return 1; /* unsupported */
@@ -496,23 +496,23 @@ i386_dr_insert_watchpoint (struct i386_debug_reg_state *state,
        && !(TARGET_HAS_DR_LEN_8 && len == 8))
       || addr % len != 0)
     {
-      retval = i386_handle_nonaligned_watchpoint (&local_state,
-						  WP_INSERT,
-						  addr, len, type);
+      retval = x86_handle_nonaligned_watchpoint (&local_state,
+						 WP_INSERT,
+						 addr, len, type);
     }
   else
     {
-      unsigned len_rw = i386_length_and_rw_bits (len, type);
+      unsigned len_rw = x86_length_and_rw_bits (len, type);
 
-      retval = i386_insert_aligned_watchpoint (&local_state,
-					       addr, len_rw);
+      retval = x86_insert_aligned_watchpoint (&local_state,
+					      addr, len_rw);
     }
 
   if (retval == 0)
-    i386_update_inferior_debug_regs (state, &local_state);
+    x86_update_inferior_debug_regs (state, &local_state);
 
   if (debug_hw_points)
-    i386_show_dr (state, "insert_watchpoint", addr, len, type);
+    x86_show_dr (state, "insert_watchpoint", addr, len, type);
 
   return retval;
 }
@@ -522,36 +522,36 @@ i386_dr_insert_watchpoint (struct i386_debug_reg_state *state,
    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)
+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 i386_debug_reg_state local_state = *state;
+  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 = i386_handle_nonaligned_watchpoint (&local_state,
-						  WP_REMOVE,
-						  addr, len, type);
+      retval = x86_handle_nonaligned_watchpoint (&local_state,
+						 WP_REMOVE,
+						 addr, len, type);
     }
   else
     {
-      unsigned len_rw = i386_length_and_rw_bits (len, type);
+      unsigned len_rw = x86_length_and_rw_bits (len, type);
 
-      retval = i386_remove_aligned_watchpoint (&local_state,
-					       addr, len_rw);
+      retval = x86_remove_aligned_watchpoint (&local_state,
+					      addr, len_rw);
     }
 
   if (retval == 0)
-    i386_update_inferior_debug_regs (state, &local_state);
+    x86_update_inferior_debug_regs (state, &local_state);
 
   if (debug_hw_points)
-    i386_show_dr (state, "remove_watchpoint", addr, len, type);
+    x86_show_dr (state, "remove_watchpoint", addr, len, type);
 
   return retval;
 }
@@ -560,14 +560,14 @@ i386_dr_remove_watchpoint (struct i386_debug_reg_state *state,
    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)
+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 = i386_handle_nonaligned_watchpoint (state, WP_COUNT,
+  nregs = x86_handle_nonaligned_watchpoint (state, WP_COUNT,
 					     addr, len, hw_write);
   return nregs <= DR_NADDR ? 1 : 0;
 }
@@ -577,8 +577,8 @@ i386_dr_region_ok_for_watchpoint (struct i386_debug_reg_state *state,
    Otherwise, return zero.  */
 
 int
-i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
-			      CORE_ADDR *addr_p)
+x86_dr_stopped_data_address (struct x86_debug_reg_state *state,
+			     CORE_ADDR *addr_p)
 {
   CORE_ADDR addr = 0;
   int i;
@@ -618,16 +618,16 @@ i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
      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 ();
+  status = x86_dr_low_get_status ();
 
   ALL_DEBUG_REGISTERS (i)
     {
-      if (!I386_DR_WATCH_HIT (status, i))
+      if (!X86_DR_WATCH_HIT (status, i))
 	continue;
 
       if (!control_p)
 	{
-	  control = i386_dr_low_get_control ();
+	  control = x86_dr_low_get_control ();
 	  control_p = 1;
 	}
 
@@ -636,17 +636,17 @@ i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
 	 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)
+      if (X86_DR_GET_RW_LEN (control, i) != 0)
 	{
-	  addr = i386_dr_low_get_addr (i);
+	  addr = x86_dr_low_get_addr (i);
 	  rc = 1;
 	  if (debug_hw_points)
-	    i386_show_dr (state, "watchpoint_hit", addr, -1, hw_write);
+	    x86_show_dr (state, "watchpoint_hit", addr, -1, hw_write);
 	}
     }
 
   if (debug_hw_points && addr == 0)
-    i386_show_dr (state, "stopped_data_addr", 0, 0, hw_write);
+    x86_show_dr (state, "stopped_data_addr", 0, 0, hw_write);
 
   if (rc)
     *addr_p = addr;
@@ -657,8 +657,8 @@ i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
    Otherwise return zero.  */
 
 int
-i386_dr_stopped_by_watchpoint (struct i386_debug_reg_state *state)
+x86_dr_stopped_by_watchpoint (struct x86_debug_reg_state *state)
 {
   CORE_ADDR addr = 0;
-  return i386_dr_stopped_data_address (state, &addr);
+  return x86_dr_stopped_data_address (state, &addr);
 }
diff --git a/gdb/nat/i386-dregs.h b/gdb/nat/x86-dregs.h
index 16edf63..fb179a5 100644
--- a/gdb/nat/i386-dregs.h
+++ b/gdb/nat/x86-dregs.h
@@ -1,4 +1,4 @@
-/* Debug register code for the i386.
+/* Debug register code for x86 (i386 and x86-64).
 
    Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
@@ -17,7 +17,7 @@
    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
+/* Support for hardware watchpoints and breakpoints using the x86
    debug registers.
 
    This provides several functions for inserting and removing
@@ -29,15 +29,15 @@
    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
+#ifndef X86_DREGS_H
+#define X86_DREGS_H 1
 
 /* Forward declaration.  */
 enum target_hw_bp_type;
 
 /* Low-level function vector.  */
 
-struct i386_dr_low_type
+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
@@ -64,7 +64,7 @@ struct i386_dr_low_type
     int debug_register_length;
   };
 
-extern struct i386_dr_low_type i386_dr_low;
+extern struct x86_dr_low_type x86_dr_low;
 
 /* Debug registers' indices.  */
 #define DR_FIRSTADDR 0
@@ -75,7 +75,7 @@ extern struct i386_dr_low_type i386_dr_low;
 
 /* Global state needed to track h/w watchpoints.  */
 
-struct i386_debug_reg_state
+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.
@@ -95,32 +95,32 @@ struct i386_debug_reg_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.  */
-extern int i386_dr_insert_watchpoint (struct i386_debug_reg_state *state,
-				      enum target_hw_bp_type type,
-				      CORE_ADDR addr,
-				      int len);
+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 i386_dr_remove_watchpoint (struct i386_debug_reg_state *state,
-				      enum target_hw_bp_type type,
-				      CORE_ADDR addr,
-				      int len);
+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 i386_dr_region_ok_for_watchpoint (struct i386_debug_reg_state *state,
-					     CORE_ADDR addr, int len);
+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 i386_dr_stopped_data_address (struct i386_debug_reg_state *state,
-					 CORE_ADDR *addr_p);
+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 i386_dr_stopped_by_watchpoint (struct i386_debug_reg_state *state);
+extern int x86_dr_stopped_by_watchpoint (struct x86_debug_reg_state *state);
 
-#endif /* I386_DREGS_H */
+#endif /* X86_DREGS_H */
diff --git a/gdb/nat/i386-gcc-cpuid.h b/gdb/nat/x86-gcc-cpuid.h
index 34ab197..18763ad 100644
--- a/gdb/nat/i386-gcc-cpuid.h
+++ b/gdb/nat/x86-gcc-cpuid.h
@@ -1,6 +1,6 @@
 /*
  * Helper cpuid.h file copied from gcc-4.8.0.  Code in gdb should not
- * include this directly, but pull in i386-cpuid.h and use that func.
+ * include this directly, but pull in x86-cpuid.h and use that func.
  */
 /*
  * Copyright (C) 2007-2014 Free Software Foundation, Inc.