X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=1d19f8e9ffa505cf9b53e759b1644072b93f3ad9;hb=f4e4060721bdbeee81d5e9fd3c8d909ece6195df;hp=422b2202f06d37dabc4bc964604f3f349d8e0166;hpb=59fbf57f6b4b200c676c2ba3298e1ca2170f2266;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 422b220..1d19f8e 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -92,6 +92,7 @@ data DynFlag
 
    -- debugging flags
    = Opt_D_dump_cmm
+   | Opt_D_dump_cps_cmm
    | Opt_D_dump_asm
    | Opt_D_dump_cpranal
    | Opt_D_dump_deriv
@@ -182,6 +183,8 @@ data DynFlag
    | Opt_RecordPuns
    | Opt_GADTs
    | Opt_RelaxedPolyRec			-- -X=RelaxedPolyRec
+   | Opt_MagicHash
+   | Opt_EmptyDataDecls
 
    -- optimisation opts
    | Opt_Strictness
@@ -199,9 +202,9 @@ data DynFlag
    | Opt_UnboxStrictFields
    | Opt_DictsCheap
    | Opt_RewriteRules
+   | Opt_Vectorise
 
    -- misc opts
-   | Opt_ShortGhciBanner
    | Opt_Cpp
    | Opt_Pp
    | Opt_ForceRecomp
@@ -843,8 +846,6 @@ dynamic_flags = [
   ,  ( "F"		, NoArg  (setDynFlag Opt_Pp))
   ,  ( "#include"	, HasArg (addCmdlineHCInclude) )
   ,  ( "v"		, OptIntSuffix setVerbosity )
-  ,  ( "short-ghci-banner", NoArg (setDynFlag Opt_ShortGhciBanner) )
-  ,  ( "long-ghci-banner" , NoArg (unSetDynFlag Opt_ShortGhciBanner) )
 
         ------- Specific phases  --------------------------------------------
   ,  ( "pgmL"           , HasArg (upd . setPgmL) )  
@@ -940,6 +941,7 @@ dynamic_flags = [
   ,  ( "dstg-stats",	NoArg (setDynFlag Opt_StgStats))
 
   ,  ( "ddump-cmm",         	 setDumpFlag Opt_D_dump_cmm)
+  ,  ( "ddump-cps-cmm",        	 setDumpFlag Opt_D_dump_cps_cmm)
   ,  ( "ddump-asm",          	 setDumpFlag Opt_D_dump_asm)
   ,  ( "ddump-cpranal",      	 setDumpFlag Opt_D_dump_cpranal)
   ,  ( "ddump-deriv",        	 setDumpFlag Opt_D_dump_deriv)
@@ -973,13 +975,13 @@ dynamic_flags = [
   ,  ( "dsource-stats",          setDumpFlag Opt_D_source_stats)
   ,  ( "dverbose-core2core",     setDumpFlag Opt_D_verbose_core2core)
   ,  ( "dverbose-stg2stg",       setDumpFlag Opt_D_verbose_stg2stg)
-  ,  ( "ddump-hi-diffs",         setDumpFlag Opt_D_dump_hi_diffs)
   ,  ( "ddump-hi",               setDumpFlag Opt_D_dump_hi)
   ,  ( "ddump-minimal-imports",  setDumpFlag Opt_D_dump_minimal_imports)
   ,  ( "ddump-vect",         	 setDumpFlag Opt_D_dump_vect)
   ,  ( "ddump-hpc",         	 setDumpFlag Opt_D_dump_hpc)
   ,  ( "ddump-mod-cycles",     	 setDumpFlag Opt_D_dump_mod_cycles)
   
+  ,  ( "ddump-hi-diffs",         NoArg (setDynFlag Opt_D_dump_hi_diffs))
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting))
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting))
   ,  ( "dcmm-lint",		 NoArg (setDynFlag Opt_DoCmmLinting))
@@ -1084,21 +1086,24 @@ fFlags = [
   ( "force-recomp",			Opt_ForceRecomp ),
   ( "hpc-no-auto",			Opt_Hpc_No_Auto ),
   ( "rewrite-rules",			Opt_RewriteRules ),
-  ( "break-on-exception",               Opt_BreakOnException )
+  ( "break-on-exception",               Opt_BreakOnException ),
+  ( "vectorise",                        Opt_Vectorise )
   ]
 
 
 -- These -X<blah> flags can all be reversed with -Xno-<blah>
 xFlags :: [(String, DynFlag)]
 xFlags = [
+  ( "MagicHash",                        Opt_MagicHash ),
+  ( "EmptyDataDecls",                   Opt_EmptyDataDecls ),
   ( "FI",				Opt_FFI ),  -- support `-ffi'...
   ( "FFI",				Opt_FFI ),  -- ...and also `-fffi'
-  ( "ForeignFunctionInterface",		Opt_FFI ),  -- ...and also `-fffi'
+  ( "ForeignFunctionInterface",		Opt_FFI ),
 
   ( "Arrows",				Opt_Arrows ), -- arrow syntax
   ( "Parr",				Opt_PArr ),
 
-  ( "TH",				Opt_TH ),
+  ( "TH",				Opt_TH ), -- support -fth
   ( "TemplateHaskelll",			Opt_TH ),
 
   ( "Generics",  			Opt_Generics ),
@@ -1134,6 +1139,8 @@ glasgowExtsFlags = [ Opt_GlasgowExts
 		   , Opt_GADTs
 		   , Opt_ImplicitParams 
 		   , Opt_ScopedTypeVariables
+		   , Opt_MagicHash
+           , Opt_EmptyDataDecls
 		   , Opt_TypeFamilies ]
 
 ------------------
@@ -1430,7 +1437,7 @@ machdepCCOpts dflags
 	       sta = opt_Static
 	   in
 	            ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else ""
---                    , if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin" else "" 
+--                    , if "mingw32" `isSuffixOf` cTARGETPLATFORM then "-mno-cygwin" else "" 
 		      ],
 		      [ "-fno-defer-pop",
 #ifdef HAVE_GCC_MNO_OMIT_LFPTR