Make -dynload sysdep mean to embed rpaths in shared libs as well as binaries

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

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 456f620..d3b7cb4 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -27,7 +27,6 @@ module StaticFlags (
 
        -- profiling opts
        opt_SccProfilingOn,
-       opt_DoTickyProfiling,
 
         -- Hpc opts
        opt_Hpc,
@@ -196,8 +195,6 @@ opt_NoDebugOutput               = lookUp  (fsLit "-dno-debug-output")
 -- profiling opts
 opt_SccProfilingOn :: Bool
 opt_SccProfilingOn             = lookUp  (fsLit "-fscc-profiling")
-opt_DoTickyProfiling :: Bool
-opt_DoTickyProfiling            = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
 
 -- Hpc opts
 opt_Hpc :: Bool
@@ -254,7 +251,7 @@ opt_SimplExcessPrecision    = lookUp  (fsLit "-fexcess-precision")
 opt_UF_CreationThreshold :: Int
 opt_UF_CreationThreshold       = lookup_def_int "-funfolding-creation-threshold"  (45::Int)
 opt_UF_UseThreshold :: Int
-opt_UF_UseThreshold            = lookup_def_int "-funfolding-use-threshold"       (8::Int)     -- Discounts can be big
+opt_UF_UseThreshold            = lookup_def_int "-funfolding-use-threshold"       (6::Int)     -- Discounts can be big
 opt_UF_FunAppDiscount :: Int
 opt_UF_FunAppDiscount          = lookup_def_int "-funfolding-fun-discount"        (6::Int)     -- It's great to inline a fn
 opt_UF_KeenessFactor :: Float
@@ -323,6 +320,7 @@ data WayName
   = WayThreaded
   | WayDebug
   | WayProf
+  | WayEventLog
   | WayTicky
   | WayPar
   | WayGran
@@ -362,6 +360,7 @@ allowed_combination way = and [ x `allowedWith` y
 
        WayProf `allowedWith` WayNDP            = True
        WayThreaded `allowedWith` WayProf       = True
+       WayThreaded `allowedWith` WayEventLog   = True
        _ `allowedWith` _                       = False
 
 
@@ -428,6 +427,10 @@ way_details =
        , "-DPROFILING"
        , "-optc-DPROFILING" ]),
 
+    (WayEventLog, Way  "l" True "RTS Event Logging"
+       [ "-DEVENTLOG"
+       , "-optc-DEVENTLOG" ]),
+
     (WayTicky, Way  "t" True "Ticky-ticky Profiling"  
        [ "-DTICKY_TICKY"
        , "-optc-DTICKY_TICKY" ]),