X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=54c46b3860ee3183190c074cd42d55b578eee4bd;hb=376101055fb111ebd52b5ef1fb76e00334b44304;hp=54f5953e4cf6a274fb1ae7c21d81150b22c89913;hpb=80564ddc183ea98856994112858f0b9f3e178f94;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 54f5953..54c46b3 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -27,6 +27,10 @@ module StaticFlags (
 	opt_SccProfilingOn,
 	opt_DoTickyProfiling,
 
+        -- Hpc opts
+	opt_Hpc,
+        opt_Hpc_Tracer,
+
 	-- language opts
 	opt_DictsStrict,
 	opt_IrrefutableTuples,
@@ -52,6 +56,10 @@ module StaticFlags (
 	opt_UF_UpdateInPlace,
 	opt_UF_DearOp,
 
+	-- Related to linking
+	opt_PIC,
+	opt_Static,
+
 	-- misc opts
 	opt_IgnoreDotGhci,
 	opt_ErrorSpans,
@@ -59,10 +67,8 @@ module StaticFlags (
 	opt_HiVersion,
 	opt_HistorySize,
 	opt_OmitBlackHoling,
-	opt_Static,
 	opt_Unregisterised,
 	opt_EmitExternalCore,
-	opt_PIC,
 	v_Ld_inputs,
 	tablesNextToCode
   ) where
@@ -99,21 +105,33 @@ parseStaticFlags args = do
   let unreg_flags | cGhcUnregisterised == "YES" = unregFlags
 		  | otherwise = []
 
+  (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags)
+
     -- 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
+    -- static flags.  Those pesky global variables...
   let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
 	       | otherwise	  = []
 
-  (more_leftover, errs) <- processArgs static_flags 
-				(unreg_flags ++ cg_flags ++ way_flags)
   when (not (null errs)) $ ghcError (UsageError (unlines errs))
-  return (more_leftover++leftover)
+  return (cg_flags++more_leftover++leftover)
+
 
+static_flags :: [(String, OptKind IO)]
+-- All the static flags should appear in this list.  It describes how each
+-- static flag should be processed.  Two main purposes:
+-- (a) if a command-line flag doesn't appear in the list, GHC can complain
+-- (b) a command-line flag may remove, or add, other flags; e.g. the "-fno-X" things
+--
+-- The common (PassFlag addOpt) action puts the static flag into the bunch of
+-- things that are searched up by the top-level definitions like
+--	opt_foo = lookUp FSLIT("-dfoo")
 
--- note that ordering is important in the following list: any flag which
+-- Note that ordering is important in the following list: any flag which
 -- is a prefix flag (i.e. HasArg, Prefix, OptPrefix, AnySuffix) will override
 -- flags further down the list with the same prefix.
 
-static_flags :: [(String, OptKind IO)]
 static_flags = [
 	------- GHCi -------------------------------------------------------
      ( "ignore-dot-ghci", PassFlag addOpt )
@@ -132,11 +150,15 @@ static_flags = [
  	-- ToDo: user ways
 
 	------ Debugging ----------------------------------------------------
-  ,  ( "dppr-noprags",     PassFlag addOpt )
   ,  ( "dppr-debug",       PassFlag addOpt )
   ,  ( "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") )
@@ -251,6 +273,13 @@ opt_AutoSccsOnIndividualCafs	= lookUp  FSLIT("-fauto-sccs-on-individual-cafs")
 opt_SccProfilingOn		= lookUp  FSLIT("-fscc-profiling")
 opt_DoTickyProfiling		= lookUp  FSLIT("-fticky-ticky")
 
+
+-- 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")
 opt_IrrefutableTuples		= lookUp  FSLIT("-firrefutable-tuples")
@@ -287,6 +316,11 @@ opt_UF_UpdateInPlace		= lookUp  FSLIT("-funfolding-update-in-place")
 
 opt_UF_DearOp   = ( 4 :: Int)
 			
+#if darwin_TARGET_OS && x86_64_TARGET_ARCH
+opt_PIC                         = True
+#else
+opt_PIC                         = lookUp FSLIT("-fPIC")
+#endif
 opt_Static			= lookUp  FSLIT("-static")
 opt_Unregisterised		= lookUp  FSLIT("-funregisterised")
 
@@ -302,7 +336,6 @@ opt_EmitExternalCore		= lookUp  FSLIT("-fext-core")
 -- Include full span info in error messages, instead of just the start position.
 opt_ErrorSpans			= lookUp FSLIT("-ferror-spans")
 
-opt_PIC                         = lookUp FSLIT("-fPIC")
 
 -- object files and libraries to be linked in are collected here.
 -- ToDo: perhaps this could be done without a global, it wasn't obvious