[project @ 2003-02-07 09:39:02 by simonpj]

[ghc-hetmet.git] / ghc / compiler / main / DriverFlags.hs

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index a9569b4..14fa847 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.104 2002/10/13 10:55:06 wolfgang Exp $
+-- $Id: DriverFlags.hs,v 1.112 2003/02/07 09:39:02 simonpj Exp $
 --
 -- Driver flags
 --
@@ -229,7 +229,7 @@ static_flags =
        ------- Output Redirection ------------------------------------------
   ,  ( "odir"          , HasArg (writeIORef v_Output_dir  . Just) )
   ,  ( "o"             , SepArg (writeIORef v_Output_file . Just) )
-  ,  ( "osuf"          , HasArg (writeIORef v_Object_suf  . Just) )
+  ,  ( "osuf"          , HasArg (writeIORef v_Object_suf) )
   ,  ( "hcsuf"         , HasArg (writeIORef v_HC_suf      . Just) )
   ,  ( "hisuf"         , HasArg (writeIORef v_Hi_suf) )
   ,  ( "hidir"         , HasArg (writeIORef v_Hi_dir . Just) )
@@ -261,7 +261,7 @@ static_flags =
 
        ------- Libraries ---------------------------------------------------
   ,  ( "L"             , Prefix (addToDirList v_Library_paths) )
-  ,  ( "l"             , Prefix (add v_Cmdline_libraries) )
+  ,  ( "l"             , AnySuffix (\s -> add v_Opt_l s >> add v_Opt_dll s) )
 
 #ifdef darwin_TARGET_OS
        ------- Frameworks --------------------------------------------------
@@ -277,6 +277,8 @@ static_flags =
   ,  ( "syslib"         , HasArg (addPackage) )        -- for compatibility w/ old vsns
 
         ------- Specific phases  --------------------------------------------
+  ,  ( "pgmL"           , HasArg setPgmL )
+  ,  ( "pgmP"           , HasArg setPgmP )
   ,  ( "pgmP"           , HasArg setPgmP )
   ,  ( "pgmF"           , HasArg setPgmF )
   ,  ( "pgmc"           , HasArg setPgmc )
@@ -294,6 +296,7 @@ static_flags =
   ,  ( "optdll"                , HasArg (add v_Opt_dll) )
 
        ----- Linker --------------------------------------------------------
+  ,  ( "no-link"       , NoArg (writeIORef v_NoLink True) )
   ,  ( "static"        , NoArg (writeIORef v_Static True) )
   ,  ( "dynamic"        , NoArg (writeIORef v_Static False) )
   ,  ( "rdynamic"       , NoArg (return ()) ) -- ignored for compat w/ gcc
@@ -311,14 +314,11 @@ static_flags =
   ,  ( "fno-asm-mangling"  , NoArg (writeIORef v_Do_asm_mangling False) )
 
   ,  ( "fmax-simplifier-iterations", 
-               Prefix (writeIORef v_MaxSimplifierIterations . read) )
+               PrefixPred (all isDigit) (writeIORef v_MaxSimplifierIterations . read) )
 
   ,  ( "frule-check", 
                SepArg (\s -> writeIORef v_RuleCheck (Just s)) )
 
-  ,  ( "fusagesp"         , NoArg (do writeIORef v_UsageSPInf True
-                                      add v_Opt_C "-fusagesp-on") )
-
   ,  ( "fexcess-precision" , NoArg (do writeIORef v_Excess_precision True
                                       add v_Opt_C "-fexcess-precision"))
 
@@ -394,7 +394,6 @@ dynamic_flags = [
   ,  ( "ddump-tc",              NoArg (setDynFlag Opt_D_dump_tc) )
   ,  ( "ddump-types",           NoArg (setDynFlag Opt_D_dump_types) )
   ,  ( "ddump-rules",           NoArg (setDynFlag Opt_D_dump_rules) )
-  ,  ( "ddump-usagesp",         NoArg (setDynFlag Opt_D_dump_usagesp) )
   ,  ( "ddump-cse",             NoArg (setDynFlag Opt_D_dump_cse) )
   ,  ( "ddump-worker-wrapper",   NoArg (setDynFlag Opt_D_dump_worker_wrapper) )
   ,  ( "dshow-passes",           NoArg (setVerbosity "2") )
@@ -414,7 +413,6 @@ dynamic_flags = [
   ,  ( "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) )
 
        ------ Machine dependant (-m<blah>) stuff ---------------------------
 
@@ -424,6 +422,7 @@ dynamic_flags = [
 
        ------ Warning opts -------------------------------------------------
   ,  ( "W"             , NoArg (mapM_ setDynFlag   minusWOpts)    )
+  ,  ( "Werror"                , NoArg (setDynFlag         Opt_WarnIsError) )
   ,  ( "Wall"          , NoArg (mapM_ setDynFlag   minusWallOpts) )
   ,  ( "Wnot"          , NoArg (mapM_ unSetDynFlag minusWallOpts) ) /* DEPREC */
   ,  ( "w"             , NoArg (mapM_ unSetDynFlag minusWallOpts) )
@@ -577,7 +576,15 @@ machdepCCOpts
             return ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else ""
 --                    , if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin" else "" 
                      ],
-                     [ "-fno-defer-pop", "-fomit-frame-pointer",
+                     [ "-fno-defer-pop",
+#ifdef HAVE_GCC_MNO_OMIT_LFPTR
+                       -- Some gccs are configured with
+                       -- -momit-leaf-frame-pointer on by default, and it
+                       -- apparently takes precedence over 
+                       -- -fomit-frame-pointer, so we disable it first here.
+                       "-mno-omit-leaf-frame-pointer",
+#endif
+                       "-fomit-frame-pointer",
                        -- we want -fno-builtin, because when gcc inlines
                        -- built-in functions like memcpy() it tends to
                        -- run out of registers, requiring -monly-n-regs