[project @ 2003-08-11 08:53:39 by simonmar]

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

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 328dac3..075d9bf 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.108 2002/12/17 13:50:29 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.119 2003/08/11 08:53:39 simonmar Exp $
 --
 -- Driver flags
 --
@@ -225,6 +225,7 @@ static_flags =
        ------- Miscellaneous -----------------------------------------------
   ,  ( "no-link-chk"    , NoArg (return ()) ) -- ignored for backwards compat
   ,  ( "no-hs-main"     , NoArg (writeIORef v_NoHsMain True) )
+  ,  ( "main-is"       , SepArg setMainIs )
 
        ------- Output Redirection ------------------------------------------
   ,  ( "odir"          , HasArg (writeIORef v_Output_dir  . Just) )
@@ -251,7 +252,7 @@ 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 \
+                                           "warning: don't know how to  split \ 
                                            \object files on this architecture"
                                ) )
 
@@ -277,6 +278,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 )
@@ -312,14 +315,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"))
 
@@ -357,19 +357,8 @@ dynamic_flags = [
 #endif
 
        ------ HsCpp opts ---------------------------------------------------
-       -- With a C compiler whose system() doesn't use a UNIX shell (i.e.
-       -- mingwin gcc), -D and -U args must *not* be quoted, as the quotes
-       -- will be interpreted as part of the arguments, and not stripped;
-       -- on all other systems, quoting is necessary, to avoid interpretation
-       -- of shell metacharacters in the arguments (e.g. green-card's
-       -- -DBEGIN_GHC_ONLY='}-' trick).
-#ifndef mingw32_HOST_OS
-  ,  ( "D",            Prefix (\s -> addOpt_P ("-D'"++s++"'") ) )
-  ,  ( "U",            Prefix (\s -> addOpt_P ("-U'"++s++"'") ) )
-#else
-  ,  ( "D",            Prefix (\s -> addOpt_P ("-D"++s) ) )
-  ,  ( "U",            Prefix (\s -> addOpt_P ("-U"++s) ) )
-#endif
+  ,  ( "D",            AnySuffix addOpt_P )
+  ,  ( "U",            AnySuffix addOpt_P )
 
        ------ Debugging ----------------------------------------------------
   ,  ( "dstg-stats",   NoArg (writeIORef v_StgStats True) )
@@ -395,7 +384,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") )
@@ -415,7 +403,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 ---------------------------
 
@@ -468,6 +455,7 @@ fFlags = [
   ( "fi",                              Opt_FFI ),  -- support `-ffi'...
   ( "ffi",                             Opt_FFI ),  -- ...and also `-fffi'
   ( "with",                            Opt_With ), -- with keyword
+  ( "arrows",                          Opt_Arrows ), -- arrow syntax
   ( "parr",                            Opt_PArr ),
   ( "allow-overlapping-instances",     Opt_AllowOverlappingInstances ),
   ( "allow-undecidable-instances",     Opt_AllowUndecidableInstances ),
@@ -534,6 +522,21 @@ buildStaticHscOpts = do
 
   return ( static : filtered_opts )
 
+setMainIs :: String -> IO ()
+setMainIs arg
+  | not (null main_mod)                -- The arg looked like "Foo.baz"
+  = do { writeIORef v_MainFunIs (Just main_fn) ;
+        writeIORef v_MainModIs (Just main_mod) }
+
+  | isUpper (head main_fn)     -- The arg looked like "Foo"
+  = writeIORef v_MainModIs (Just main_fn)
+  
+  | otherwise                  -- The arg looked like "baz"
+  = writeIORef v_MainFunIs (Just main_fn)
+  where
+    (main_mod, main_fn) = split_longest_prefix arg (== '.')
+  
+
 -----------------------------------------------------------------------------
 -- Via-C compilation stuff
 
@@ -579,7 +582,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