diff options
| author | obrien <obrien@FreeBSD.org> | 2002-09-12 15:56:21 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-09-12 15:56:21 +0000 |
| commit | 1e46ffd648686e64494e3832ac6420df94d3f45e (patch) | |
| tree | b564f47805dce146273609b6de67df24f2b45a2f /gnu | |
| parent | f66142d797a4b6de545510a914ac056654e8f684 (diff) | |
| download | FreeBSD-src-1e46ffd648686e64494e3832ac6420df94d3f45e.zip FreeBSD-src-1e46ffd648686e64494e3832ac6420df94d3f45e.tar.gz | |
We're going to have to use a TARGET_ARCH of "x86_64" rather than "x86-64"
to make building GCC happy.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/cc/Makefile.tgt | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/auto-host.h | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/include/Makefile | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt index 7bffcd8..8800a0d 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} == "x86_64" 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 22bb6f9..3d8511f 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -147,7 +147,7 @@ tconfig.h: .endif echo '#include "ansidecl.h"' >> ${.TARGET} echo '#include "${GCC_CPU}/${GCC_CPU}.h"' >> ${.TARGET} -.if ${TARGET_ARCH} == "i386" +.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64" echo '#include "${GCC_CPU}/att.h"' >> ${.TARGET} .endif .if ${TARGET_ARCH} != "alpha" @@ -160,13 +160,14 @@ tconfig.h: .if ${TARGET_ARCH} == "alpha" echo '#include "${GCC_CPU}/elf.h"' >> ${.TARGET} .endif -.if ${TARGET_ARCH} != "i386" +.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "x86_64" .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" +.if ${TARGET_ARCH} == "x86_64" + echo '#include "${GCC_CPU}/${TARGET_ARCH:S/_/-/}.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 bd8af40..67c0e00 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__) +#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__x86_64__) #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 71fde69..45a8cf9 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} == "x86_64" INCS= mmintrin.h xmmintrin.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h |
