From: Sascha Wildner <saw@online.de>
Date: Tue, 16 Aug 2011 07:40:02 +0000 (+0200)
Subject: Fix crossbuilding x86_64 on i386.
X-Git-Tag: v2.12.0~200
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0919389be41b4ed9c0f364a8f908b0a72ba9a275

Fix crossbuilding x86_64 on i386.

Brings back two things from cdefb602 and a262c465.
---

diff --git a/gnu/usr.bin/cc44/cc_prep/auto-host.h b/gnu/usr.bin/cc44/cc_prep/auto-host.h
index 25fb996ef8..1c38f73cb9 100644
--- a/gnu/usr.bin/cc44/cc_prep/auto-host.h
+++ b/gnu/usr.bin/cc44/cc_prep/auto-host.h
@@ -1394,7 +1394,7 @@
 
 /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
 #ifndef USED_FOR_TARGET
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(CROSS_COMPILE)
 #define NEED_64BIT_HOST_WIDE_INT 1
 #endif
 #endif
diff --git a/gnu/usr.bin/cc44/libcpp/config.h b/gnu/usr.bin/cc44/libcpp/config.h
index 0440e9b394..b09e19d1bb 100644
--- a/gnu/usr.bin/cc44/libcpp/config.h
+++ b/gnu/usr.bin/cc44/libcpp/config.h
@@ -218,7 +218,11 @@
 
 /* Define to the widest efficient host integer type at least as wide as the
    target's size_t type. */
+#ifdef CROSS_COMPILE
+#define HOST_WIDE_INT long long
+#else
 #define HOST_WIDE_INT long
+#endif
 
 /* Define as const if the declaration of iconv() needs const. */
 #define ICONV_CONST