From a12d8aed9a8e2e75d7a36bd6c8bd8d289b833d41 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 26 Apr 2003 20:04:38 +0000
Subject: [PATCH] We're changing the platform name from x86[_-]86 to amd64.

---
 contrib/gcc/config/i386/i386.h      | 2 +-
 gnu/usr.bin/cc/Makefile.tgt         | 2 +-
 gnu/usr.bin/cc/cc_tools/Makefile    | 8 ++++----
 gnu/usr.bin/cc/cc_tools/auto-host.h | 2 +-
 gnu/usr.bin/cc/include/Makefile     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/gcc/config/i386/i386.h b/contrib/gcc/config/i386/i386.h
index 3885ddaac8f..8c7f1202f7d 100644
--- a/contrib/gcc/config/i386/i386.h
+++ b/contrib/gcc/config/i386/i386.h
@@ -585,7 +585,7 @@ extern int ix86_arch;
 -D__i386__ %(cpp_cpu32sizet)"
 
 #define CPP_CPU64_SPEC \
-  "-Acpu=x86_64 -Amachine=x86_64 -D__x86_64 -D__x86_64__ %(cpp_cpu64sizet)"
+  "-Acpu=x86_64 -Amachine=x86_64 -D__x86_64 -D__x86_64__ %(cpp_cpu64sizet) -D__amd64__ -D__AMD64__"
 
 #define CPP_CPUCOMMON_SPEC "\
 %{march=i386:%{!mcpu*:-D__tune_i386__ }}\
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 4ba1c68817d..5423dc7f276 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -6,7 +6,7 @@ TARGET_ARCH?=	${MACHINE_ARCH}
 GCC_CPU=	alpha
 .elif ${TARGET_ARCH} == "arm"
 GCC_CPU=	arm
-.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
+.elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
 .elif ${TARGET_ARCH} == "ia64"
 GCC_CPU=	ia64
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 823a5af9754..44331d78c7d 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -148,7 +148,7 @@ tconfig.h:
 .endif
 	echo '#include "ansidecl.h"'			>> ${.TARGET}
 	echo '#include "${GCC_CPU}/${GCC_CPU}.h"'	>> ${.TARGET}
-.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 	echo '#include "${GCC_CPU}/att.h"'		>> ${.TARGET}
 .endif
 .if ${TARGET_ARCH} != "alpha"
@@ -161,14 +161,14 @@ tconfig.h:
 .if ${TARGET_ARCH} == "alpha"
 	echo '#include "${GCC_CPU}/elf.h"'		>> ${.TARGET}
 .endif
-.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "x86_64"
+.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
 	echo '#include "${GCC_CPU}/sysv4.h"'		>> ${.TARGET}
 .endif
 .endif
 	echo '#include "${GCC_CPU}/freebsd.h"'		>> ${.TARGET}
-.if ${TARGET_ARCH} == "x86_64"
-	echo '#include "${GCC_CPU}/${TARGET_ARCH:S/_/-/}.h"' >> ${.TARGET}
+.if ${TARGET_ARCH} == "amd64"
+	echo '#include "${GCC_CPU}/x86-64.h"' 		>> ${.TARGET}
 	echo '#include "${GCC_CPU}/freebsd64.h"'	>> ${.TARGET}
 .endif
 	echo '#include "defaults.h"'			>> ${.TARGET}
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 5515295f7f0..177205c9237 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -338,7 +338,7 @@
 /* #define SIZEOF_LONG 4 */
 #if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
 #define SIZEOF_LONG SIZEOF_INT
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__x86_64__)
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
 #define SIZEOF_LONG SIZEOF_LONG_LONG
 #else
 #error "I don't know what arch this is."
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index a263d6d7a12..c9f7ee80b62 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -4,7 +4,7 @@
 
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
-.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 INCS=	mmintrin.h xmmintrin.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h