X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=dd80922e0b3692e04b11581ab106212d07b4790e;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=8852fd8adcdae5fb493eff2ec859a5bec8d53a0c;hpb=23f40f0e9be6d4aa5cf9ea31d73f4013f8e7b4bd;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 8852fd8..dd80922 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,6 +10,18 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
+/* Useful in the headers that we share with the RTS */
+#define COMPILING_GHC 1
+
+/* Pull in all the platform defines for this build (foo_TARGET_ARCH etc.) */
+#include "ghc_boot_platform.h"
+
+/* Pull in the autoconf defines (HAVE_FOO), but don't include
+ * ghcconfig.h, because that will include ghcplatform.h which has the
+ * wrong platform settings for the compiler (it has the platform
+ * settings for the target plat instead). */
+#include "../includes/ghcautoconf.h"
+
 #if __GLASGOW_HASKELL__ >= 504
 
 #define CONCURRENT  Control.Concurrent
@@ -70,7 +82,7 @@ name = Util.global (value) :: IORef (ty); \
 #define ASSERT(e)      if False then error "ASSERT"  else
 #define ASSERT2(e,msg) if False then error "ASSERT2" else
 #define ASSERTM(e)
-#define ASSERTM2(e)
+#define ASSERTM2(e,msg)
 #define WARN(e,msg)    if False then error "WARN"    else
 #endif
 
@@ -78,11 +90,19 @@ name = Util.global (value) :: IORef (ty); \
 -- when compiling FastString itself
 #ifndef COMPILING_FAST_STRING
 -- 
-import qualified FastString 
+import qualified FastString as FS 
 #endif
 
-#define SLIT(x)	 (FastString.mkLitString# (x#))
-#define FSLIT(x) (FastString.mkFastString# (x#))
+#define SLIT(x)	 (FS.mkLitString# (x#))
+#define FSLIT(x) (FS.mkFastString# (x#))
+
+-- Useful for declaring arguments to be strict
+#define STRICT1(f) f a b c | a `seq` False = undefined
+#define STRICT2(f) f a b | a `seq` b `seq` False = undefined
+#define STRICT3(f) f a b c | a `seq` b `seq` c `seq` False = undefined
+#define STRICT4(f) f a b c d | a `seq` b `seq` c `seq` d `seq` False = undefined
+#define STRICT5(f) f a b c d e | a `seq` b `seq` c `seq` d `seq` e `seq` False = undefined
+#define STRICT6(f) f a b c d e f | a `seq` b `seq` c `seq` d `seq` e `seq` f `seq` False = undefined
 
 #endif /* HsVersions.h */