X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverFlags.hs;h=c09e43ad2dc31529c39564a5614b6eb5b44e6fe9;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=0ea708b510781e17a17dd40e9bca46601f0f6708;hpb=599e42c2948811e71607c5167d9345ddd74d83c3;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 0ea708b..c09e43a 100644
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -14,7 +14,7 @@ module DriverFlags (
   ) where
 
 #include "HsVersions.h"
-#include "../includes/config.h"
+#include "../includes/ghcconfig.h"
 
 import MkIface		( showIface )
 import DriverState
@@ -93,7 +93,7 @@ processOneArg action rest (dash_arg@('-':arg):args) =
 		if rest /= "" 
 			then fio rest >> return args
 			else case args of
-				[] -> unknownFlagErr dash_arg
+				[] -> missingArgErr dash_arg
 				(arg1:args1) -> fio arg1 >> return args1
 
 	SepArg fio -> 
@@ -201,8 +201,11 @@ static_flags =
   ,  ( "smp"		, NoArg (addNoDups v_Ways	WaySMP) )
   ,  ( "debug"		, NoArg (addNoDups v_Ways	WayDebug) )
   ,  ( "ndp"		, NoArg (addNoDups v_Ways	WayNDP) )
+  ,  ( "threaded"	, NoArg (addNoDups v_Ways	WayThreaded) )
  	-- ToDo: user ways
 
+	------ RTS ways -----------------------------------------------------
+
 	------ Debugging ----------------------------------------------------
   ,  ( "dppr-noprags",     PassFlag (add v_Opt_C) )
   ,  ( "dppr-debug",       PassFlag (add v_Opt_C) )
@@ -251,12 +254,11 @@ static_flags =
 				    then do writeIORef v_Split_object_files True
 					    add v_Opt_C "-fglobalise-toplev-names"
 				    else hPutStrLn stderr
-					    "warning: don't know how to  split \ 
-					    \object files on this architecture"
+					    "warning: don't know how to split object files on this architecture"
 				) )
 
 	------- Include/Import Paths ----------------------------------------
-  ,  ( "i"		, OptPrefix (addToDirList v_Import_paths) )
+  ,  ( "i"		, OptPrefix (addToOrDeleteDirList v_Import_paths) )
   ,  ( "I" 		, Prefix    (addToDirList v_Include_paths) )
 
 	------- Libraries ---------------------------------------------------
@@ -279,13 +281,13 @@ static_flags =
         ------- Specific phases  --------------------------------------------
   ,  ( "pgmL"           , HasArg setPgmL )
   ,  ( "pgmP"           , HasArg setPgmP )
-  ,  ( "pgmP"           , HasArg setPgmP )
   ,  ( "pgmF"           , HasArg setPgmF )
   ,  ( "pgmc"           , HasArg setPgmc )
   ,  ( "pgmm"           , HasArg setPgmm )
   ,  ( "pgms"           , HasArg setPgms )
   ,  ( "pgma"           , HasArg setPgma )
   ,  ( "pgml"           , HasArg setPgml )
+  ,  ( "pgmdll"		, HasArg setPgmDLL )
 #ifdef ILX
   ,  ( "pgmI"           , HasArg setPgmI )
   ,  ( "pgmi"           , HasArg setPgmi )
@@ -345,7 +347,7 @@ dynamic_flags = [
 	------ Debugging ----------------------------------------------------
   ,  ( "dstg-stats",	NoArg (writeIORef v_StgStats True) )
 
-  ,  ( "ddump-absC",         	 NoArg (setDynFlag Opt_D_dump_absC) )
+  ,  ( "ddump-cmm",         	 NoArg (setDynFlag Opt_D_dump_cmm) )
   ,  ( "ddump-asm",          	 NoArg (setDynFlag Opt_D_dump_asm) )
   ,  ( "ddump-cpranal",      	 NoArg (setDynFlag Opt_D_dump_cpranal) )
   ,  ( "ddump-deriv",        	 NoArg (setDynFlag Opt_D_dump_deriv) )
@@ -355,7 +357,6 @@ dynamic_flags = [
   ,  ( "ddump-inlinings",    	 NoArg (setDynFlag Opt_D_dump_inlinings) )
   ,  ( "ddump-occur-anal",   	 NoArg (setDynFlag Opt_D_dump_occur_anal) )
   ,  ( "ddump-parsed",       	 NoArg (setDynFlag Opt_D_dump_parsed) )
-  ,  ( "ddump-realC",        	 NoArg (setDynFlag Opt_D_dump_realC) )
   ,  ( "ddump-rn",           	 NoArg (setDynFlag Opt_D_dump_rn) )
   ,  ( "ddump-simpl",        	 NoArg (setDynFlag Opt_D_dump_simpl) )
   ,  ( "ddump-simpl-iterations", NoArg (setDynFlag Opt_D_dump_simpl_iterations) )
@@ -374,7 +375,7 @@ dynamic_flags = [
   ,  ( "ddump-tc-trace",         NoArg (setDynFlag Opt_D_dump_tc_trace) )
   ,  ( "ddump-splices",          NoArg (setDynFlag Opt_D_dump_splices) )
   ,  ( "ddump-rn-stats",         NoArg (setDynFlag Opt_D_dump_rn_stats) )
-  ,  ( "ddump-stix",             NoArg (setDynFlag Opt_D_dump_stix) )
+  ,  ( "ddump-opt-cmm",          NoArg (setDynFlag Opt_D_dump_opt_cmm) )
   ,  ( "ddump-simpl-stats",      NoArg (setDynFlag Opt_D_dump_simpl_stats) )
   ,  ( "ddump-bcos",             NoArg (setDynFlag Opt_D_dump_BCOs) )
   ,  ( "dsource-stats",          NoArg (setDynFlag Opt_D_source_stats) )
@@ -386,6 +387,7 @@ dynamic_flags = [
   ,  ( "ddump-vect",         	 NoArg (setDynFlag Opt_D_dump_vect) )
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting) )
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting) )
+  ,  ( "dcmm-lint",		 NoArg (setDynFlag Opt_DoCmmLinting) )
 
 	------ Machine dependant (-m<blah>) stuff ---------------------------
 
@@ -461,6 +463,7 @@ fFlags = [
   ( "allow-incoherent-instances", 	Opt_AllowIncoherentInstances ),
   ( "generics",  			Opt_Generics ),
   ( "strictness",			Opt_Strictness ),
+  ( "full-laziness",			Opt_FullLaziness ),
   ( "cse",				Opt_CSE ),
   ( "ignore-interface-pragmas",		Opt_IgnoreInterfacePragmas ),
   ( "omit-interface-pragmas",		Opt_OmitInterfacePragmas ),
@@ -623,9 +626,6 @@ machdepCCOpts
       --     This is completely optional.
        = return ( ["-no-cpp-precomp","-mdynamic-no-pic"], [] )
 
-   | prefixMatch "powerpc" cTARGETPLATFORM || prefixMatch "rs6000" cTARGETPLATFORM
-	= return ( ["-static"], ["-finhibit-size-directive"] )
-
    | otherwise
 	= return ( [], [] )