Fixing -fhpc flag to allow -fno-hpc

[ghc-hetmet.git] / compiler / main / StaticFlags.hs

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 2a8c4dc..9e13360 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -12,9 +12,10 @@
 module StaticFlags (
        parseStaticFlags,
        staticFlags,
+        initStaticOpts,
 
        -- 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,
@@ -29,7 +30,6 @@ module StaticFlags (
 
         -- Hpc opts
        opt_Hpc,
-        opt_Hpc_Tracer,
 
        -- language opts
        opt_DictsStrict,
@@ -92,6 +92,9 @@ import Data.List      ( sort, intersperse, nub )
 
 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))
 
@@ -118,6 +121,8 @@ parseStaticFlags args = do
   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
@@ -155,11 +160,6 @@ static_flags = [
   ,  ( "dppr-user-length", AnySuffix addOpt )
       -- rest of the debugging flags are dynamic
 
-       --------- Haskell Program Coverage -----------------------------------
-
-  ,  ( "fhpc"           , PassFlag addOpt )
-  ,  ( "fhpc-tracer"    , PassFlag addOpt )
-
        --------- Profiling --------------------------------------------------
   ,  ( "auto-all"      , NoArg (addOpt "-fauto-sccs-on-all-toplevs") )
   ,  ( "auto"          , NoArg (addOpt "-fauto-sccs-on-exported-toplevs") )
@@ -280,10 +280,7 @@ opt_SccProfilingOn         = lookUp  FSLIT("-fscc-profiling")
 opt_DoTickyProfiling            = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
 
 -- Hpc opts
-
 opt_Hpc                                = lookUp FSLIT("-fhpc")  
-                                 || opt_Hpc_Tracer 
-opt_Hpc_Tracer                 = lookUp FSLIT("-fhpc-tracer")
 
 -- language opts
 opt_DictsStrict                        = lookUp  FSLIT("-fdicts-strict")
@@ -369,7 +366,8 @@ isStaticFlag f =
        "fext-core",
        "fcpr-off",
        "ferror-spans",
-       "fPIC"
+       "fPIC",
+       "fhpc"
        ]
   || any (flip prefixMatch f) [
        "fliberate-case-threshold",
@@ -512,6 +510,8 @@ lkupWay w =
        Nothing -> error "findBuildTag"
        Just details -> details
 
+isRTSWay = wayRTSOnly . lkupWay 
+
 data Way = Way {
   wayTag     :: String,
   wayRTSOnly :: Bool,