Making -fhpc work with a stage1 build, via the compat 'package'.

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

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 54c46b3..457626c 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,
@@ -41,9 +41,7 @@ module StaticFlags (
        -- optimisation opts
        opt_NoMethodSharing, 
        opt_NoStateHack,
-       opt_LiberateCaseThreshold,
        opt_CprOff,
-       opt_RulesOff,
        opt_SimplNoPreInlining,
        opt_SimplExcessPrecision,
        opt_MaxWorkerArgs,
@@ -80,7 +78,7 @@ import Config
 import FastString      ( FastString, mkFastString )
 import Util
 import Maybes          ( firstJust )
-import Panic           ( GhcException(..), ghcError )
+import Panic
 
 import Control.Exception ( throwDyn )
 import Data.IORef
@@ -94,11 +92,14 @@ 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))
 
     -- deal with the way flags: the way (eg. prof) gives rise to
-    -- futher flags, some of which might be static.
+    -- further flags, some of which might be static.
   way_flags <- findBuildTag
 
     -- if we're unregisterised, add some more flags
@@ -107,6 +108,9 @@ parseStaticFlags args = do
 
   (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags)
 
+    -- see sanity code in staticOpts
+  writeIORef v_opt_C_ready True
+
     -- TABLES_NEXT_TO_CODE affects the info table layout.
     -- Be careful to do this *after* all processArgs,
     -- because evaluating tablesNextToCode involves looking at the global
@@ -117,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
@@ -157,7 +163,6 @@ static_flags = [
        --------- Haskell Program Coverage -----------------------------------
 
   ,  ( "fhpc"           , PassFlag addOpt )
-  ,  ( "fhpc-tracer"    , PassFlag addOpt )
 
        --------- Profiling --------------------------------------------------
   ,  ( "auto-all"      , NoArg (addOpt "-fauto-sccs-on-all-toplevs") )
@@ -206,7 +211,12 @@ lookup_str       :: String -> Maybe String
 -- holds the static opts while they're being collected, before
 -- being unsafely read by unpacked_static_opts below.
 GLOBAL_VAR(v_opt_C, defaultStaticOpts, [String])
-staticFlags = unsafePerformIO (readIORef v_opt_C)
+GLOBAL_VAR(v_opt_C_ready, False, Bool)
+staticFlags = unsafePerformIO $ do
+  ready <- readIORef v_opt_C_ready
+  if (not ready)
+        then panic "a static opt was looked at too early!"
+        else readIORef v_opt_C
 
 -- -static is the default
 defaultStaticOpts = ["-static"]
@@ -271,14 +281,10 @@ opt_AutoSccsOnAllToplevs  = lookUp  FSLIT("-fauto-sccs-on-all-toplevs")
 opt_AutoSccsOnExportedToplevs  = lookUp  FSLIT("-fauto-sccs-on-exported-toplevs")
 opt_AutoSccsOnIndividualCafs   = lookUp  FSLIT("-fauto-sccs-on-individual-cafs")
 opt_SccProfilingOn             = lookUp  FSLIT("-fscc-profiling")
-opt_DoTickyProfiling           = lookUp  FSLIT("-fticky-ticky")
-
+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")
@@ -290,13 +296,11 @@ opt_Flatten                       = lookUp  FSLIT("-fflatten")
 opt_NoStateHack                        = lookUp  FSLIT("-fno-state-hack")
 opt_NoMethodSharing            = lookUp  FSLIT("-fno-method-sharing")
 opt_CprOff                     = lookUp  FSLIT("-fcpr-off")
-opt_RulesOff                   = lookUp  FSLIT("-frules-off")
        -- Switch off CPR analysis in the new demand analyser
-opt_LiberateCaseThreshold      = lookup_def_int "-fliberate-case-threshold" (10::Int)
 opt_MaxWorkerArgs              = lookup_def_int "-fmax-worker-args" (10::Int)
 
 opt_GranMacros                 = lookUp  FSLIT("-fgransim")
-opt_HiVersion                  = read (cProjectVersionInt ++ cProjectPatchLevel) :: Int
+opt_HiVersion                  = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer
 opt_HistorySize                        = lookup_def_int "-fhistory-size" 20
 opt_OmitBlackHoling            = lookUp  FSLIT("-dno-black-holing")
 opt_RuntimeTypes               = lookUp  FSLIT("-fruntime-types")
@@ -348,7 +352,6 @@ isStaticFlag f =
        "fauto-sccs-on-exported-toplevs",
        "fauto-sccs-on-individual-cafs",
        "fscc-profiling",
-       "fticky-ticky",
        "fdicts-strict",
        "firrefutable-tuples",
        "fparallel",
@@ -365,7 +368,6 @@ isStaticFlag f =
        "static",
        "funregisterised",
        "fext-core",
-       "frules-off",
        "fcpr-off",
        "ferror-spans",
        "fPIC"
@@ -411,13 +413,8 @@ decodeSize str
 -----------------------------------------------------------------------------
 -- RTS Hooks
 
-#if __GLASGOW_HASKELL__ >= 504
 foreign import ccall unsafe "setHeapSize"       setHeapSize       :: Int -> IO ()
 foreign import ccall unsafe "enableTimingStats" enableTimingStats :: IO ()
-#else
-foreign import "setHeapSize"       unsafe setHeapSize       :: Int -> IO ()
-foreign import "enableTimingStats" unsafe enableTimingStats :: IO ()
-#endif
 
 -----------------------------------------------------------------------------
 -- Ways
@@ -491,6 +488,7 @@ findBuildTag :: IO [String]  -- new options
 findBuildTag = do
   way_names <- readIORef v_Ways
   let ws = sort (nub way_names)
+
   if not (allowed_combination ws)
       then throwDyn (CmdLineError $
                    "combination not supported: "  ++
@@ -505,6 +503,8 @@ findBuildTag = do
           writeIORef v_RTS_Build_tag rts_tag
           return (concat flags)
 
+
+
 mkBuildTag :: [Way] -> String
 mkBuildTag ways = concat (intersperse "_" (map wayTag ways))
 
@@ -513,6 +513,8 @@ lkupWay w =
        Nothing -> error "findBuildTag"
        Just details -> details
 
+isRTSWay = wayRTSOnly . lkupWay 
+
 data Way = Way {
   wayTag     :: String,
   wayRTSOnly :: Bool,
@@ -543,9 +545,8 @@ way_details =
        , "-DPROFILING"
        , "-optc-DPROFILING" ]),
 
-    (WayTicky, Way  "t" False "Ticky-ticky Profiling"  
-       [ "-fticky-ticky"
-       , "-DTICKY_TICKY"
+    (WayTicky, Way  "t" True "Ticky-ticky Profiling"  
+       [ "-DTICKY_TICKY"
        , "-optc-DTICKY_TICKY" ]),
 
     (WayUnreg, Way  "u" False "Unregisterised"