8 files changed, 18 insertions, 22 deletions
diff --git a/gdb/config/i386/fbsd64.mt b/gdb/config/i386/fbsd64.mt
index 4f8501e..d4cb24b 100644
--- a/gdb/config/i386/fbsd64.mt
+++ b/gdb/config/i386/fbsd64.mt
@@ -1,5 +1,5 @@
 # Target: FreeBSD/amd64
-TDEPFILES= x86-64-tdep.o amd64fbsd-tdep.o \
+TDEPFILES= amd64-tdep.o amd64fbsd-tdep.o \
 	i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-fbsd.h
diff --git a/gdb/config/i386/x86-64linux.mh b/gdb/config/i386/linux64.mh
index ed563cb..c02e864 100644
--- a/gdb/config/i386/x86-64linux.mh
+++ b/gdb/config/i386/linux64.mh
@@ -1,12 +1,9 @@
-# Host: AMD x86-64 running GNU/Linux
-
-XM_FILE= xm-i386.h
-
-NAT_FILE= nm-x86-64linux.h
+# Host: GNU/Linux x86-64
 NATDEPFILES= infptrace.o inftarg.o fork-child.o \
-	i386-nat.o amd64-nat.o x86-64-linux-nat.o \
-	linux-nat.o \
+	i386-nat.o amd64-nat.o amd64-linux-nat.o linux-nat.o \
 	proc-service.o thread-db.o lin-lwp.o linux-proc.o gcore.o 
+NAT_FILE= nm-linux64.h
+XM_FILE= xm-i386.h
 
 # The dynamically loaded libthread_db needs access to symbols in the
 # gdb executable.
diff --git a/gdb/config/i386/linux64.mt b/gdb/config/i386/linux64.mt
new file mode 100644
index 0000000..f642e31
--- /dev/null
+++ b/gdb/config/i386/linux64.mt
@@ -0,0 +1,5 @@
+# Target: GNU/Linux x86-64
+TDEPFILES= amd64-tdep.o amd64-linux-tdep.o \
+	i386-tdep.o i387-tdep.o i386-linux-tdep.o glibc-tdep.o \
+	solib.o solib-svr4.o solib-legacy.o corelow.o
+TM_FILE=tm-linux64.h
diff --git a/gdb/config/i386/nbsd64.mt b/gdb/config/i386/nbsd64.mt
index 9f2a1eb..3c98211 100644
--- a/gdb/config/i386/nbsd64.mt
+++ b/gdb/config/i386/nbsd64.mt
@@ -1,4 +1,4 @@
 # Target: NetBSD/amd64
-TDEPFILES= x86-64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \
+TDEPFILES= amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o nbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-nbsd.h
diff --git a/gdb/config/i386/nm-x86-64linux.h b/gdb/config/i386/nm-linux64.h
index 28194e9..1764758 100644
--- a/gdb/config/i386/nm-x86-64linux.h
+++ b/gdb/config/i386/nm-linux64.h
@@ -21,8 +21,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef NM_X86_64_LINUX_H
-#define NM_X86_64_LINUX_H
+#ifndef NM_LINUX64_H
+#define NM_LINUX64_H
 
 /* GNU/Linux supports the i386 hardware debugging registers.  */
 #define I386_USE_GENERIC_WATCHPOINTS
@@ -66,4 +66,4 @@ extern unsigned long amd64_linux_dr_get_status (void);
    `x86-86-linux-nat.c' instead, which calls both.  */
 #define LINUX_CHILD_POST_STARTUP_INFERIOR
 
-#endif /* NM_X86_64_LINUX_H */
+#endif /* nm-linux64.h */
diff --git a/gdb/config/i386/obsd64.mt b/gdb/config/i386/obsd64.mt
index 0e6a38d..16be079 100644
--- a/gdb/config/i386/obsd64.mt
+++ b/gdb/config/i386/obsd64.mt
@@ -1,5 +1,5 @@
 # Target: OpenBSD/amd64
-TDEPFILES= x86-64-tdep.o amd64obsd-tdep.o \
+TDEPFILES= amd64-tdep.o amd64obsd-tdep.o \
 	i386-tdep.o i387-tdep.o i386bsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-nbsd.h
diff --git a/gdb/config/i386/tm-x86-64linux.h b/gdb/config/i386/tm-linux64.h
index cc61d65..c3ff352 100644
--- a/gdb/config/i386/tm-x86-64linux.h
+++ b/gdb/config/i386/tm-linux64.h
@@ -21,8 +21,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef TM_X86_64LINUX_H
-#define TM_X86_64LINUX_H
+#ifndef TM_LINUX64_H
+#define TM_LINUX64_H
 
 /* We define SVR4_SHARED_LIBS unconditionally, on the assumption that
    link.h is available on all linux platforms.  For I386 and SH3/4, we
@@ -33,4 +33,4 @@
 #define SVR4_SHARED_LIBS
 #include "solib.h"              /* Support for shared libraries. */
 
-#endif /* tm-x86-64linux.h */
+#endif /* tm-linux64.h */
diff --git a/gdb/config/i386/x86-64linux.mt b/gdb/config/i386/x86-64linux.mt
deleted file mode 100644
index 8bc4adb..0000000
--- a/gdb/config/i386/x86-64linux.mt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Target: AMD x86-64 running GNU/Linux
-TDEPFILES= x86-64-tdep.o x86-64-linux-tdep.o \
-	i386-tdep.o i387-tdep.o i386-linux-tdep.o glibc-tdep.o \
-	solib.o solib-svr4.o solib-legacy.o corelow.o
-
-TM_FILE=tm-x86-64linux.h