X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=d93e9443e2e9ba8978cc30049df482b058252346;hp=86598e9eb29779105ae0b69af7c544ce03699b95;hb=fb38b8bab2b531ca7ac4ea28ad5b259a00e3759b;hpb=a1579a34bba86590e3656e5c7e88a78a9fb2f584

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 86598e9..d93e944 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -186,7 +186,7 @@ data DynFlag
    -- misc opts
    | Opt_Cpp
    | Opt_Pp
-   | Opt_RecompChecking
+   | Opt_ForceRecomp
    | Opt_DryRun
    | Opt_DoAsmMangling
    | Opt_ExcessPrecision
@@ -304,7 +304,6 @@ data HscTarget
   = HscC
   | HscAsm
   | HscJava
-  | HscILX
   | HscInterpreted
   | HscNothing
   deriving (Eq, Show)
@@ -407,7 +406,6 @@ defaultDynFlags =
         pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
 	
 	flags = [ 
-    	    Opt_RecompChecking,
     	    Opt_ReadUserPackageConf,
     
 	    Opt_MonoPatBinds, 	-- Experimentally, I'm making this non-standard
@@ -432,7 +430,7 @@ defaultDynFlags =
     
     	    -- and the default no-optimisation options:
     	    Opt_IgnoreInterfacePragmas,
-    	    Opt_OmitInterfacePragmas
+    	    Opt_OmitInterfacePragmas,
     
 	    -- on by default:
 	    Opt_PrintBindResult
@@ -876,9 +874,9 @@ dynamic_flags = [
   ,  ( "no-hs-main"     , NoArg (setDynFlag Opt_NoHsMain))
   ,  ( "main-is"   	, SepArg setMainIs )
 
-	------- recompilation checker --------------------------------------
-  ,  ( "recomp"		, NoArg (setDynFlag   Opt_RecompChecking) )
-  ,  ( "no-recomp"  	, NoArg (unSetDynFlag Opt_RecompChecking) )
+	------- recompilation checker (DEPRECATED, use -fforce-recomp) -----
+  ,  ( "recomp"		, NoArg (unSetDynFlag Opt_ForceRecomp) )
+  ,  ( "no-recomp"  	, NoArg (setDynFlag   Opt_ForceRecomp) )
 
         ------- Packages ----------------------------------------------------
   ,  ( "package-conf"   , HasArg extraPkgConf_ )
@@ -941,7 +939,7 @@ dynamic_flags = [
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting))
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting))
   ,  ( "dcmm-lint",		 NoArg (setDynFlag Opt_DoCmmLinting))
-  ,  ( "dshow-passes",           NoArg (do unSetDynFlag Opt_RecompChecking
+  ,  ( "dshow-passes",           NoArg (do setDynFlag Opt_ForceRecomp
 				           setVerbosity (Just 2)) )
   ,  ( "dfaststring-stats",	 NoArg (setDynFlag Opt_D_faststring_stats))
 
@@ -978,7 +976,6 @@ dynamic_flags = [
   ,  ( "fasm",		AnySuffix (\_ -> setTarget HscAsm) )
   ,  ( "fvia-c",	NoArg (setTarget HscC) )
   ,  ( "fvia-C",	NoArg (setTarget HscC) )
-  ,  ( "filx",		NoArg (setTarget HscILX) )
 
   ,  ( "fglasgow-exts",    NoArg (mapM_ setDynFlag   glasgowExtsFlags) )
   ,  ( "fno-glasgow-exts", NoArg (mapM_ unSetDynFlag glasgowExtsFlags) )
@@ -1041,9 +1038,11 @@ fFlags = [
   ( "dicts-cheap",			Opt_DictsCheap ),
   ( "excess-precision",			Opt_ExcessPrecision ),
   ( "asm-mangling",			Opt_DoAsmMangling ),
-  ( "print-bind-result",		Opt_PrintBindResult )
+  ( "print-bind-result",		Opt_PrintBindResult ),
+  ( "force-recomp",			Opt_ForceRecomp )
   ]
 
+
 glasgowExtsFlags = [ 
   Opt_GlasgowExts, 
   Opt_FFI, 
@@ -1079,7 +1078,7 @@ unSetDynFlag f = upd (\dfs -> dopt_unset dfs f)
 
 setDumpFlag :: DynFlag -> OptKind DynP
 setDumpFlag dump_flag 
-  = NoArg (unSetDynFlag Opt_RecompChecking >> setDynFlag dump_flag)
+  = NoArg (setDynFlag Opt_ForceRecomp >> setDynFlag dump_flag)
 	-- Whenver we -ddump, switch off the recompilation checker,
 	-- else you don't see the dump!
 
@@ -1104,12 +1103,11 @@ setPackageName p
   where
         pid = stringToPackageId p
 
--- we can only switch between HscC, HscAsmm, and HscILX with dynamic flags 
+-- we can only switch between HscC, and HscAsmm with dynamic flags 
 -- (-fvia-C, -fasm, -filx respectively).
 setTarget l = upd (\dfs -> case hscTarget dfs of
 					HscC   -> dfs{ hscTarget = l }
 					HscAsm -> dfs{ hscTarget = l }
-					HscILX -> dfs{ hscTarget = l }
 					_      -> dfs)
 
 setOptLevel :: Int -> DynFlags -> DynFlags