X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverFlags.hs;h=bfb3c00880ffec6720b4a02ebc5a56767fd2274f;hb=10fcd78ccde892feccda3f5eacd221c1de75feea;hp=65080f2599b2a08afdd4bf07713c8b01701a0f1b;hpb=114470474d2e037d16b736354070fa03181e8348;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs index 65080f2..bfb3c00 100644 --- a/ghc/compiler/main/DriverFlags.hs +++ b/ghc/compiler/main/DriverFlags.hs @@ -1,7 +1,7 @@ {-# OPTIONS -#include "hschooks.h" #-} ----------------------------------------------------------------------------- --- $Id: DriverFlags.hs,v 1.77 2001/10/26 00:53:27 sof Exp $ +-- $Id: DriverFlags.hs,v 1.86 2002/02/11 08:20:41 chak Exp $ -- -- Driver flags -- @@ -11,8 +11,7 @@ module DriverFlags ( processArgs, OptKind(..), static_flags, dynamic_flags, - getDynFlags, dynFlag, - getOpts, getVerbFlag, addCmdlineHCInclude, + addCmdlineHCInclude, buildStaticHscOpts, machdepCCOpts ) where @@ -21,8 +20,9 @@ module DriverFlags ( #include "../includes/config.h" import DriverState +import DriverPhases import DriverUtil -import SysTools ( setTmpDir, setPgm, setDryRun, showGhcUsage ) +import SysTools import CmdLineOpts import Config import Util @@ -152,21 +152,36 @@ arg_ok (AnySuffixPred p _) rest arg = p arg -- flags further down the list with the same prefix. static_flags = - [ ------- help ------------------------------------------------------- - ( "?" , NoArg showGhcUsage) - , ( "-help" , NoArg showGhcUsage) - - - ------- version ---------------------------------------------------- - , ( "-version" , NoArg (do hPutStrLn stdout (cProjectName + [ ------- help / version ---------------------------------------------- + ( "?" , NoArg showGhcUsage) + , ( "-help" , NoArg showGhcUsage) + , ( "-print-libdir" , NoArg (do getTopDir >>= putStrLn + exitWith ExitSuccess)) + , ( "-version" , NoArg (do putStrLn (cProjectName ++ ", version " ++ cProjectVersion) exitWith ExitSuccess)) - , ( "-numeric-version", NoArg (do hPutStrLn stdout cProjectVersion + , ( "-numeric-version", NoArg (do putStrLn cProjectVersion exitWith ExitSuccess)) ------- verbosity ---------------------------------------------------- , ( "n" , NoArg setDryRun ) + ------- primary modes ------------------------------------------------ + , ( "M" , PassFlag (setMode DoMkDependHS)) + , ( "E" , PassFlag (setMode (StopBefore Hsc))) + , ( "C" , PassFlag (\f -> do setMode (StopBefore HCc) f + setLang HscC)) + , ( "S" , PassFlag (setMode (StopBefore As))) + , ( "c" , PassFlag (setMode (StopBefore Ln))) + , ( "-make" , PassFlag (setMode DoMake)) + , ( "-interactive" , PassFlag (setMode DoInteractive)) + , ( "-mk-dll" , PassFlag (setMode DoMkDLL)) + + -- -fno-code says to stop after Hsc but don't generate any code. + , ( "fno-code" , PassFlag (\f -> do setMode (StopBefore HCc) f + setLang HscNothing + writeIORef v_Recomp False)) + ------- GHCi ------------------------------------------------------- , ( "ignore-dot-ghci", NoArg (writeIORef v_Read_DotGHCi False) ) , ( "read-dot-ghci" , NoArg (writeIORef v_Read_DotGHCi True) ) @@ -183,6 +198,7 @@ static_flags = , ( "gransim" , NoArg (addNoDups v_Ways WayGran) ) , ( "smp" , NoArg (addNoDups v_Ways WaySMP) ) , ( "debug" , NoArg (addNoDups v_Ways WayDebug) ) + , ( "ndp" , NoArg (addNoDups v_Ways WayNDP) ) -- ToDo: user ways ------ Debugging ---------------------------------------------------- @@ -222,7 +238,10 @@ static_flags = , ( "keep-hc-file" , AnySuffix (\_ -> writeIORef v_Keep_hc_files True) ) , ( "keep-s-file" , AnySuffix (\_ -> writeIORef v_Keep_s_files True) ) , ( "keep-raw-s-file", AnySuffix (\_ -> writeIORef v_Keep_raw_s_files True) ) +#ifdef ILX , ( "keep-il-file" , AnySuffix (\_ -> writeIORef v_Keep_il_files True) ) + , ( "keep-ilx-file" , AnySuffix (\_ -> writeIORef v_Keep_ilx_files True) ) +#endif , ( "keep-tmp-files" , AnySuffix (\_ -> writeIORef v_Keep_tmp_files True) ) , ( "split-objs" , NoArg (if can_split @@ -266,7 +285,9 @@ static_flags = ------ Compiler flags ----------------------------------------------- , ( "O2-for-C" , NoArg (writeIORef v_minus_o2_for_C True) ) - , ( "O" , OptPrefix (setOptLevel) ) + , ( "O" , NoArg (setOptLevel 1)) + , ( "Onot" , NoArg (setOptLevel 0)) + , ( "O" , PrefixPred (all isDigit) (setOptLevel . read)) , ( "fno-asm-mangling" , NoArg (writeIORef v_Do_asm_mangling False) ) @@ -286,7 +307,9 @@ static_flags = -- -fno-* pattern below doesn't work. We therefore allow -- certain optimisation passes to be turned off explicitly: , ( "fno-strictness" , NoArg (writeIORef v_Strictness False) ) +#ifdef DEBUG , ( "fno-cpr" , NoArg (writeIORef v_CPR False) ) +#endif , ( "fno-cse" , NoArg (writeIORef v_CSE False) ) -- All other "-fno-" options cancel out "-f" on the hsc cmdline @@ -371,6 +394,7 @@ dynamic_flags = [ , ( "ddump-hi-diffs", NoArg (setDynFlag Opt_D_dump_hi_diffs) ) , ( "ddump-hi", NoArg (setDynFlag Opt_D_dump_hi) ) , ( "ddump-minimal-imports", NoArg (setDynFlag Opt_D_dump_minimal_imports) ) + , ( "ddump-vect", NoArg (setDynFlag Opt_D_dump_vect) ) , ( "dcore-lint", NoArg (setDynFlag Opt_DoCoreLinting) ) , ( "dstg-lint", NoArg (setDynFlag Opt_DoStgLinting) ) , ( "dusagesp-lint", NoArg (setDynFlag Opt_DoUSPLinting) ) @@ -393,10 +417,11 @@ dynamic_flags = [ , ( "fvia-c", NoArg (setLang HscC) ) , ( "fvia-C", NoArg (setLang HscC) ) , ( "filx", NoArg (setLang HscILX) ) - , ( "fno-code", NoArg (setLang HscNothing) ) -- "active negatives" , ( "fno-implicit-prelude", NoArg (setDynFlag Opt_NoImplicitPrelude) ) + , ( "fno-monomorphism-restriction", + NoArg (setDynFlag Opt_NoMonomorphismRestriction) ) -- the rest of the -f* and -fno-* flags , ( "fno-", PrefixPred (\f -> isFFlag f) (\f -> unSetDynFlag (getFFlag f)) ) @@ -421,8 +446,10 @@ fFlags = [ ( "warn-unused-matches", Opt_WarnUnusedMatches ), ( "warn-deprecations", Opt_WarnDeprecations ), ( "glasgow-exts", Opt_GlasgowExts ), + ( "parr", Opt_PArr ), ( "allow-overlapping-instances", Opt_AllowOverlappingInstances ), ( "allow-undecidable-instances", Opt_AllowUndecidableInstances ), + ( "allow-incoherent-instances", Opt_AllowIncoherentInstances ), ( "generics", Opt_Generics ) ] @@ -533,13 +560,17 @@ machdepCCOpts -- register used for global register variable", we simply -- disable all warnings altogether using the -w flag. Oh well. + | prefixMatch "powerpc-apple-darwin" cTARGETPLATFORM + = return ( ["-no-cpp-precomp"], [""] ) + | prefixMatch "powerpc" cTARGETPLATFORM || prefixMatch "rs6000" cTARGETPLATFORM = return ( ["-static"], ["-finhibit-size-directive"] ) | otherwise = return ( [], [] ) - +----------------------------------------------------------------------------- +-- local utils addOpt_L a = updDynFlags (\s -> s{opt_L = a : opt_L s}) addOpt_P a = updDynFlags (\s -> s{opt_P = a : opt_P s}) @@ -552,25 +583,9 @@ addOpt_I a = updDynFlags (\s -> s{opt_I = a : opt_I s}) addOpt_i a = updDynFlags (\s -> s{opt_i = a : opt_i s}) #endif -addCmdlineHCInclude a = updDynFlags (\s -> s{cmdlineHcIncludes = a : cmdlineHcIncludes s}) - -getOpts :: (DynFlags -> [a]) -> IO [a] - -- We add to the options from the front, so we need to reverse the list -getOpts opts = dynFlag opts >>= return . reverse - --- we can only change HscC to HscAsm and vice-versa with dynamic flags --- (-fvia-C and -fasm). We can also set the new lang to ILX, via -filx. -setLang l = updDynFlags (\ dfs -> case hscLang dfs of - HscC -> dfs{ hscLang = l } - HscAsm -> dfs{ hscLang = l } - HscILX -> dfs{ hscLang = l } - _ -> dfs) - setVerbosity "" = updDynFlags (\dfs -> dfs{ verbosity = 3 }) setVerbosity n | all isDigit n = updDynFlags (\dfs -> dfs{ verbosity = read n }) | otherwise = throwDyn (UsageError "can't parse verbosity flag (-v)") -getVerbFlag = do - verb <- dynFlag verbosity - if verb >= 3 then return "-v" else return "" +addCmdlineHCInclude a = updDynFlags (\s -> s{cmdlineHcIncludes = a : cmdlineHcIncludes s})