projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clamp -O flag to beween 0 and 2
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
2a8c4dc
..
67e8ab5
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-12,9
+12,10
@@
module StaticFlags (
parseStaticFlags,
staticFlags,
module StaticFlags (
parseStaticFlags,
staticFlags,
+ initStaticOpts,
-- Ways
-- Ways
- WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag,
+ WayName(..), v_Ways, v_Build_tag, v_RTS_Build_tag, isRTSWay,
-- Output style options
opt_PprUserLength,
-- Output style options
opt_PprUserLength,
@@
-29,7
+30,6
@@
module StaticFlags (
-- Hpc opts
opt_Hpc,
-- Hpc opts
opt_Hpc,
- opt_Hpc_Tracer,
-- language opts
opt_DictsStrict,
-- language opts
opt_DictsStrict,
@@
-92,6
+92,9
@@
import Data.List ( sort, intersperse, nub )
parseStaticFlags :: [String] -> IO [String]
parseStaticFlags args = do
parseStaticFlags :: [String] -> IO [String]
parseStaticFlags args = do
+ ready <- readIORef v_opt_C_ready
+ when ready $ throwDyn (ProgramError "Too late for parseStaticFlags: call it before newSession")
+
(leftover, errs) <- processArgs static_flags args
when (not (null errs)) $ throwDyn (UsageError (unlines errs))
(leftover, errs) <- processArgs static_flags args
when (not (null errs)) $ throwDyn (UsageError (unlines errs))
@@
-118,6
+121,8
@@
parseStaticFlags args = do
when (not (null errs)) $ ghcError (UsageError (unlines errs))
return (cg_flags++more_leftover++leftover)
when (not (null errs)) $ ghcError (UsageError (unlines errs))
return (cg_flags++more_leftover++leftover)
+initStaticOpts :: IO ()
+initStaticOpts = writeIORef v_opt_C_ready True
static_flags :: [(String, OptKind IO)]
-- All the static flags should appear in this list. It describes how each
static_flags :: [(String, OptKind IO)]
-- All the static flags should appear in this list. It describes how each
@@
-279,11
+284,12
@@
opt_AutoSccsOnIndividualCafs = lookUp FSLIT("-fauto-sccs-on-individual-cafs")
opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling")
opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
opt_SccProfilingOn = lookUp FSLIT("-fscc-profiling")
opt_DoTickyProfiling = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
--- Hpc opts
-
+-- Hpc opts, only work in a stage2 build
+#if GHCI
opt_Hpc = lookUp FSLIT("-fhpc")
opt_Hpc = lookUp FSLIT("-fhpc")
- || opt_Hpc_Tracer
-opt_Hpc_Tracer = lookUp FSLIT("-fhpc-tracer")
+#else
+opt_Hpc = False
+#endif
-- language opts
opt_DictsStrict = lookUp FSLIT("-fdicts-strict")
-- language opts
opt_DictsStrict = lookUp FSLIT("-fdicts-strict")
@@
-512,6
+518,8
@@
lkupWay w =
Nothing -> error "findBuildTag"
Just details -> details
Nothing -> error "findBuildTag"
Just details -> details
+isRTSWay = wayRTSOnly . lkupWay
+
data Way = Way {
wayTag :: String,
wayRTSOnly :: Bool,
data Way = Way {
wayTag :: String,
wayRTSOnly :: Bool,