diff --git a/compiler/GHC/HsToCore/PmCheck.hs b/compiler/GHC/HsToCore/PmCheck.hs --- a/compiler/GHC/HsToCore/PmCheck.hs +++ b/compiler/GHC/HsToCore/PmCheck.hs @@ -20,7 +20,7 @@ addTyCsDs, addScrutTmCs, addPatTmCs ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GHC/HsToCore/PmCheck/Oracle.hs b/compiler/GHC/HsToCore/PmCheck/Oracle.hs --- a/compiler/GHC/HsToCore/PmCheck/Oracle.hs +++ b/compiler/GHC/HsToCore/PmCheck/Oracle.hs @@ -24,7 +24,7 @@ provideEvidence, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GHC/HsToCore/PmCheck/Ppr.hs b/compiler/GHC/HsToCore/PmCheck/Ppr.hs --- a/compiler/GHC/HsToCore/PmCheck/Ppr.hs +++ b/compiler/GHC/HsToCore/PmCheck/Ppr.hs @@ -6,7 +6,7 @@ pprUncovered ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GHC/StgToCmm.hs b/compiler/GHC/StgToCmm.hs --- a/compiler/GHC/StgToCmm.hs +++ b/compiler/GHC/StgToCmm.hs @@ -11,7 +11,7 @@ module GHC.StgToCmm ( codeGen ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude as Prelude diff --git a/compiler/GHC/StgToCmm/Closure.hs b/compiler/GHC/StgToCmm/Closure.hs --- a/compiler/GHC/StgToCmm/Closure.hs +++ b/compiler/GHC/StgToCmm/Closure.hs @@ -62,7 +62,7 @@ staticClosureNeedsLink, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GHC/StgToCmm/DataCon.hs b/compiler/GHC/StgToCmm/DataCon.hs --- a/compiler/GHC/StgToCmm/DataCon.hs +++ b/compiler/GHC/StgToCmm/DataCon.hs @@ -15,7 +15,7 @@ cgTopRhsCon, buildDynCon, bindConArgs ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GHC/StgToCmm/Env.hs b/compiler/GHC/StgToCmm/Env.hs --- a/compiler/GHC/StgToCmm/Env.hs +++ b/compiler/GHC/StgToCmm/Env.hs @@ -22,7 +22,7 @@ maybeLetNoEscape, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GHC/StgToCmm/Expr.hs b/compiler/GHC/StgToCmm/Expr.hs --- a/compiler/GHC/StgToCmm/Expr.hs +++ b/compiler/GHC/StgToCmm/Expr.hs @@ -10,7 +10,7 @@ module GHC.StgToCmm.Expr ( cgExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude hiding ((<*>)) diff --git a/compiler/GHC/StgToCmm/Layout.hs b/compiler/GHC/StgToCmm/Layout.hs --- a/compiler/GHC/StgToCmm/Layout.hs +++ b/compiler/GHC/StgToCmm/Layout.hs @@ -30,7 +30,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude hiding ((<*>)) diff --git a/compiler/GHC/StgToCmm/Prim.hs b/compiler/GHC/StgToCmm/Prim.hs --- a/compiler/GHC/StgToCmm/Prim.hs +++ b/compiler/GHC/StgToCmm/Prim.hs @@ -22,7 +22,7 @@ shouldInlinePrimOp ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude hiding ((<*>)) diff --git a/compiler/GHC/StgToCmm/Utils.hs b/compiler/GHC/StgToCmm/Utils.hs --- a/compiler/GHC/StgToCmm/Utils.hs +++ b/compiler/GHC/StgToCmm/Utils.hs @@ -46,7 +46,7 @@ emitUpdRemSetPushThunk, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/GhclibHsVersions.h b/compiler/GhclibHsVersions.h new file mode 100644 --- /dev/null +++ b/compiler/GhclibHsVersions.h @@ -0,0 +1,56 @@ +#pragma once + +-- For GHC_STAGE +#include "ghcplatform.h" + +#if 0 + +IMPORTANT! If you put extra tabs/spaces in these macro definitions, +you will screw up the layout where they are used in case expressions! + +(This is cpp-dependent, of course) + +#endif + +#define GLOBAL_VAR(name,value,ty) \ +{-# NOINLINE name #-}; \ +name :: IORef (ty); \ +name = Util.global (value); + +#define GLOBAL_VAR_M(name,value,ty) \ +{-# NOINLINE name #-}; \ +name :: IORef (ty); \ +name = Util.globalM (value); + + +#define SHARED_GLOBAL_VAR(name,accessor,saccessor,value,ty) \ +{-# NOINLINE name #-}; \ +name :: IORef (ty); \ +name = Util.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 = Util.sharedGlobalM (value) (accessor); \ +foreign import ccall unsafe saccessor \ + accessor :: Ptr (IORef a) -> IO (Ptr (IORef a)); + + +#define ASSERT(e) if debugIsOn && not (e) then (assertPanic __FILE__ __LINE__) else +#define ASSERT2(e,msg) if debugIsOn && not (e) then (assertPprPanic __FILE__ __LINE__ (msg)) else +#define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg)) $ + +-- Examples: Assuming flagSet :: String -> m Bool +-- +-- do { c <- getChar; MASSERT( isUpper c ); ... } +-- do { c <- getChar; MASSERT2( isUpper c, text "Bad" ); ... } +-- do { str <- getStr; ASSERTM( flagSet str ); .. } +-- do { str <- getStr; ASSERTM2( flagSet str, text "Bad" ); .. } +-- do { str <- getStr; WARNM2( flagSet str, text "Flag is set" ); .. } +#define MASSERT(e) ASSERT(e) return () +#define MASSERT2(e,msg) ASSERT2(e,msg) return () +#define ASSERTM(e) do { bool <- e; MASSERT(bool) } +#define ASSERTM2(e,msg) do { bool <- e; MASSERT2(bool,msg) } +#define WARNM2(e,msg) do { bool <- e; WARN(bool, msg) return () } diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h deleted file mode 100644 --- a/compiler/HsVersions.h +++ /dev/null @@ -1,56 +0,0 @@ -#pragma once - --- For GHC_STAGE -#include "ghcplatform.h" - -#if 0 - -IMPORTANT! If you put extra tabs/spaces in these macro definitions, -you will screw up the layout where they are used in case expressions! - -(This is cpp-dependent, of course) - -#endif - -#define GLOBAL_VAR(name,value,ty) \ -{-# NOINLINE name #-}; \ -name :: IORef (ty); \ -name = Util.global (value); - -#define GLOBAL_VAR_M(name,value,ty) \ -{-# NOINLINE name #-}; \ -name :: IORef (ty); \ -name = Util.globalM (value); - - -#define SHARED_GLOBAL_VAR(name,accessor,saccessor,value,ty) \ -{-# NOINLINE name #-}; \ -name :: IORef (ty); \ -name = Util.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 = Util.sharedGlobalM (value) (accessor); \ -foreign import ccall unsafe saccessor \ - accessor :: Ptr (IORef a) -> IO (Ptr (IORef a)); - - -#define ASSERT(e) if debugIsOn && not (e) then (assertPanic __FILE__ __LINE__) else -#define ASSERT2(e,msg) if debugIsOn && not (e) then (assertPprPanic __FILE__ __LINE__ (msg)) else -#define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg)) $ - --- Examples: Assuming flagSet :: String -> m Bool --- --- do { c <- getChar; MASSERT( isUpper c ); ... } --- do { c <- getChar; MASSERT2( isUpper c, text "Bad" ); ... } --- do { str <- getStr; ASSERTM( flagSet str ); .. } --- do { str <- getStr; ASSERTM2( flagSet str, text "Bad" ); .. } --- do { str <- getStr; WARNM2( flagSet str, text "Flag is set" ); .. } -#define MASSERT(e) ASSERT(e) return () -#define MASSERT2(e,msg) ASSERT2(e,msg) return () -#define ASSERTM(e) do { bool <- e; MASSERT(bool) } -#define ASSERTM2(e,msg) do { bool <- e; MASSERT2(bool,msg) } -#define WARNM2(e,msg) do { bool <- e; WARN(bool, msg) return () } diff --git a/compiler/backpack/DriverBkp.hs b/compiler/backpack/DriverBkp.hs --- a/compiler/backpack/DriverBkp.hs +++ b/compiler/backpack/DriverBkp.hs @@ -16,7 +16,7 @@ module DriverBkp (doBackpack) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/backpack/NameShape.hs b/compiler/backpack/NameShape.hs --- a/compiler/backpack/NameShape.hs +++ b/compiler/backpack/NameShape.hs @@ -10,7 +10,7 @@ maybeSubstNameShape, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/backpack/RnModIface.hs b/compiler/backpack/RnModIface.hs --- a/compiler/backpack/RnModIface.hs +++ b/compiler/backpack/RnModIface.hs @@ -13,7 +13,7 @@ tcRnModExports, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -109,7 +109,7 @@ isConInfoTableLabel ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/cmm/CmmInfo.hs b/compiler/cmm/CmmInfo.hs --- a/compiler/cmm/CmmInfo.hs +++ b/compiler/cmm/CmmInfo.hs @@ -32,7 +32,7 @@ stdPtrsOffset, stdNonPtrsOffset, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -261,7 +261,7 @@ import qualified Data.Map as M import qualified Data.ByteString.Char8 as BS8 -#include "HsVersions.h" +#include "GhclibHsVersions.h" } %expect 0 diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -22,7 +22,7 @@ writeC ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" -- Cmm stuff import GhcPrelude diff --git a/compiler/coreSyn/CoreLint.hs b/compiler/coreSyn/CoreLint.hs --- a/compiler/coreSyn/CoreLint.hs +++ b/compiler/coreSyn/CoreLint.hs @@ -21,7 +21,7 @@ CoreLint.dumpIfSet, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/coreSyn/CorePrep.hs b/compiler/coreSyn/CorePrep.hs --- a/compiler/coreSyn/CorePrep.hs +++ b/compiler/coreSyn/CorePrep.hs @@ -13,7 +13,7 @@ lookupMkNaturalName, lookupNaturalSDataConName ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/Desugar.hs b/compiler/deSugar/Desugar.hs --- a/compiler/deSugar/Desugar.hs +++ b/compiler/deSugar/Desugar.hs @@ -15,7 +15,7 @@ deSugar, deSugarExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsArrows.hs b/compiler/deSugar/DsArrows.hs --- a/compiler/deSugar/DsArrows.hs +++ b/compiler/deSugar/DsArrows.hs @@ -12,7 +12,7 @@ module DsArrows ( dsProcExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsBinds.hs b/compiler/deSugar/DsBinds.hs --- a/compiler/deSugar/DsBinds.hs +++ b/compiler/deSugar/DsBinds.hs @@ -19,7 +19,7 @@ dsHsWrapper, dsTcEvBinds, dsTcEvBinds_s, dsEvBinds, dsMkUserRule ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsCCall.hs b/compiler/deSugar/DsCCall.hs --- a/compiler/deSugar/DsCCall.hs +++ b/compiler/deSugar/DsCCall.hs @@ -15,7 +15,7 @@ , resultWrapper ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs --- a/compiler/deSugar/DsExpr.hs +++ b/compiler/deSugar/DsExpr.hs @@ -13,7 +13,7 @@ module DsExpr ( dsExpr, dsLExpr, dsLExprNoLP, dsLocalBinds , dsValBinds, dsLit, dsSyntaxExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsForeign.hs b/compiler/deSugar/DsForeign.hs --- a/compiler/deSugar/DsForeign.hs +++ b/compiler/deSugar/DsForeign.hs @@ -13,7 +13,7 @@ module DsForeign ( dsForeigns ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude import TcRnMonad -- temp diff --git a/compiler/deSugar/DsGRHSs.hs b/compiler/deSugar/DsGRHSs.hs --- a/compiler/deSugar/DsGRHSs.hs +++ b/compiler/deSugar/DsGRHSs.hs @@ -11,7 +11,7 @@ module DsGRHSs ( dsGuarded, dsGRHSs, dsGRHS, isTrueLHsExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsListComp.hs b/compiler/deSugar/DsListComp.hs --- a/compiler/deSugar/DsListComp.hs +++ b/compiler/deSugar/DsListComp.hs @@ -12,7 +12,7 @@ module DsListComp ( dsListComp, dsMonadComp ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs --- a/compiler/deSugar/DsMeta.hs +++ b/compiler/deSugar/DsMeta.hs @@ -19,7 +19,7 @@ module DsMeta( dsBracket ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsUsage.hs b/compiler/deSugar/DsUsage.hs --- a/compiler/deSugar/DsUsage.hs +++ b/compiler/deSugar/DsUsage.hs @@ -7,7 +7,7 @@ mkUsageInfo, mkUsedNames, mkDependencies ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/DsUtils.hs b/compiler/deSugar/DsUtils.hs --- a/compiler/deSugar/DsUtils.hs +++ b/compiler/deSugar/DsUtils.hs @@ -42,7 +42,7 @@ isTrueLHsExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/Match.hs b/compiler/deSugar/Match.hs --- a/compiler/deSugar/Match.hs +++ b/compiler/deSugar/Match.hs @@ -13,7 +13,7 @@ module Match ( match, matchEquations, matchWrapper, matchSimply , matchSinglePat, matchSinglePatVar ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/MatchCon.hs b/compiler/deSugar/MatchCon.hs --- a/compiler/deSugar/MatchCon.hs +++ b/compiler/deSugar/MatchCon.hs @@ -12,7 +12,7 @@ module MatchCon ( matchConFamily, matchPatSyn ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/deSugar/MatchLit.hs b/compiler/deSugar/MatchLit.hs --- a/compiler/deSugar/MatchLit.hs +++ b/compiler/deSugar/MatchLit.hs @@ -17,7 +17,7 @@ , warnAboutEmptyEnumerations ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/ByteCodeAsm.hs b/compiler/ghci/ByteCodeAsm.hs --- a/compiler/ghci/ByteCodeAsm.hs +++ b/compiler/ghci/ByteCodeAsm.hs @@ -13,7 +13,7 @@ iNTERP_STACK_CHECK_THRESH ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/ByteCodeGen.hs b/compiler/ghci/ByteCodeGen.hs --- a/compiler/ghci/ByteCodeGen.hs +++ b/compiler/ghci/ByteCodeGen.hs @@ -9,7 +9,7 @@ -- | ByteCodeGen: Generate bytecode from Core module ByteCodeGen ( UnlinkedBCO, byteCodeGen, coreExprToBCOs ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/ByteCodeInstr.hs b/compiler/ghci/ByteCodeInstr.hs --- a/compiler/ghci/ByteCodeInstr.hs +++ b/compiler/ghci/ByteCodeInstr.hs @@ -9,7 +9,7 @@ BCInstr(..), ProtoBCO(..), bciStackUse, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/ByteCodeItbls.hs b/compiler/ghci/ByteCodeItbls.hs --- a/compiler/ghci/ByteCodeItbls.hs +++ b/compiler/ghci/ByteCodeItbls.hs @@ -7,7 +7,7 @@ -- | ByteCodeItbls: Generate infotables for interpreter-made bytecodes module ByteCodeItbls ( mkITbls ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/ByteCodeLink.hs b/compiler/ghci/ByteCodeLink.hs --- a/compiler/ghci/ByteCodeLink.hs +++ b/compiler/ghci/ByteCodeLink.hs @@ -16,7 +16,7 @@ nameToCLabel, linkFail ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs --- a/compiler/ghci/Linker.hs +++ b/compiler/ghci/Linker.hs @@ -18,7 +18,7 @@ uninitializedLinker ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -23,7 +23,7 @@ constrClosToName -- exported to use in test T4891 ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs --- a/compiler/iface/BinIface.hs +++ b/compiler/iface/BinIface.hs @@ -31,7 +31,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/iface/BuildTyCl.hs b/compiler/iface/BuildTyCl.hs --- a/compiler/iface/BuildTyCl.hs +++ b/compiler/iface/BuildTyCl.hs @@ -13,7 +13,7 @@ newImplicitBinder, newTyConRepName ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/iface/IfaceEnv.hs b/compiler/iface/IfaceEnv.hs --- a/compiler/iface/IfaceEnv.hs +++ b/compiler/iface/IfaceEnv.hs @@ -20,7 +20,7 @@ mkNameCacheUpdater, NameCacheUpdater(..), ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/iface/LoadIface.hs b/compiler/iface/LoadIface.hs --- a/compiler/iface/LoadIface.hs +++ b/compiler/iface/LoadIface.hs @@ -32,7 +32,7 @@ ifaceStats, pprModIface, showIface ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs --- a/compiler/iface/MkIface.hs +++ b/compiler/iface/MkIface.hs @@ -58,7 +58,7 @@ the actual fingerprint for all each thing recorded in mi_usages -} -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/iface/TcIface.hs b/compiler/iface/TcIface.hs --- a/compiler/iface/TcIface.hs +++ b/compiler/iface/TcIface.hs @@ -20,7 +20,7 @@ tcIfaceGlobal ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/Llvm/PpLlvm.hs b/compiler/llvmGen/Llvm/PpLlvm.hs --- a/compiler/llvmGen/Llvm/PpLlvm.hs +++ b/compiler/llvmGen/Llvm/PpLlvm.hs @@ -23,7 +23,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/Llvm/Types.hs b/compiler/llvmGen/Llvm/Types.hs --- a/compiler/llvmGen/Llvm/Types.hs +++ b/compiler/llvmGen/Llvm/Types.hs @@ -6,7 +6,7 @@ module Llvm.Types where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs --- a/compiler/llvmGen/LlvmCodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen.hs @@ -5,7 +5,7 @@ -- module LlvmCodeGen ( LlvmVersion, llvmVersionList, llvmCodeGen, llvmFixupAsm ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs --- a/compiler/llvmGen/LlvmCodeGen/Base.hs +++ b/compiler/llvmGen/LlvmCodeGen/Base.hs @@ -36,7 +36,7 @@ aliasify, llvmDefLabel ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" #include "ghcautoconf.h" import GhcPrelude diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs --- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs @@ -5,7 +5,7 @@ -- module LlvmCodeGen.CodeGen ( genLlvmProc ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/LlvmCodeGen/Data.hs b/compiler/llvmGen/LlvmCodeGen/Data.hs --- a/compiler/llvmGen/LlvmCodeGen/Data.hs +++ b/compiler/llvmGen/LlvmCodeGen/Data.hs @@ -7,7 +7,7 @@ genLlvmData, genData ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/LlvmCodeGen/Ppr.hs b/compiler/llvmGen/LlvmCodeGen/Ppr.hs --- a/compiler/llvmGen/LlvmCodeGen/Ppr.hs +++ b/compiler/llvmGen/LlvmCodeGen/Ppr.hs @@ -7,7 +7,7 @@ pprLlvmCmmDecl, pprLlvmData, infoSection ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/llvmGen/LlvmCodeGen/Regs.hs b/compiler/llvmGen/LlvmCodeGen/Regs.hs --- a/compiler/llvmGen/LlvmCodeGen/Regs.hs +++ b/compiler/llvmGen/LlvmCodeGen/Regs.hs @@ -9,7 +9,7 @@ stgTBAA, baseN, stackN, heapN, rxN, topN, tbaa, getTBAA ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/CodeOutput.hs b/compiler/main/CodeOutput.hs --- a/compiler/main/CodeOutput.hs +++ b/compiler/main/CodeOutput.hs @@ -8,7 +8,7 @@ module CodeOutput( codeOutput, outputForeignStubs ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs --- a/compiler/main/DriverMkDepend.hs +++ b/compiler/main/DriverMkDepend.hs @@ -12,7 +12,7 @@ doMkDependHS ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -32,7 +32,7 @@ ) where #include -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/Finder.hs b/compiler/main/Finder.hs --- a/compiler/main/Finder.hs +++ b/compiler/main/Finder.hs @@ -31,7 +31,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -293,7 +293,7 @@ * inline bits of HscMain here to simplify layering: hscTcExpr, hscStmt. -} -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude hiding (init) diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs --- a/compiler/main/GhcMake.hs +++ b/compiler/main/GhcMake.hs @@ -29,7 +29,7 @@ moduleGraphNodes, SummaryNode ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -180,7 +180,7 @@ import HieBin ( readHieFile, writeHieFile , hie_file_result) import HieDebug ( diffFile, validateScopes ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ********************************************************************** diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -42,7 +42,7 @@ Term(..), obtainTermFromId, obtainTermFromVal, reconstructType ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs --- a/compiler/main/PprTyThing.hs +++ b/compiler/main/PprTyThing.hs @@ -17,7 +17,7 @@ pprFamInst ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -36,7 +36,7 @@ getFrameworkOpts ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/SysTools/Process.hs b/compiler/main/SysTools/Process.hs --- a/compiler/main/SysTools/Process.hs +++ b/compiler/main/SysTools/Process.hs @@ -8,7 +8,7 @@ ----------------------------------------------------------------------------- module SysTools.Process where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import Exception import ErrUtils diff --git a/compiler/main/SysTools/Settings.hs b/compiler/main/SysTools/Settings.hs --- a/compiler/main/SysTools/Settings.hs +++ b/compiler/main/SysTools/Settings.hs @@ -7,7 +7,7 @@ , initSettings ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/main/TidyPgm.hs b/compiler/main/TidyPgm.hs --- a/compiler/main/TidyPgm.hs +++ b/compiler/main/TidyPgm.hs @@ -10,7 +10,7 @@ mkBootModDetailsTc, tidyProgram ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/AsmCodeGen.hs b/compiler/nativeGen/AsmCodeGen.hs --- a/compiler/nativeGen/AsmCodeGen.hs +++ b/compiler/nativeGen/AsmCodeGen.hs @@ -26,7 +26,7 @@ , x86NcgImpl ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/BlockLayout.hs b/compiler/nativeGen/BlockLayout.hs --- a/compiler/nativeGen/BlockLayout.hs +++ b/compiler/nativeGen/BlockLayout.hs @@ -13,7 +13,7 @@ ( sequenceTop ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude import Instruction diff --git a/compiler/nativeGen/CFG.hs b/compiler/nativeGen/CFG.hs --- a/compiler/nativeGen/CFG.hs +++ b/compiler/nativeGen/CFG.hs @@ -42,7 +42,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/NCGMonad.hs b/compiler/nativeGen/NCGMonad.hs --- a/compiler/nativeGen/NCGMonad.hs +++ b/compiler/nativeGen/NCGMonad.hs @@ -41,7 +41,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/PPC/CodeGen.hs b/compiler/nativeGen/PPC/CodeGen.hs --- a/compiler/nativeGen/PPC/CodeGen.hs +++ b/compiler/nativeGen/PPC/CodeGen.hs @@ -20,7 +20,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" -- NCG stuff: import GhcPrelude diff --git a/compiler/nativeGen/PPC/Instr.hs b/compiler/nativeGen/PPC/Instr.hs --- a/compiler/nativeGen/PPC/Instr.hs +++ b/compiler/nativeGen/PPC/Instr.hs @@ -8,7 +8,7 @@ -- ----------------------------------------------------------------------------- -#include "HsVersions.h" +#include "GhclibHsVersions.h" module PPC.Instr ( archWordFormat, diff --git a/compiler/nativeGen/PPC/RegInfo.hs b/compiler/nativeGen/PPC/RegInfo.hs --- a/compiler/nativeGen/PPC/RegInfo.hs +++ b/compiler/nativeGen/PPC/RegInfo.hs @@ -17,7 +17,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs --- a/compiler/nativeGen/PPC/Regs.hs +++ b/compiler/nativeGen/PPC/Regs.hs @@ -47,7 +47,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs --- a/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs +++ b/compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs @@ -6,7 +6,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs b/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs --- a/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs +++ b/compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs @@ -5,7 +5,7 @@ maxSpillSlots ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" where diff --git a/compiler/nativeGen/RegAlloc/Linear/Main.hs b/compiler/nativeGen/RegAlloc/Linear/Main.hs --- a/compiler/nativeGen/RegAlloc/Linear/Main.hs +++ b/compiler/nativeGen/RegAlloc/Linear/Main.hs @@ -99,7 +99,7 @@ module RegAlloc.Linear.Stats ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/SPARC/CodeGen.hs b/compiler/nativeGen/SPARC/CodeGen.hs --- a/compiler/nativeGen/SPARC/CodeGen.hs +++ b/compiler/nativeGen/SPARC/CodeGen.hs @@ -17,7 +17,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" -- NCG stuff: import GhcPrelude diff --git a/compiler/nativeGen/SPARC/Instr.hs b/compiler/nativeGen/SPARC/Instr.hs --- a/compiler/nativeGen/SPARC/Instr.hs +++ b/compiler/nativeGen/SPARC/Instr.hs @@ -7,7 +7,7 @@ -- (c) The University of Glasgow 1993-2004 -- ----------------------------------------------------------------------------- -#include "HsVersions.h" +#include "GhclibHsVersions.h" module SPARC.Instr ( RI(..), diff --git a/compiler/nativeGen/SPARC/Ppr.hs b/compiler/nativeGen/SPARC/Ppr.hs --- a/compiler/nativeGen/SPARC/Ppr.hs +++ b/compiler/nativeGen/SPARC/Ppr.hs @@ -22,7 +22,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/TargetReg.hs b/compiler/nativeGen/TargetReg.hs --- a/compiler/nativeGen/TargetReg.hs +++ b/compiler/nativeGen/TargetReg.hs @@ -19,7 +19,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -31,7 +31,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" -- NCG stuff: import GhcPrelude diff --git a/compiler/nativeGen/X86/Instr.hs b/compiler/nativeGen/X86/Instr.hs --- a/compiler/nativeGen/X86/Instr.hs +++ b/compiler/nativeGen/X86/Instr.hs @@ -14,7 +14,7 @@ maxSpillSlots, archWordFormat ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs --- a/compiler/nativeGen/X86/Ppr.hs +++ b/compiler/nativeGen/X86/Ppr.hs @@ -20,7 +20,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/X86/RegInfo.hs b/compiler/nativeGen/X86/RegInfo.hs --- a/compiler/nativeGen/X86/RegInfo.hs +++ b/compiler/nativeGen/X86/RegInfo.hs @@ -6,7 +6,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/nativeGen/X86/Regs.hs b/compiler/nativeGen/X86/Regs.hs --- a/compiler/nativeGen/X86/Regs.hs +++ b/compiler/nativeGen/X86/Regs.hs @@ -47,7 +47,7 @@ where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/prelude/PrelInfo.hs b/compiler/prelude/PrelInfo.hs --- a/compiler/prelude/PrelInfo.hs +++ b/compiler/prelude/PrelInfo.hs @@ -44,7 +44,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs --- a/compiler/rename/RnEnv.hs +++ b/compiler/rename/RnEnv.hs @@ -42,7 +42,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/rename/RnExpr.hs b/compiler/rename/RnExpr.hs --- a/compiler/rename/RnExpr.hs +++ b/compiler/rename/RnExpr.hs @@ -20,7 +20,7 @@ rnLExpr, rnExpr, rnStmts ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs --- a/compiler/rename/RnNames.hs +++ b/compiler/rename/RnNames.hs @@ -27,7 +27,7 @@ ImportDeclUsage ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/rename/RnPat.hs b/compiler/rename/RnPat.hs --- a/compiler/rename/RnPat.hs +++ b/compiler/rename/RnPat.hs @@ -46,7 +46,7 @@ import {-# SOURCE #-} RnExpr ( rnLExpr ) import {-# SOURCE #-} RnSplice ( rnSplicePat ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GHC.Hs import TcRnMonad diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs --- a/compiler/rename/RnSource.hs +++ b/compiler/rename/RnSource.hs @@ -14,7 +14,7 @@ rnSrcDecls, addTcgDUs, findSplice ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/rename/RnSplice.hs b/compiler/rename/RnSplice.hs --- a/compiler/rename/RnSplice.hs +++ b/compiler/rename/RnSplice.hs @@ -10,7 +10,7 @@ , traceSplice, SpliceInfo(..) ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs --- a/compiler/rename/RnTypes.hs +++ b/compiler/rename/RnTypes.hs @@ -68,7 +68,7 @@ import Data.List ( nubBy, partition, (\\) ) import Control.Monad ( unless, when ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- These type renamers are in a separate module, rather than in (say) RnSource, diff --git a/compiler/simplCore/CSE.hs b/compiler/simplCore/CSE.hs --- a/compiler/simplCore/CSE.hs +++ b/compiler/simplCore/CSE.hs @@ -8,7 +8,7 @@ module CSE (cseProgram, cseOneExpr) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/FloatIn.hs b/compiler/simplCore/FloatIn.hs --- a/compiler/simplCore/FloatIn.hs +++ b/compiler/simplCore/FloatIn.hs @@ -17,7 +17,7 @@ module FloatIn ( floatInwards ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/FloatOut.hs b/compiler/simplCore/FloatOut.hs --- a/compiler/simplCore/FloatOut.hs +++ b/compiler/simplCore/FloatOut.hs @@ -33,7 +33,7 @@ import Data.List ( partition ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ----------------- diff --git a/compiler/simplCore/LiberateCase.hs b/compiler/simplCore/LiberateCase.hs --- a/compiler/simplCore/LiberateCase.hs +++ b/compiler/simplCore/LiberateCase.hs @@ -7,7 +7,7 @@ {-# LANGUAGE CPP #-} module LiberateCase ( liberateCase ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/SAT.hs b/compiler/simplCore/SAT.hs --- a/compiler/simplCore/SAT.hs +++ b/compiler/simplCore/SAT.hs @@ -72,7 +72,7 @@ import Data.List (mapAccumL) import FastString -#include "HsVersions.h" +#include "GhclibHsVersions.h" doStaticArgs :: UniqSupply -> CoreProgram -> CoreProgram doStaticArgs us binds = snd $ mapAccumL sat_bind_threaded_us us binds diff --git a/compiler/simplCore/SetLevels.hs b/compiler/simplCore/SetLevels.hs --- a/compiler/simplCore/SetLevels.hs +++ b/compiler/simplCore/SetLevels.hs @@ -60,7 +60,7 @@ incMinorLvl, ltMajLvl, ltLvl, isTopLvl ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/SimplCore.hs b/compiler/simplCore/SimplCore.hs --- a/compiler/simplCore/SimplCore.hs +++ b/compiler/simplCore/SimplCore.hs @@ -8,7 +8,7 @@ module SimplCore ( core2core, simplifyExpr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/SimplEnv.hs b/compiler/simplCore/SimplEnv.hs --- a/compiler/simplCore/SimplEnv.hs +++ b/compiler/simplCore/SimplEnv.hs @@ -43,7 +43,7 @@ wrapJoinFloats, wrapJoinFloatsX, unitJoinFloat, addJoinFlts ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs --- a/compiler/simplCore/SimplUtils.hs +++ b/compiler/simplCore/SimplUtils.hs @@ -36,7 +36,7 @@ isExitJoinId ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplCore/Simplify.hs b/compiler/simplCore/Simplify.hs --- a/compiler/simplCore/Simplify.hs +++ b/compiler/simplCore/Simplify.hs @@ -8,7 +8,7 @@ module Simplify ( simplTopBinds, simplExpr, simplRules ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplStg/SimplStg.hs b/compiler/simplStg/SimplStg.hs --- a/compiler/simplStg/SimplStg.hs +++ b/compiler/simplStg/SimplStg.hs @@ -11,7 +11,7 @@ module SimplStg ( stg2stg ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplStg/StgLiftLams/LiftM.hs b/compiler/simplStg/StgLiftLams/LiftM.hs --- a/compiler/simplStg/StgLiftLams/LiftM.hs +++ b/compiler/simplStg/StgLiftLams/LiftM.hs @@ -20,7 +20,7 @@ substOcc, isLifted, formerFreeVars, liftedIdsExpander ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplStg/StgLiftLams/Transformation.hs b/compiler/simplStg/StgLiftLams/Transformation.hs --- a/compiler/simplStg/StgLiftLams/Transformation.hs +++ b/compiler/simplStg/StgLiftLams/Transformation.hs @@ -4,7 +4,7 @@ -- selecting which bindings to lambda lift by consulting 'goodToLift'. module StgLiftLams.Transformation (stgLiftLams) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplStg/StgStats.hs b/compiler/simplStg/StgStats.hs --- a/compiler/simplStg/StgStats.hs +++ b/compiler/simplStg/StgStats.hs @@ -25,7 +25,7 @@ module StgStats ( showStgStats ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/simplStg/UnariseStg.hs b/compiler/simplStg/UnariseStg.hs --- a/compiler/simplStg/UnariseStg.hs +++ b/compiler/simplStg/UnariseStg.hs @@ -196,7 +196,7 @@ module UnariseStg (unarise) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/specialise/SpecConstr.hs b/compiler/specialise/SpecConstr.hs --- a/compiler/specialise/SpecConstr.hs +++ b/compiler/specialise/SpecConstr.hs @@ -17,7 +17,7 @@ SpecConstrAnnotation(..) ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs --- a/compiler/specialise/Specialise.hs +++ b/compiler/specialise/Specialise.hs @@ -9,7 +9,7 @@ {-# LANGUAGE ViewPatterns #-} module Specialise ( specProgram, specUnfolding ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/stgSyn/CoreToStg.hs b/compiler/stgSyn/CoreToStg.hs --- a/compiler/stgSyn/CoreToStg.hs +++ b/compiler/stgSyn/CoreToStg.hs @@ -13,7 +13,7 @@ module CoreToStg ( coreToStg ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/stgSyn/StgSubst.hs b/compiler/stgSyn/StgSubst.hs --- a/compiler/stgSyn/StgSubst.hs +++ b/compiler/stgSyn/StgSubst.hs @@ -2,7 +2,7 @@ module StgSubst where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/stgSyn/StgSyn.hs b/compiler/stgSyn/StgSyn.hs --- a/compiler/stgSyn/StgSyn.hs +++ b/compiler/stgSyn/StgSyn.hs @@ -57,7 +57,7 @@ pprStgBinding, pprGenStgTopBindings, pprStgTopBindings ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/stranal/DmdAnal.hs b/compiler/stranal/DmdAnal.hs --- a/compiler/stranal/DmdAnal.hs +++ b/compiler/stranal/DmdAnal.hs @@ -11,7 +11,7 @@ module DmdAnal ( dmdAnalProgram ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/stranal/WorkWrap.hs b/compiler/stranal/WorkWrap.hs --- a/compiler/stranal/WorkWrap.hs +++ b/compiler/stranal/WorkWrap.hs @@ -28,7 +28,7 @@ import FamInstEnv import MonadUtils -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- We take Core bindings whose binders have: diff --git a/compiler/stranal/WwLib.hs b/compiler/stranal/WwLib.hs --- a/compiler/stranal/WwLib.hs +++ b/compiler/stranal/WwLib.hs @@ -11,7 +11,7 @@ , isWorkerSmallEnough ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/ClsInst.hs b/compiler/typecheck/ClsInst.hs --- a/compiler/typecheck/ClsInst.hs +++ b/compiler/typecheck/ClsInst.hs @@ -7,7 +7,7 @@ AssocInstInfo(..), isNotAssociated ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/FamInst.hs b/compiler/typecheck/FamInst.hs --- a/compiler/typecheck/FamInst.hs +++ b/compiler/typecheck/FamInst.hs @@ -48,7 +48,7 @@ import qualified GHC.LanguageExtensions as LangExt -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- Note [The type family instance consistency story] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/compiler/typecheck/FunDeps.hs b/compiler/typecheck/FunDeps.hs --- a/compiler/typecheck/FunDeps.hs +++ b/compiler/typecheck/FunDeps.hs @@ -17,7 +17,7 @@ pprFundeps ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/Inst.hs b/compiler/typecheck/Inst.hs --- a/compiler/typecheck/Inst.hs +++ b/compiler/typecheck/Inst.hs @@ -30,7 +30,7 @@ tyCoVarsOfCt, tyCoVarsOfCts, ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcBackpack.hs b/compiler/typecheck/TcBackpack.hs --- a/compiler/typecheck/TcBackpack.hs +++ b/compiler/typecheck/TcBackpack.hs @@ -71,7 +71,7 @@ import {-# SOURCE #-} TcRnDriver -#include "HsVersions.h" +#include "GhclibHsVersions.h" fixityMisMatch :: TyThing -> Fixity -> Fixity -> SDoc fixityMisMatch real_thing real_fixity sig_fixity = diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs --- a/compiler/typecheck/TcBinds.hs +++ b/compiler/typecheck/TcBinds.hs @@ -68,7 +68,7 @@ import Control.Monad import Data.Foldable (find) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ************************************************************************ diff --git a/compiler/typecheck/TcCanonical.hs b/compiler/typecheck/TcCanonical.hs --- a/compiler/typecheck/TcCanonical.hs +++ b/compiler/typecheck/TcCanonical.hs @@ -9,7 +9,7 @@ solveCallStack -- For TcSimplify ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcClassDcl.hs b/compiler/typecheck/TcClassDcl.hs --- a/compiler/typecheck/TcClassDcl.hs +++ b/compiler/typecheck/TcClassDcl.hs @@ -18,7 +18,7 @@ tcATDefault ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcDeriv.hs b/compiler/typecheck/TcDeriv.hs --- a/compiler/typecheck/TcDeriv.hs +++ b/compiler/typecheck/TcDeriv.hs @@ -12,7 +12,7 @@ module TcDeriv ( tcDeriving, DerivInfo(..) ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcDerivInfer.hs b/compiler/typecheck/TcDerivInfer.hs --- a/compiler/typecheck/TcDerivInfer.hs +++ b/compiler/typecheck/TcDerivInfer.hs @@ -11,7 +11,7 @@ module TcDerivInfer (inferConstraints, simplifyInstanceContexts) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcEnv.hs b/compiler/typecheck/TcEnv.hs --- a/compiler/typecheck/TcEnv.hs +++ b/compiler/typecheck/TcEnv.hs @@ -69,7 +69,7 @@ mkWrapperName ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs --- a/compiler/typecheck/TcErrors.hs +++ b/compiler/typecheck/TcErrors.hs @@ -9,7 +9,7 @@ solverDepthErrorTcS ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcExpr.hs b/compiler/typecheck/TcExpr.hs --- a/compiler/typecheck/TcExpr.hs +++ b/compiler/typecheck/TcExpr.hs @@ -17,7 +17,7 @@ addExprErrCtxt, getFixedTyVars ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcFlatten.hs b/compiler/typecheck/TcFlatten.hs --- a/compiler/typecheck/TcFlatten.hs +++ b/compiler/typecheck/TcFlatten.hs @@ -8,7 +8,7 @@ unflattenWanteds ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcForeign.hs b/compiler/typecheck/TcForeign.hs --- a/compiler/typecheck/TcForeign.hs +++ b/compiler/typecheck/TcForeign.hs @@ -31,7 +31,7 @@ , tcCheckFEType ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcGenDeriv.hs b/compiler/typecheck/TcGenDeriv.hs --- a/compiler/typecheck/TcGenDeriv.hs +++ b/compiler/typecheck/TcGenDeriv.hs @@ -35,7 +35,7 @@ mkRdrFunBind, mkRdrFunBindEC, mkRdrFunBindSE, error_Expr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcGenGenerics.hs b/compiler/typecheck/TcGenGenerics.hs --- a/compiler/typecheck/TcGenGenerics.hs +++ b/compiler/typecheck/TcGenGenerics.hs @@ -50,7 +50,7 @@ import Data.List (zip4, partition) import Data.Maybe (isJust) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ************************************************************************ diff --git a/compiler/typecheck/TcHsSyn.hs b/compiler/typecheck/TcHsSyn.hs --- a/compiler/typecheck/TcHsSyn.hs +++ b/compiler/typecheck/TcHsSyn.hs @@ -44,7 +44,7 @@ lookupTyVarOcc ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcHsType.hs b/compiler/typecheck/TcHsType.hs --- a/compiler/typecheck/TcHsType.hs +++ b/compiler/typecheck/TcHsType.hs @@ -65,7 +65,7 @@ funAppCtxt, addTyConFlavCtxt ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcInstDcls.hs b/compiler/typecheck/TcInstDcls.hs --- a/compiler/typecheck/TcInstDcls.hs +++ b/compiler/typecheck/TcInstDcls.hs @@ -12,7 +12,7 @@ module TcInstDcls ( tcInstDecls1, tcInstDeclsDeriv, tcInstDecls2 ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs --- a/compiler/typecheck/TcInteract.hs +++ b/compiler/typecheck/TcInteract.hs @@ -5,7 +5,7 @@ solveSimpleWanteds, -- Solves Cts ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude import BasicTypes ( SwapFlag(..), isSwapped, diff --git a/compiler/typecheck/TcMType.hs b/compiler/typecheck/TcMType.hs --- a/compiler/typecheck/TcMType.hs +++ b/compiler/typecheck/TcMType.hs @@ -88,7 +88,7 @@ ensureNotLevPoly, checkForLevPoly, checkForLevPolyX, formatLevPolyErr ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" -- friends: import GhcPrelude diff --git a/compiler/typecheck/TcMatches.hs b/compiler/typecheck/TcMatches.hs --- a/compiler/typecheck/TcMatches.hs +++ b/compiler/typecheck/TcMatches.hs @@ -51,7 +51,7 @@ import Control.Monad import Control.Arrow ( second ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ************************************************************************ diff --git a/compiler/typecheck/TcPat.hs b/compiler/typecheck/TcPat.hs --- a/compiler/typecheck/TcPat.hs +++ b/compiler/typecheck/TcPat.hs @@ -15,7 +15,7 @@ , tcPat, tcPat_O, tcPats , addDataConStupidTheta, badFieldCon, polyPatSig ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs --- a/compiler/typecheck/TcPatSyn.hs +++ b/compiler/typecheck/TcPatSyn.hs @@ -58,7 +58,7 @@ import Control.Monad ( zipWithM ) import Data.List( partition ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ************************************************************************ diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs --- a/compiler/typecheck/TcRnDriver.hs +++ b/compiler/typecheck/TcRnDriver.hs @@ -145,7 +145,7 @@ import TcHoleFitTypes ( HoleFitPluginR (..) ) -#include "HsVersions.h" +#include "GhclibHsVersions.h" {- ************************************************************************ diff --git a/compiler/typecheck/TcRnMonad.hs b/compiler/typecheck/TcRnMonad.hs --- a/compiler/typecheck/TcRnMonad.hs +++ b/compiler/typecheck/TcRnMonad.hs @@ -140,7 +140,7 @@ module IOEnv ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs --- a/compiler/typecheck/TcSMonad.hs +++ b/compiler/typecheck/TcSMonad.hs @@ -123,7 +123,7 @@ -- here ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcSigs.hs b/compiler/typecheck/TcSigs.hs --- a/compiler/typecheck/TcSigs.hs +++ b/compiler/typecheck/TcSigs.hs @@ -23,7 +23,7 @@ mkPragEnv, tcSpecPrags, tcSpecWrapper, tcImpPrags, addInlinePrags ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs --- a/compiler/typecheck/TcSimplify.hs +++ b/compiler/typecheck/TcSimplify.hs @@ -24,7 +24,7 @@ approximateWC, runTcSDeriveds ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcSplice.hs b/compiler/typecheck/TcSplice.hs --- a/compiler/typecheck/TcSplice.hs +++ b/compiler/typecheck/TcSplice.hs @@ -29,7 +29,7 @@ finishTH, runTopSplice ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs --- a/compiler/typecheck/TcTyClsDecls.hs +++ b/compiler/typecheck/TcTyClsDecls.hs @@ -22,7 +22,7 @@ wrongKindOfFamily ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcTyDecls.hs b/compiler/typecheck/TcTyDecls.hs --- a/compiler/typecheck/TcTyDecls.hs +++ b/compiler/typecheck/TcTyDecls.hs @@ -27,7 +27,7 @@ tcRecSelBinds, mkRecSelBinds, mkOneRecordSelector ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcTypeable.hs b/compiler/typecheck/TcTypeable.hs --- a/compiler/typecheck/TcTypeable.hs +++ b/compiler/typecheck/TcTypeable.hs @@ -10,7 +10,7 @@ module TcTypeable(mkTypeableBinds, tyConIsTypeable) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs --- a/compiler/typecheck/TcUnify.hs +++ b/compiler/typecheck/TcUnify.hs @@ -36,7 +36,7 @@ ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/compiler/typecheck/TcValidity.hs b/compiler/typecheck/TcValidity.hs --- a/compiler/typecheck/TcValidity.hs +++ b/compiler/typecheck/TcValidity.hs @@ -17,7 +17,7 @@ allDistinctTyVars ) where -#include "HsVersions.h" +#include "GhclibHsVersions.h" import GhcPrelude diff --git a/ghc-lib.cabal b/ghc-lib.cabal --- a/ghc-lib.cabal +++ b/ghc-lib.cabal @@ -1,7 +1,7 @@ cabal-version: >=1.22 build-type: Simple name: ghc-lib -version: 8.10.1.20200412 +version: 8.10.1.20200518 license: BSD3 license-file: LICENSE category: Development @@ -44,9 +44,9 @@ includes/MachDeps.h includes/stg/MachRegs.h includes/CodeGen.Platform.hs - compiler/HsVersions.h + compiler/GhclibHsVersions.h compiler/Unique.h -tested-with: GHC==8.8.2, GHC==8.6.5, GHC==8.4.4 +tested-with: GHC==8.10.1, GHC==8.8.2, GHC==8.6.5, GHC==8.4.4 source-repository head type: git location: git@github.com:digital-asset/ghc-lib.git @@ -82,7 +82,7 @@ transformers == 0.5.*, process >= 1 && < 1.7, hpc == 0.6.*, - ghc-lib-parser == 8.10.1.20200412 + ghc-lib-parser == 8.10.1.20200518 build-tools: alex >= 3.1, happy >= 1.19.4 other-extensions: BangPatterns