X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=4f4fe6686929cf84566e184c2846d44517df0970;hb=046ee54f048ddd721dcee41916d6a6f68db3b15b;hp=4c9c5e826a2dcb0389e056ccb8e9a7fb5defb7c1;hpb=22387f7d148b872b724a173bf52b6fc939cba047;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 4c9c5e8..4f4fe66 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -55,7 +55,6 @@ module StaticFlags (
 	-- misc opts
 	opt_IgnoreDotGhci,
 	opt_ErrorSpans,
-	opt_EmitCExternDecls,
 	opt_GranMacros,
 	opt_HiVersion,
 	opt_HistorySize,
@@ -69,7 +68,6 @@ module StaticFlags (
 
 #include "HsVersions.h"
 
-import Util		( consIORef )
 import CmdLineParser
 import Config		( cProjectVersionInt, cProjectPatchLevel,
 			  cGhcUnregisterised )
@@ -78,11 +76,11 @@ import Util
 import Maybes		( firstJust )
 import Panic		( GhcException(..), ghcError )
 
-import EXCEPTION	( throwDyn )
-import DATA_IOREF
-import UNSAFE_IO	( unsafePerformIO )
-import Monad		( when )
-import Char		( isDigit )
+import Control.Exception ( throwDyn )
+import Data.IORef
+import System.IO.Unsafe	( unsafePerformIO )
+import Control.Monad	( when )
+import Data.Char	( isDigit )
 import Data.List	( sort, intersperse, nub )
 
 -----------------------------------------------------------------------------
@@ -263,7 +261,6 @@ opt_RulesOff			= lookUp  FSLIT("-frules-off")
 opt_LiberateCaseThreshold	= lookup_def_int "-fliberate-case-threshold" (10::Int)
 opt_MaxWorkerArgs		= lookup_def_int "-fmax-worker-args" (10::Int)
 
-opt_EmitCExternDecls	        = lookUp  FSLIT("-femit-extern-decls")
 opt_GranMacros			= lookUp  FSLIT("-fgransim")
 opt_HiVersion			= read (cProjectVersionInt ++ cProjectPatchLevel) :: Int
 opt_HistorySize			= lookup_def_int "-fhistory-size" 20
@@ -306,15 +303,10 @@ isStaticFlag f =
 	"fauto-sccs-on-individual-cafs",
 	"fscc-profiling",
 	"fticky-ticky",
-	"fall-strict",
 	"fdicts-strict",
 	"firrefutable-tuples",
 	"fparallel",
 	"fflatten",
-	"fsemi-tagging",
-	"flet-no-escape",
-	"femit-extern-decls",
-	"fglobalise-toplev-names",
 	"fgransim",
 	"fno-hi-version-check",
 	"dno-black-holing",
@@ -327,7 +319,6 @@ isStaticFlag f =
 	"static",
 	"funregisterised",
 	"fext-core",
-	"frule-check",
 	"frules-off",
 	"fcpr-off",
 	"ferror-spans",
@@ -445,7 +436,6 @@ allowed_combination way = and [ x `allowedWith` y
 	_ `allowedWith` WayDebug		= True
 	WayDebug `allowedWith` _		= True
 
-	WayThreaded `allowedWith` WayProf	= True
 	WayProf `allowedWith` WayUnreg		= True
 	WayProf `allowedWith` WayNDP		= True
 	_ `allowedWith` _ 			= False