X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=1c07d2c5aeb127f038c6a2c68bc5e8bbc2120c5e;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=0560611734f11d3f498927aa4155497503a7421c;hpb=b3e4cb91c4386c4d1456b896da1abb964f2124a6;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 0560611..1c07d2c 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,10 +10,24 @@ 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
 #define EXCEPTION   Control.Exception
+     /* If you want Control.Exception.try, get it as Panic.try, which
+        deals with the shift from 'tryAllIO' to 'try'.  */
 #define DYNAMIC     Data.Dynamic
 #define GLAEXTS     GHC.Exts
 #define DATA_BITS   Data.Bits
@@ -50,25 +64,26 @@ name = Util.global (value) :: IORef (ty); \
 {-# NOINLINE name #-}
 #endif
 
+#if __GLASGOW_HASKELL__ >= 620
+#define UNBOX_FIELD !!
+#else
+#define UNBOX_FIELD !
+#endif
+
 #define COMMA ,
 
 #ifdef DEBUG
 #define ASSERT(e) if (not (e)) then (assertPanic __FILE__ __LINE__) else
 #define ASSERT2(e,msg) if (not (e)) then (assertPprPanic __FILE__ __LINE__ (msg)) else
 #define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
+#define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () }
+#define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () }
 #else
-#define ASSERT(e)
-#define ASSERT2(e,msg)
-#define WARN(e,msg)
-#endif
-
--- temporary usage assertion control KSW 2000-10
-#ifdef DO_USAGES
-#define UASSERT(e) ASSERT(e)
-#define UASSERT2(e,msg) ASSERT2(e,msg)
-#else
-#define UASSERT(e)
-#define UASSERT2(e,msg)
+#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,msg)
+#define WARN(e,msg)    if False then error "WARN"    else
 #endif
 
 -- This #ifndef lets us switch off the "import FastString"
@@ -81,4 +96,5 @@ import qualified FastString
 #define SLIT(x)	 (FastString.mkLitString# (x#))
 #define FSLIT(x) (FastString.mkFastString# (x#))
 
-#endif // HSVERSIONS_H
+#endif /* HsVersions.h */
+