Move GlobalVar macros into GHC.Utils.GlobalVars

That's the only place where they are used and they shouldn't be used
elsewhere.

1 files changed, 30 insertions, 5 deletions

diff --git a/compiler/GHC/Utils/GlobalVars.hs b/compiler/GHC/Utils/GlobalVars.hs
index f169d07161..19496d5d82 100644
--- a/compiler/GHC/Utils/GlobalVars.hs
+++ b/compiler/GHC/Utils/GlobalVars.hs
@@ -3,6 +3,9 @@
 {-# OPTIONS_GHC -fno-cse #-}
 -- -fno-cse is needed for GLOBAL_VAR's to behave properly
 
+-- | Do not use global variables!
+--
+-- Global variables are a hack. Do not use them if you can help it.
 module GHC.Utils.GlobalVars
    ( v_unsafeHasPprDebug
    , v_unsafeHasNoDebugOutput
@@ -19,7 +22,8 @@ module GHC.Utils.GlobalVars
    )
 where
 
-#include "HsVersions.h"
+-- For GHC_STAGE
+#include "ghcplatform.h"
 
 import GHC.Prelude
 
@@ -29,11 +33,32 @@ import System.IO.Unsafe
 import Data.IORef
 import Foreign (Ptr)
 
+#define GLOBAL_VAR(name,value,ty)  \
+{-# NOINLINE name #-};             \
+name :: IORef (ty);                \
+name = global (value);
+
+#define GLOBAL_VAR_M(name,value,ty) \
+{-# NOINLINE name #-};              \
+name :: IORef (ty);                 \
+name = globalM (value);
+
+
+#define SHARED_GLOBAL_VAR(name,accessor,saccessor,value,ty) \
+{-# NOINLINE name #-};                                      \
+name :: IORef (ty);                                         \
+name = sharedGlobal (value) (accessor);                     \
+foreign import ccall unsafe saccessor                       \
+  accessor :: Ptr (IORef a) -> IO (Ptr (IORef a));
+
+#define SHARED_GLOBAL_VAR_M(name,accessor,saccessor,value,ty)  \
+{-# NOINLINE name #-};                                         \
+name :: IORef (ty);                                            \
+name = sharedGlobalM (value) (accessor);                       \
+foreign import ccall unsafe saccessor                          \
+  accessor :: Ptr (IORef a) -> IO (Ptr (IORef a));
+
 
---------------------------------------------------------------------------
--- Do not use global variables!
---
--- Global variables are a hack. Do not use them if you can help it.
 
 #if GHC_STAGE < 2