X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FCmdLineOpts.lhs;h=2f6c6a6990a8b71116bdcdc2fab90436ba8890c4;hb=de1d4a16d94fa13e9d40a1ac755eae6249595e66;hp=3e0f33a13a18fb1c9d5f05987e32d25375c96a53;hpb=9225429937efa2e6b54ba254721fad7391081eef;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs
index 3e0f33a..2f6c6a6 100644
--- a/ghc/compiler/main/CmdLineOpts.lhs
+++ b/ghc/compiler/main/CmdLineOpts.lhs
@@ -77,6 +77,7 @@ module CmdLineOpts (
 	opt_LiberateCaseThreshold,
 	opt_StgDoLetNoEscapes,
 	opt_UnfoldCasms,
+	opt_CprOff,
         opt_UsageSPOn,
 	opt_UnboxStrictFields,
 	opt_SimplNoPreInlining,
@@ -186,7 +187,7 @@ data CoreToDo		-- These are diff core-to-core passes,
   | CoreDoSpecialising
   | CoreDoSpecConstr
   | CoreDoUSPInf
-  | CoreDoCPResult
+  | CoreDoOldStrictness
   | CoreDoGlomBinds
   | CoreCSE
   | CoreDoRuleCheck Int{-CompilerPhase-} String	-- Check for non-application of rules 
@@ -291,7 +292,9 @@ data DynFlag
    | Opt_AllowIncoherentInstances
    | Opt_NoMonomorphismRestriction
    | Opt_GlasgowExts
+   | Opt_FFI
    | Opt_PArr			       -- syntactic support for parallel arrays
+   | Opt_With			       -- deprecated keyword for implicit parms
    | Opt_Generics
    | Opt_NoImplicitPrelude 
 
@@ -543,7 +546,7 @@ unpacked_opts :: [String]
 unpacked_opts =
   concat $
   map (expandAts) $
-  map _UNPK_ argv  -- NOT ARGV any more: v_Static_hsc_opts
+  map unpackFS argv  -- NOT ARGV any more: v_Static_hsc_opts
   where
    expandAts ('@':fname) = words (unsafePerformIO (readFile fname))
    expandAts l = [l]
@@ -585,6 +588,8 @@ opt_Flatten			= lookUp  FSLIT("-fflatten")
 opt_NoMethodSharing		= lookUp  FSLIT("-fno-method-sharing")
 opt_DoSemiTagging		= lookUp  FSLIT("-fsemi-tagging")
 opt_FoldrBuildOn		= lookUp  FSLIT("-ffoldr-build-on")
+opt_CprOff			= lookUp  FSLIT("-fcpr-off")
+	-- Switch off CPR analysis in the new demand analyser
 opt_LiberateCaseThreshold	= lookup_def_int "-fliberate-case-threshold" (10::Int)
 opt_StgDoLetNoEscapes		= lookUp  FSLIT("-flet-no-escape")
 opt_UnfoldCasms		        = lookUp  FSLIT("-funfold-casms-in-hi-file")
@@ -598,7 +603,7 @@ opt_MaxWorkerArgs		= lookup_def_int "-fmax-worker-args" (10::Int)
    The Prelude, for example is compiled with '-inpackage std'
 -}
 opt_InPackage			= case lookup_str "-inpackage=" of
-				    Just p  -> _PK_ p
+				    Just p  -> mkFastString p
 				    Nothing -> FSLIT("Main")	-- The package name if none is specified
 
 opt_EmitCExternDecls	        = lookUp  FSLIT("-femit-extern-decls")
@@ -688,7 +693,8 @@ isStaticHscFlag f =
 	"static",
 	"funregisterised",
 	"fext-core",
-	"frule-check"
+	"frule-check",
+	"fcpr-off"
 	]
   || any (flip prefixMatch f) [
 	"fcontext-stack",