X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=e71c5c7f985a99d5d32d4c2640a30b70b5e1976c;hb=3092ace710af6d63ea57394eba91d4edc5b7cb91;hp=2a8c4dc774650167f40c972a0f078b6f655176d9;hpb=5943ce90c9c9d4319eec3cfe1fb3315f018e1c45;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 2a8c4dc..e71c5c7 100644
--- 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,
@@ -85,13 +85,16 @@ import Data.IORef
 import System.IO.Unsafe	( unsafePerformIO )
 import Control.Monad	( when )
 import Data.Char	( isDigit )
-import Data.List	( sort, intersperse, nub )
+import Data.List
 
 -----------------------------------------------------------------------------
 -- Static flags
 
 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))
 
@@ -115,9 +118,17 @@ parseStaticFlags args = do
   let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
 	       | otherwise	  = []
 
+    -- HACK: -fexcess-precision is both a static and a dynamic flag.  If
+    -- the static flag parser has slurped it, we must return it as a 
+    -- leftover too.  ToDo: make -fexcess-precision dynamic only.
+  let excess_prec | opt_SimplExcessPrecision = ["-fexcess-precision"]
+                  | otherwise                = []
+
   when (not (null errs)) $ ghcError (UsageError (unlines errs))
-  return (cg_flags++more_leftover++leftover)
+  return (excess_prec++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 +166,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 +286,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,9 +372,10 @@ isStaticFlag f =
 	"fext-core",
 	"fcpr-off",
 	"ferror-spans",
-	"fPIC"
+	"fPIC",
+	"fhpc"
 	]
-  || any (flip prefixMatch f) [
+  || any (`isPrefixOf` f) [
 	"fliberate-case-threshold",
 	"fmax-worker-args",
 	"fhistory-size",
@@ -512,6 +516,8 @@ lkupWay w =
 	Nothing -> error "findBuildTag"
 	Just details -> details
 
+isRTSWay = wayRTSOnly . lkupWay 
+
 data Way = Way {
   wayTag     :: String,
   wayRTSOnly :: Bool,