Add transitional rules for the alternative layout rule

[ghc-hetmet.git] / compiler / HsVersions.h

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index 09c8d2e..8359ad1 100644 (file)
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -16,6 +16,11 @@ you will screw up the layout where they are used in case expressions!
 /* Pull in all the platform defines for this build (foo_TARGET_ARCH etc.) */
 #include "ghc_boot_platform.h"
 
+/* This macro indicates that the target OS supports ELF-like shared libraries */
+#if linux_TARGET_OS || freebsd_TARGET_OS
+#define elf_OBJ_FORMAT 1
+#endif
+
 /* 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
@@ -30,11 +35,20 @@ you will screw up the layout where they are used in case expressions!
 {-# NOINLINE name #-};             \
 name :: IORef (ty);                \
 name = Util.global (value);
+
+#define GLOBAL_MVAR(name,value,ty) \
+{-# NOINLINE name #-};             \
+name :: MVar (ty);                 \
+name = Util.globalMVar (value);
 #endif
 #else /* __HADDOCK__ */
 #define GLOBAL_VAR(name,value,ty)  \
 name :: IORef (ty);                \
 name = Util.global (value);
+
+#define GLOBAL_MVAR(name,value,ty) \
+name :: MVar (ty);                 \
+name = Util.globalMVar (value);
 #endif
 
 #define COMMA ,
@@ -51,7 +65,7 @@ name = Util.global (value);
 -- We have to actually use all the variables we are given or we may get
 -- unused variable warnings when DEBUG is off.
 #define ASSERT(e)      if False && (not (e)) then panic "ASSERT" else
-#define ASSERT2(e,msg) if False && (not (e)) then pprPanic "ASSERT2" (msg) else
+#define ASSERT2(e,msg) if False && (const False (e,msg)) then pprPanic "ASSERT2" (msg) else
 #define MASSERT(e)      ASSERT(e) return ()
 #define MASSERT2(e,msg) ASSERT2(e,msg) return ()
 #define ASSERTM(e)       do { let { _mbool = (e) } }