Commit 40b2a22c authored by chak@cse.unsw.edu.au.'s avatar chak@cse.unsw.edu.au.
Browse files

Remove the -fdph-* flags

parent 0bfe5c05
......@@ -37,7 +37,6 @@ module DynFlags (
Option(..), showOpt,
DynLibLoader(..),
fFlags, fWarningFlags, fLangFlags, xFlags,
DPHBackend(..), dphPackageMaybe,
wayNames, dynFlagDependencies,
-- ** Safe Haskell
......@@ -467,8 +466,6 @@ data DynFlags = DynFlags {
mainFunIs :: Maybe String,
ctxtStkDepth :: Int, -- ^ Typechecker context stack depth
dphBackend :: DPHBackend,
thisPackage :: PackageId, -- ^ name of package currently being compiled
-- ways
......@@ -841,8 +838,6 @@ defaultDynFlags mySettings =
mainFunIs = Nothing,
ctxtStkDepth = mAX_CONTEXT_REDUCTION_DEPTH,
dphBackend = DPHNone,
thisPackage = mainPackageId,
objectDir = Nothing,
......@@ -1622,13 +1617,6 @@ dynamic_flags = [
, Flag "fprof-auto-exported" (noArg (\d -> d { profAuto = ProfAutoExports } ))
, Flag "fno-prof-auto" (noArg (\d -> d { profAuto = NoProfAuto } ))
------ DPH flags ----------------------------------------------------
, Flag "fdph-seq" (NoArg (setDPHBackend DPHSeq))
, Flag "fdph-par" (NoArg (setDPHBackend DPHPar))
, Flag "fdph-this" (NoArg (setDPHBackend DPHThis))
, Flag "fdph-none" (NoArg (setDPHBackend DPHNone))
------ Compiler flags -----------------------------------------------
, Flag "fasm" (NoArg (setObjTarget HscAsm))
......@@ -2358,29 +2346,6 @@ setDPHOpt dflags = setOptLevel 2 (dflags { maxSimplIterations = 20
, simplPhases = 3
})
-- Determines the package used by the vectoriser for the symbols of the vectorised code.
-- 'DPHNone' indicates that no data-parallel backend library is available; hence, the
-- vectoriser cannot be used.
--
data DPHBackend = DPHPar -- "dph-par"
| DPHSeq -- "dph-seq"
| DPHThis -- the currently compiled package
| DPHNone -- no DPH library available
deriving(Eq, Ord, Enum, Show)
setDPHBackend :: DPHBackend -> DynP ()
setDPHBackend backend = upd $ \dflags -> dflags { dphBackend = backend }
-- Query the DPH backend package to be used by the vectoriser and desugaring of DPH syntax.
--
dphPackageMaybe :: DynFlags -> Maybe PackageId
dphPackageMaybe dflags
= case dphBackend dflags of
DPHPar -> Just dphParPackageId
DPHSeq -> Just dphSeqPackageId
DPHThis -> Just (thisPackage dflags)
DPHNone -> Nothing
setMainIs :: String -> DynP ()
setMainIs arg
| not (null main_fn) && isLower (head main_fn)
......
......@@ -724,13 +724,7 @@ mkPackageState dflags pkgs0 preload0 this_package = do
-}
let
flags = reverse (packageFlags dflags) ++ dphPackage
-- expose the appropriate DPH backend library
dphPackage = case dphBackend dflags of
DPHPar -> [ExposePackage "dph-par"]
DPHSeq -> [ExposePackage "dph-seq"]
DPHThis -> []
DPHNone -> []
flags = reverse (packageFlags dflags)
-- pkgs0 with duplicate packages filtered out. This is
-- important: it is possible for a package in the global package
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment