From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Tue, 1 May 2007 05:37:19 +0000 (+0000)
Subject: Remove references to -fticky-ticky flag
X-Git-Tag: 2007-05-06~34
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=3c506a6cb7a260a93f0ac272a6a3612c5586a5e1

Remove references to -fticky-ticky flag

-ticky is the command-line flag for ticky-ticky profiling now, but
internally, the -fticky-ticky flag was used to represent whether ticky
was on. This led to link errors if the user supplied -fticky-ticky but
not -ticky (ticky code would be generated but the wrong RTS library
would be passed to the linker). I removed references to -fticky-ticky
-- now, only the way flags dictate whether ticky is on, and
-fticky-ticky is no longer accepted as a command-line option.
---

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 3048959..fbdcb68 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -278,8 +278,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
 
@@ -354,7 +353,6 @@ isStaticFlag f =
 	"fauto-sccs-on-exported-toplevs",
 	"fauto-sccs-on-individual-cafs",
 	"fscc-profiling",
-	"fticky-ticky",
 	"fdicts-strict",
 	"firrefutable-tuples",
 	"fparallel",
@@ -548,8 +546,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"