Commit 0268a23c authored by Ian Lynagh's avatar Ian Lynagh
Browse files

More fixes for Win64

parent b0b76b2e
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment