X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=59e125c82dbc74863750d3ff5ef89b7ebeeb5e95;hb=7e4010e68c62f101d7de4eafd16dec94ea0085f0;hp=039051b8b9490af824c396f765a42c715c236bae;hpb=9226af9eef1cc45dd745ce21ddeb36a0be0da708;p=ghc-hetmet.git diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 039051b..59e125c 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -59,13 +59,11 @@ module StaticFlags ( opt_UF_UseThreshold, opt_UF_FunAppDiscount, opt_UF_KeenessFactor, - opt_UF_UpdateInPlace, opt_UF_DearOp, -- Related to linking opt_PIC, opt_Static, - opt_HardwireLibPaths, -- misc opts opt_IgnoreDotGhci, @@ -226,7 +224,7 @@ GLOBAL_VAR(v_opt_C_ready, False, Bool) staticFlags = unsafePerformIO $ do ready <- readIORef v_opt_C_ready if (not ready) - then panic "a static opt was looked at too early!" + then panic "Static flags have not been initialised!\n Please call GHC.newSession or GHC.parseStaticFlags early enough." else readIORef v_opt_C -- -static is the default @@ -328,7 +326,6 @@ opt_UF_CreationThreshold = lookup_def_int "-funfolding-creation-threshold" (45: opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float) -opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place") opt_UF_DearOp = ( 4 :: Int) @@ -338,7 +335,6 @@ opt_PIC = True opt_PIC = lookUp FSLIT("-fPIC") #endif opt_Static = lookUp FSLIT("-static") -opt_HardwireLibPaths = lookUp FSLIT("-fhardwire-lib-paths") opt_Unregisterised = lookUp FSLIT("-funregisterised") -- Derived, not a real option. Determines whether we will be compiling @@ -377,7 +373,6 @@ isStaticFlag f = "fruntime-types", "fno-pre-inlining", "fexcess-precision", - "funfolding-update-in-place", "static", "fhardwire-lib-paths", "funregisterised",