X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=2a8c4dc774650167f40c972a0f078b6f655176d9;hb=3d8dbba7d24c9139b800f4ccf31c50b11596fc2e;hp=be70daa8bd39a9ecfb93c131369dba0f6999ce35;hpb=5bf1b7f5742ba6405239692f329e8be35491b350;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index be70daa..2a8c4dc 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -42,7 +42,6 @@ module StaticFlags (
 	opt_NoMethodSharing, 
 	opt_NoStateHack,
 	opt_CprOff,
-	opt_RulesOff,
 	opt_SimplNoPreInlining,
 	opt_SimplExcessPrecision,
 	opt_MaxWorkerArgs,
@@ -278,8 +277,7 @@ 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
 
@@ -297,12 +295,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_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")
@@ -354,7 +351,6 @@ isStaticFlag f =
 	"fauto-sccs-on-exported-toplevs",
 	"fauto-sccs-on-individual-cafs",
 	"fscc-profiling",
-	"fticky-ticky",
 	"fdicts-strict",
 	"firrefutable-tuples",
 	"fparallel",
@@ -371,7 +367,6 @@ isStaticFlag f =
 	"static",
 	"funregisterised",
 	"fext-core",
-	"frules-off",
 	"fcpr-off",
 	"ferror-spans",
 	"fPIC"
@@ -417,13 +412,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
@@ -553,8 +543,7 @@ way_details =
 	, "-optc-DPROFILING" ]),
 
     (WayTicky, Way  "t" True "Ticky-ticky Profiling"  
-	[ "-fticky-ticky"
-	, "-DTICKY_TICKY"
+	[ "-DTICKY_TICKY"
 	, "-optc-DTICKY_TICKY" ]),
 
     (WayUnreg, Way  "u" False "Unregisterised"