* x86-64-linux-nat.c (amd64_linux_gregset64_reg_offset): Rename

from x86_64_linux_gregset64_reg_offset.
(amd64_linux_gregset32_reg_offset): Rename from
x86_64_linux_gregset64_reg_offset.
(amd64_linux_dr_get): Renamed from x86_64_linux_dr_get.
(amd64_linux_dr_set): Renamed from x86_64_linux_dr_set.
(amd64_linux_dr_set_control): Renamed from
x86_64_linux_dr_set_control.  Adjust for renamed functions.
(amd64_linux_dr_set_addr): Renamed from x86_64_linux_dr_set_addr.
Adjust for renamed functions.
(amd64_linux_dr_reset_addr): Renamed from
x86_64_linux_dr_reset_addr. Adjust for renamed functions.
(amd64_linux_dr_get_status): Renamed from
x86_64_linux_dr_get_status.  Adjust for renamed functions.
(_initialize_amd64_linux_nat): Renamed from
_initialize_x86_64_linux_nat.  Adjust for renamed variables and
functions.
* config/i386/nm-x86-64linux.h: Update copyright year.
Adjust for renamed functions.

3 files changed, 47 insertions, 27 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7b5eb4c..eb10c04 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,25 @@
 2004-02-22  Mark Kettenis  <kettenis@gnu.org>
 
+	* x86-64-linux-nat.c (amd64_linux_gregset64_reg_offset): Rename
+	from x86_64_linux_gregset64_reg_offset.
+	(amd64_linux_gregset32_reg_offset): Rename from
+	x86_64_linux_gregset64_reg_offset.
+	(amd64_linux_dr_get): Renamed from x86_64_linux_dr_get.
+	(amd64_linux_dr_set): Renamed from x86_64_linux_dr_set.
+	(amd64_linux_dr_set_control): Renamed from
+	x86_64_linux_dr_set_control.  Adjust for renamed functions.
+	(amd64_linux_dr_set_addr): Renamed from x86_64_linux_dr_set_addr.
+	Adjust for renamed functions.
+	(amd64_linux_dr_reset_addr): Renamed from
+	x86_64_linux_dr_reset_addr. Adjust for renamed functions.
+	(amd64_linux_dr_get_status): Renamed from
+	x86_64_linux_dr_get_status.  Adjust for renamed functions.
+	(_initialize_amd64_linux_nat): Renamed from
+	_initialize_x86_64_linux_nat.  Adjust for renamed variables and
+	functions.
+	* config/i386/nm-x86-64linux.h: Update copyright year.
+	Adjust for renamed functions.
+
 	* amd64fbsd-tdep.c (amd64fbsd_sigtramp_start_addr): Renamed from
 	amd64fbsd_sigtramp_start.
 	(amd64fbsd_sigtramp_end_addr): Renamed from
diff --git a/gdb/config/i386/nm-x86-64linux.h b/gdb/config/i386/nm-x86-64linux.h
index d1ac910..28194e9 100644
--- a/gdb/config/i386/nm-x86-64linux.h
+++ b/gdb/config/i386/nm-x86-64linux.h
@@ -1,6 +1,6 @@
 /* Native support for GNU/Linux x86-64.
 
-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    Contributed by Jiri Smid, SuSE Labs.
 
@@ -35,21 +35,21 @@
 
 /* Provide access to the i386 hardware debugging registers.  */
 
-extern void x86_64_linux_dr_set_control (unsigned long control);
+extern void amd64_linux_dr_set_control (unsigned long control);
 #define I386_DR_LOW_SET_CONTROL(control) \
-  x86_64_linux_dr_set_control (control)
+  amd64_linux_dr_set_control (control)
 
-extern void x86_64_linux_dr_set_addr (int regnum, CORE_ADDR addr);
+extern void amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr);
 #define I386_DR_LOW_SET_ADDR(regnum, addr) \
-  x86_64_linux_dr_set_addr (regnum, addr)
+  amd64_linux_dr_set_addr (regnum, addr)
 
-extern void x86_64_linux_dr_reset_addr (int regnum);
+extern void amd64_linux_dr_reset_addr (int regnum);
 #define I386_DR_LOW_RESET_ADDR(regnum) \
-  x86_64_linux_dr_reset_addr (regnum)
+  amd64_linux_dr_reset_addr (regnum)
 
-extern unsigned long x86_64_linux_dr_get_status (void);
+extern unsigned long amd64_linux_dr_get_status (void);
 #define I386_DR_LOW_GET_STATUS() \
