summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/cc/cc_tools
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/cc/cc_tools')
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile7
-rw-r--r--gnu/usr.bin/cc/cc_tools/auto-host.h2
2 files changed, 5 insertions, 4 deletions
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."
OpenPOWER on IntegriCloud