From a262c4653b6a6f260d958c81ce1edfcac7050a89 Mon Sep 17 00:00:00 2001
From: "Thomas E. Spanjaard" <tgen@deepbone.net>
Date: Mon, 10 Aug 2009 20:20:51 +0000
Subject: [PATCH] gcc44: fix buildworld on amd64

---
 gnu/usr.bin/cc44/cc_prep/auto-host.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gnu/usr.bin/cc44/cc_prep/auto-host.h b/gnu/usr.bin/cc44/cc_prep/auto-host.h
index a17435662e..704b2d1bbf 100644
--- a/gnu/usr.bin/cc44/cc_prep/auto-host.h
+++ b/gnu/usr.bin/cc44/cc_prep/auto-host.h
@@ -1366,7 +1366,9 @@
 
 /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
 #ifndef USED_FOR_TARGET
-/* #undef NEED_64BIT_HOST_WIDE_INT */
+#ifdef CROSS_COMPILE
+#define NEED_64BIT_HOST_WIDE_INT 1
+#endif
 #endif
 
 
@@ -1420,7 +1422,13 @@
 
 /* The size of a `long', as computed by sizeof. */
 #ifndef USED_FOR_TARGET
-#define SIZEOF_LONG 4
+#if defined(__i386__)
+#define SIZEOF_LONG SIZEOF_INT
+#elif defined(__amd64__)
+#define SIZEOF_LONG SIZEOF_LONG_LONG
+#else
+#error "Unknown architecture"
+#endif
 #endif
 
 
@@ -1438,7 +1446,7 @@
 
 /* The size of a `void *', as computed by sizeof. */
 #ifndef USED_FOR_TARGET
-#define SIZEOF_VOID_P 4
+#define SIZEOF_VOID_P SIZEOF_LONG
 #endif
 
 
-- 
2.41.0