summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2003-04-26 20:04:38 +0000
committerobrien <obrien@FreeBSD.org>2003-04-26 20:04:38 +0000
commit8a892a44c5852850564a9e70529f7f82ac49001f (patch)
treef70cdeaa1be53055fa99720cd26dac19d5863457 /gnu
parent9044d0c91282729c6c2963377d1d5df240e0d955 (diff)
downloadFreeBSD-src-8a892a44c5852850564a9e70529f7f82ac49001f.zip
FreeBSD-src-8a892a44c5852850564a9e70529f7f82ac49001f.tar.gz
We're changing the platform name from x86[_-]86 to amd64.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/cc/Makefile.tgt2
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile8
-rw-r--r--gnu/usr.bin/cc/cc_tools/auto-host.h2
-rw-r--r--gnu/usr.bin/cc/include/Makefile2
4 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 4ba1c68..5423dc7 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 823a5af..44331d7 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 5515295..177205c 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 a263d6d..c9f7ee8 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
OpenPOWER on IntegriCloud