X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FCmdLineOpts.lhs;h=ed8e99b7d9a7ef9716c38175c449dc12a9b0ae24;hb=16e4ce4c0c02650082f2e11982017c903c549ad5;hp=f5a83b930292c2c09d29cab22ef3315063371c8d;hpb=37f7228038a8228e1c33c4eaa3c19cab840ad051;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs
index f5a83b9..ed8e99b 100644
--- a/ghc/compiler/main/CmdLineOpts.lhs
+++ b/ghc/compiler/main/CmdLineOpts.lhs
@@ -78,7 +78,6 @@ module CmdLineOpts (
 	opt_StgDoLetNoEscapes,
 	opt_UnfoldCasms,
 	opt_CprOff,
-        opt_UsageSPOn,
 	opt_UnboxStrictFields,
 	opt_SimplNoPreInlining,
 	opt_SimplDoEtaReduction,
@@ -186,7 +185,6 @@ data CoreToDo		-- These are diff core-to-core passes,
   | CoreDoWorkerWrapper
   | CoreDoSpecialising
   | CoreDoSpecConstr
-  | CoreDoUSPInf
   | CoreDoOldStrictness
   | CoreDoGlomBinds
   | CoreCSE
@@ -250,7 +248,6 @@ data DynFlag
    | Opt_D_dump_tc
    | Opt_D_dump_types
    | Opt_D_dump_rules
-   | Opt_D_dump_usagesp
    | Opt_D_dump_cse
    | Opt_D_dump_worker_wrapper
    | Opt_D_dump_rn_trace
@@ -269,8 +266,8 @@ data DynFlag
    | Opt_D_dump_minimal_imports
    | Opt_DoCoreLinting
    | Opt_DoStgLinting
-   | Opt_DoUSPLinting
 
+   | Opt_WarnIsError		-- -Werror; makes warnings fatal
    | Opt_WarnDuplicateExports
    | Opt_WarnHiShadows
    | Opt_WarnIncompletePatterns
@@ -296,6 +293,7 @@ data DynFlag
    | Opt_FFI
    | Opt_PArr			       -- syntactic support for parallel arrays
    | Opt_With			       -- deprecated keyword for implicit parms
+   | Opt_Arrows			       -- Arrow-notation syntax
    | Opt_Generics
    | Opt_NoImplicitPrelude 
 
@@ -343,7 +341,8 @@ data HscLang
 defaultHscLang
   | cGhcWithNativeCodeGen == "YES" && 
 	(prefixMatch "i386" cTARGETPLATFORM ||
-	 prefixMatch "sparc" cTARGETPLATFORM)   =  HscAsm
+	 prefixMatch "sparc" cTARGETPLATFORM ||
+	 prefixMatch "powerpc" cTARGETPLATFORM)   =  HscAsm
   | otherwise					=  HscC
 
 defaultDynFlags = DynFlags {
@@ -593,7 +592,6 @@ opt_CprOff			= lookUp  FSLIT("-fcpr-off")
 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")
-opt_UsageSPOn           	= lookUp  FSLIT("-fusagesp-on")
 opt_UnboxStrictFields		= lookUp  FSLIT("-funbox-strict-fields")
 opt_MaxWorkerArgs		= lookup_def_int "-fmax-worker-args" (10::Int)
 
@@ -670,7 +668,6 @@ isStaticHscFlag f =
 	"ffoldr-build-on",
 	"flet-no-escape",
 	"funfold-casms-in-hi-file",
-	"fusagesp-on",
 	"funbox-strict-fields",
 	"femit-extern-decls",
 	"fglobalise-toplev-names",