X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=896f136fd0fb2f87ca668a74318231fc17ad93cf;hb=ef2c1a6683290518e611d3c1b55d2f5e2f7832f4;hp=c12568c069d16808f00ea475b27f8c359ea0bc3d;hpb=cdd7fdacaafc36de12e8d703904667aada6bbe31;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index c12568c..896f136 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -166,8 +166,8 @@ data DynFlag
    | Opt_MonomorphismRestriction
    | Opt_MonoPatBinds
    | Opt_ExtendedDefaultRules		-- Use GHC's extended rules for defaulting
-   | Opt_GlasgowExts
    | Opt_FFI
+   | Opt_UnliftedFFITypes
    | Opt_PArr				-- Syntactic support for parallel arrays
    | Opt_Arrows				-- Arrow-notation syntax
    | Opt_TH
@@ -176,8 +176,6 @@ data DynFlag
    | Opt_ImplicitPrelude 
    | Opt_ScopedTypeVariables
    | Opt_UnboxedTuples
-   | Opt_ExpressionSignaturesUnboxedTuples
-   | Opt_TypeSynonymUnboxedTuples
    | Opt_BangPatterns
    | Opt_TypeFamilies
    | Opt_OverloadedStrings
@@ -186,9 +184,12 @@ data DynFlag
    | Opt_RecordPuns
    | Opt_GADTs
    | Opt_RelaxedPolyRec			-- -X=RelaxedPolyRec
+   | Opt_StandaloneDeriving
+   | Opt_DeriveDataTypeable
    | Opt_TypeSynonymInstances
    | Opt_FlexibleContexts
    | Opt_FlexibleInstances
+   | Opt_ConstrainedClassMethods
    | Opt_MultiParamTypeClasses
    | Opt_FunctionalDependencies
    | Opt_UnicodeSyntax
@@ -1131,6 +1132,7 @@ xFlags = [
   ( "FI",				Opt_FFI ),  -- support `-ffi'...
   ( "FFI",				Opt_FFI ),  -- ...and also `-fffi'
   ( "ForeignFunctionInterface",		Opt_FFI ),
+  ( "UnliftedFFITypes",                 Opt_UnliftedFFITypes ),
 
   ( "PartiallyAppliedClosedTypeSynonyms", Opt_PartiallyAppliedClosedTypeSynonyms ),
   ( "Rank2Types",                       Opt_Rank2Types ),
@@ -1162,11 +1164,12 @@ xFlags = [
   ( "ImplicitParams",			Opt_ImplicitParams ),
   ( "ScopedTypeVariables",  		Opt_ScopedTypeVariables ),
   ( "UnboxedTuples",                Opt_UnboxedTuples ),
-  ( "ExpressionSignaturesUnboxedTuples", Opt_ExpressionSignaturesUnboxedTuples ),
-  ( "TypeSynonymUnboxedTuples",     Opt_TypeSynonymUnboxedTuples ),
+  ( "StandaloneDeriving",           Opt_StandaloneDeriving ),
+  ( "DeriveDataTypeable",           Opt_DeriveDataTypeable ),
   ( "TypeSynonymInstances",         Opt_TypeSynonymInstances ),
   ( "FlexibleContexts",             Opt_FlexibleContexts ),
   ( "FlexibleInstances",            Opt_FlexibleInstances ),
+  ( "ConstrainedClassMethods",      Opt_ConstrainedClassMethods ),
   ( "MultiParamTypeClasses",        Opt_MultiParamTypeClasses ),
   ( "FunctionalDependencies",        Opt_FunctionalDependencies ),
   ( "GeneralizedNewtypeDeriving",   Opt_GeneralizedNewtypeDeriving ),
@@ -1180,18 +1183,20 @@ impliedFlags = [
   ( Opt_GADTs, [Opt_RelaxedPolyRec] )	-- We want type-sig variables to be completely rigid for GADTs
   ]
 
-glasgowExtsFlags = [ Opt_GlasgowExts 
-           , Opt_PrintExplicitForalls
+glasgowExtsFlags = [
+             Opt_PrintExplicitForalls
 		   , Opt_FFI 
+           , Opt_UnliftedFFITypes
 		   , Opt_GADTs
 		   , Opt_ImplicitParams 
 		   , Opt_ScopedTypeVariables
            , Opt_UnboxedTuples
-           , Opt_ExpressionSignaturesUnboxedTuples
-           , Opt_TypeSynonymUnboxedTuples
            , Opt_TypeSynonymInstances
+           , Opt_StandaloneDeriving
+           , Opt_DeriveDataTypeable
            , Opt_FlexibleContexts
            , Opt_FlexibleInstances
+           , Opt_ConstrainedClassMethods
            , Opt_MultiParamTypeClasses
            , Opt_FunctionalDependencies
 		   , Opt_MagicHash