diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 2 | ||||
| -rw-r--r-- | compiler/main/HscMain.hs | 5 | ||||
| -rw-r--r-- | compiler/main/StaticFlagParser.hs | 1 | ||||
| -rw-r--r-- | compiler/main/StaticFlags.hs | 7 |
4 files changed, 4 insertions, 11 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index fc11f2d52d..4d41642e75 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -321,6 +321,7 @@ data DynFlag | Opt_Parallel | Opt_GranMacros | Opt_PIC + | Opt_SccProfilingOn -- output style opts | Opt_PprCaseAsLet @@ -2045,6 +2046,7 @@ fFlags = [ ( "helpful-errors", Opt_HelpfulErrors, nop ), ( "defer-type-errors", Opt_DeferTypeErrors, nop ), ( "parallel", Opt_Parallel, nop ), + ( "scc-profiling", Opt_SccProfilingOn, nop ), ( "gransim", Opt_GranMacros, nop ), ( "building-cabal-package", Opt_BuildingCabalPackage, nop ), ( "implicit-import-qualified", Opt_ImplicitImportQualified, nop ), diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index 215a654185..9474ca2a8b 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -1249,7 +1249,6 @@ hscGenHardCode cgguts mod_summary = do cg_dep_pkgs = dependencies, cg_hpc_info = hpc_info } = cgguts dflags = hsc_dflags hsc_env - platform = targetPlatform dflags location = ms_location mod_summary data_tycons = filter isDataTyCon tycons -- cg_tycons includes newtypes, for the benefit of External Core, @@ -1283,7 +1282,7 @@ hscGenHardCode cgguts mod_summary = do ------------------ Code output ----------------------- rawcmms0 <- {-# SCC "cmmToRawCmm" #-} - cmmToRawCmm platform cmms + cmmToRawCmm dflags cmms let dump a = do dumpIfSet_dyn dflags Opt_D_dump_raw_cmm "Raw Cmm" (ppr a) @@ -1342,7 +1341,7 @@ hscCompileCmmFile hsc_env filename = runHsc hsc_env $ do let dflags = hsc_dflags hsc_env cmm <- ioMsgMaybe $ parseCmmFile dflags filename liftIO $ do - rawCmms <- cmmToRawCmm (targetPlatform dflags) (Stream.yield cmm) + rawCmms <- cmmToRawCmm dflags (Stream.yield cmm) _ <- codeOutput dflags no_mod no_loc NoStubs [] rawCmms return () where diff --git a/compiler/main/StaticFlagParser.hs b/compiler/main/StaticFlagParser.hs index 2ef2914b30..ddb40268fb 100644 --- a/compiler/main/StaticFlagParser.hs +++ b/compiler/main/StaticFlagParser.hs @@ -170,7 +170,6 @@ flagsStatic = [ isStaticFlag :: String -> Bool isStaticFlag f = f `elem` [ - "fscc-profiling", "fdicts-strict", "fspec-inline-join-points", "fno-hi-version-check", diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs index 3d33565b5a..79faf1ec2f 100644 --- a/compiler/main/StaticFlags.hs +++ b/compiler/main/StaticFlags.hs @@ -40,9 +40,6 @@ module StaticFlags ( opt_SuppressTypeSignatures, opt_SuppressVarKinds, - -- profiling opts - opt_SccProfilingOn, - -- Hpc opts opt_Hpc, @@ -250,10 +247,6 @@ opt_Fuel = lookup_def_int "-dopt-fuel" maxBound opt_NoDebugOutput :: Bool opt_NoDebugOutput = lookUp (fsLit "-dno-debug-output") --- profiling opts -opt_SccProfilingOn :: Bool -opt_SccProfilingOn = lookUp (fsLit "-fscc-profiling") - -- Hpc opts opt_Hpc :: Bool opt_Hpc = lookUp (fsLit "-fhpc") |