-  x86_64_linux_dr_get_status ()
+  amd64_linux_dr_get_status ()
 
 
 /* Type of the third argument to the `ptrace' system call.  */
diff --git a/gdb/x86-64-linux-nat.c b/gdb/x86-64-linux-nat.c
index 07c463f..7924078 100644
--- a/gdb/x86-64-linux-nat.c
+++ b/gdb/x86-64-linux-nat.c
@@ -55,7 +55,7 @@
 /* Mapping between the general-purpose registers in GNU/Linux x86-64
    `struct user' format and GDB's register cache layout.  */
 
-static int x86_64_linux_gregset64_reg_offset[] =
+static int amd64_linux_gregset64_reg_offset[] =
 {
   RAX * 8, RBX * 8,		/* %rax, %rbx */
   RCX * 8, RDX * 8,		/* %rcx, %rdx */
@@ -81,7 +81,7 @@ static int x86_64_linux_gregset64_reg_offset[] =
    little-endian we get away with that.  */
 
 /* From <sys/reg.h> on GNU/Linux i386.  */
-static int x86_64_linux_gregset32_reg_offset[] =
+static int amd64_linux_gregset32_reg_offset[] =
 {
   RAX * 8, RCX * 8,		/* %eax, %ecx */
   RDX * 8, RBX * 8,		/* %edx, %ebx */
@@ -277,7 +277,7 @@ store_inferior_registers (int regnum)
 
 
 static unsigned long
-x86_64_linux_dr_get (int regnum)
+amd64_linux_dr_get (int regnum)
 {
   int tid;
   unsigned long value;
@@ -306,7 +306,7 @@ x86_64_linux_dr_get (int regnum)
 }
 
 static void
-x86_64_linux_dr_set (int regnum, unsigned long value)
+amd64_linux_dr_set (int regnum, unsigned long value)
 {
   int tid;
 
@@ -322,31 +322,31 @@ x86_64_linux_dr_set (int regnum, unsigned long value)
 }
 
 void
-x86_64_linux_dr_set_control (unsigned long control)
+amd64_linux_dr_set_control (unsigned long control)
 {
-  x86_64_linux_dr_set (DR_CONTROL, control);
+  amd64_linux_dr_set (DR_CONTROL, control);
 }
 
 void
-x86_64_linux_dr_set_addr (int regnum, CORE_ADDR addr)
+amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr)
 {
   gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR);
 
-  x86_64_linux_dr_set (DR_FIRSTADDR + regnum, addr);
+  amd64_linux_dr_set (DR_FIRSTADDR + regnum, addr);
 }
 
 void
-x86_64_linux_dr_reset_addr (int regnum)
+amd64_linux_dr_reset_addr (int regnum)
 {
   gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR);
 
-  x86_64_linux_dr_set (DR_FIRSTADDR + regnum, 0L);
+  amd64_linux_dr_set (DR_FIRSTADDR + regnum, 0L);
 }
 
 unsigned long
-x86_64_linux_dr_get_status (void)
+amd64_linux_dr_get_status (void)
 {
-  return x86_64_linux_dr_get (DR_STATUS);
+  return amd64_linux_dr_get (DR_STATUS);
 }
 
 
@@ -389,17 +389,17 @@ child_post_startup_inferior (ptid_t ptid)
 
 
 /* Provide a prototype to silence -Wmissing-prototypes.  */
-void _initialize_x86_64_linux_nat (void);
+void _initialize_amd64_linux_nat (void);
 
 void
-_initialize_x86_64_linux_nat (void)
+_initialize_amd64_linux_nat (void)
 {
-  amd64_native_gregset32_reg_offset = x86_64_linux_gregset32_reg_offset;
+  amd64_native_gregset32_reg_offset = amd64_linux_gregset32_reg_offset;
   amd64_native_gregset32_num_regs = I386_LINUX_NUM_REGS;
-  amd64_native_gregset64_reg_offset = x86_64_linux_gregset64_reg_offset;
+  amd64_native_gregset64_reg_offset = amd64_linux_gregset64_reg_offset;
 
-  gdb_assert (ARRAY_SIZE (x86_64_linux_gregset32_reg_offset)
+  gdb_assert (ARRAY_SIZE (amd64_linux_gregset32_reg_offset)
 	      == amd64_native_gregset32_num_regs);
-  gdb_assert (ARRAY_SIZE (x86_64_linux_gregset64_reg_offset)
+  gdb_assert (ARRAY_SIZE (amd64_linux_gregset64_reg_offset)
 	      == amd64_native_gregset64_num_regs);
 }