projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make -fext-core a dynamic flag (it was a static flag)
[ghc-hetmet.git]
/
compiler
/
HsVersions.h
diff --git
a/compiler/HsVersions.h
b/compiler/HsVersions.h
index
1ba8a01
..
4e68bbe
100644
(file)
--- a/
compiler/HsVersions.h
+++ b/
compiler/HsVersions.h
@@
-22,20
+22,20
@@
you will screw up the layout where they are used in case expressions!
* settings for the target plat instead). */
#include "../includes/ghcautoconf.h"
* settings for the target plat instead). */
#include "../includes/ghcautoconf.h"
-#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 602
-#define SYSTEM_IO_ERROR System.IO.Error
-#else
-#define SYSTEM_IO_ERROR System.IO
-#endif
-
/* Global variables may not work in other Haskell implementations,
* but we need them currently! so the conditional on GLASGOW won't do. */
/* Global variables may not work in other Haskell implementations,
* but we need them currently! so the conditional on GLASGOW won't do. */
+#ifndef __HADDOCK__
#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
#define GLOBAL_VAR(name,value,ty) \
{-# NOINLINE name #-}; \
name :: IORef (ty); \
name = Util.global (value);
#endif
#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
#define GLOBAL_VAR(name,value,ty) \
{-# NOINLINE name #-}; \
name :: IORef (ty); \
name = Util.global (value);
#endif
+#else /* __HADDOCK__ */
+#define GLOBAL_VAR(name,value,ty) \
+name :: IORef (ty); \
+name = Util.global (value);
+#endif
#define COMMA ,
#define COMMA ,
@@
-51,7
+51,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
-- 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) } }
#define MASSERT(e) ASSERT(e) return ()
#define MASSERT2(e,msg) ASSERT2(e,msg) return ()
#define ASSERTM(e) do { let { _mbool = (e) } }
@@
-60,14
+60,6
@@
name = Util.global (value);
#define WARN(e,msg) if False && (e) then pprPanic "WARN" (msg) else
#endif
#define WARN(e,msg) if False && (e) then pprPanic "WARN" (msg) else
#endif
-#if defined(__GLASGOW_HASKELL__)
-#define SLIT(x) (FastString.mkLitString# (x#))
-#define FSLIT(x) (FastString.mkFastString# (x#))
-#else
-#define SLIT(x) (FastString.mkLitString (x))
-#define FSLIT(x) (FastString.mkFastString (x))
-#endif
-
-- Useful for declaring arguments to be strict
#define STRICT1(f) f a | a `seq` False = undefined
#define STRICT2(f) f a b | a `seq` b `seq` False = undefined
-- Useful for declaring arguments to be strict
#define STRICT1(f) f a | a `seq` False = undefined
#define STRICT2(f) f a b | a `seq` b `seq` False = undefined