X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=e5153ea33a9d54a27b9b1b0fc18d6c22edcae6c6;hb=2c8701fbebc0a6a49248392b53d977f0afdea4ec;hp=fa5ae4b19652e4c22c3ad037fc459b9307d955b5;hpb=cdce647711c0f46f5799b24de087622cb77e647f;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index fa5ae4b..e5153ea 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -17,7 +17,7 @@ module DynFlags (
 	-- Dynamic flags
 	DynFlag(..),
 	DynFlags(..),
-	HscTarget(..), isObjectTarget,
+	HscTarget(..), isObjectTarget, defaultObjectTarget,
 	GhcMode(..), isOneShot,
 	GhcLink(..), isNoLink,
 	PackageFlag(..),
@@ -148,6 +148,7 @@ data DynFlag
    | Opt_WarnOverlappingPatterns
    | Opt_WarnSimplePatterns
    | Opt_WarnTypeDefaults
+   | Opt_WarnMonomorphism
    | Opt_WarnUnusedBinds
    | Opt_WarnUnusedImports
    | Opt_WarnUnusedMatches
@@ -191,6 +192,7 @@ data DynFlag
    | Opt_CaseMerge
    | Opt_UnboxStrictFields
    | Opt_DictsCheap
+   | Opt_RewriteRules
 
    -- misc opts
    | Opt_Cpp
@@ -364,7 +366,11 @@ data PackageFlag
   | IgnorePackage  String
   deriving Eq
 
-defaultHscTarget
+defaultHscTarget = defaultObjectTarget
+
+-- | the 'HscTarget' value corresponding to the default way to create
+-- object files on the current platform.
+defaultObjectTarget
   | cGhcWithNativeCodeGen == "YES" 	=  HscAsm
   | otherwise				=  HscC
 
@@ -559,12 +565,16 @@ optLevelFlags :: [([Int], DynFlag)]
 optLevelFlags
   = [ ([0],	Opt_IgnoreInterfacePragmas)
     , ([0],     Opt_OmitInterfacePragmas)
+
     , ([1,2],	Opt_IgnoreAsserts)
+    , ([1,2],	Opt_RewriteRules)	-- Off for -O0; see Note [Scoping for Builtin rules]
+					-- 		in PrelRules
     , ([1,2],	Opt_DoEtaReduction)
     , ([1,2],	Opt_CaseMerge)
     , ([1,2],	Opt_Strictness)
     , ([1,2],	Opt_CSE)
     , ([1,2],	Opt_FullLaziness)
+
     , ([2],	Opt_LiberateCase)
     , ([2],	Opt_SpecConstr)
 
@@ -1023,6 +1033,7 @@ fFlags = [
   ( "warn-overlapping-patterns", 	Opt_WarnOverlappingPatterns ),
   ( "warn-simple-patterns",      	Opt_WarnSimplePatterns ),
   ( "warn-type-defaults",        	Opt_WarnTypeDefaults ),
+  ( "warn-monomorphism-restriction",   	Opt_WarnMonomorphism ),
   ( "warn-unused-binds",         	Opt_WarnUnusedBinds ),
   ( "warn-unused-imports",       	Opt_WarnUnusedImports ),
   ( "warn-unused-matches",       	Opt_WarnUnusedMatches ),
@@ -1065,7 +1076,8 @@ fFlags = [
   ( "asm-mangling",			Opt_DoAsmMangling ),
   ( "print-bind-result",		Opt_PrintBindResult ),
   ( "force-recomp",			Opt_ForceRecomp ),
-  ( "hpc-no-auto",			Opt_Hpc_No_Auto )
+  ( "hpc-no-auto",			Opt_Hpc_No_Auto ),
+  ( "rewrite-rules",			Opt_RewriteRules )
   ]