Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0268a23c34417849ec05603254311f979af97c41 >--------------------------------------------------------------- commit 0268a23c34417849ec05603254311f979af97c41 Author: Ian Lynagh <[email protected]> Date: Thu Mar 15 16:38:39 2012 +0000 More fixes for Win64 >--------------------------------------------------------------- includes/MachDeps.h | 15 +++++++-------- rts/ghc.mk | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/includes/MachDeps.h b/includes/MachDeps.h index f97d3e8..81e223d 100644 --- a/includes/MachDeps.h +++ b/includes/MachDeps.h @@ -83,19 +83,18 @@ #define SIZEOF_WORD32 SIZEOF_UNSIGNED_INT #define ALIGNMENT_WORD32 ALIGNMENT_UNSIGNED_INT -#if HAVE_LONG_LONG && SIZEOF_VOID_P < 8 -/* assume long long is 64 bits */ -#define SIZEOF_INT64 SIZEOF_LONG_LONG -#define ALIGNMENT_INT64 ALIGNMENT_LONG_LONG -#define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG_LONG -#define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG_LONG -#elif SIZEOF_LONG == 8 +#if SIZEOF_LONG == 8 #define SIZEOF_INT64 SIZEOF_LONG #define ALIGNMENT_INT64 ALIGNMENT_LONG #define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG #define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG +#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 +#define SIZEOF_INT64 SIZEOF_LONG_LONG +#define ALIGNMENT_INT64 ALIGNMENT_LONG_LONG +#define SIZEOF_WORD64 SIZEOF_UNSIGNED_LONG_LONG +#define ALIGNMENT_WORD64 ALIGNMENT_UNSIGNED_LONG_LONG #else -#error GHC untested on this architecture: sizeof(void *) < 8 and no long longs. +#error Cannot find a 64bit type. #endif #ifndef WORD_SIZE_IN_BITS diff --git a/rts/ghc.mk b/rts/ghc.mk index 99b917c..9eb933e 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -28,7 +28,7 @@ all_rts : $(ALL_RTS_LIBS) ALL_DIRS = hooks parallel sm eventlog -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ifeq "$(HostOS_CPP)" "mingw32" ALL_DIRS += win32 else ALL_DIRS += posix _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
