X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=224a9cc0fcb0722b7ee55eabdb83b162896b56ec;hb=b5219fe27e7d67359c6a5a169603753ebb740353;hp=ee84cd095a10cc9ac529a7139461c4506a63a214;hpb=76293b141bba4c15a6fd619dd980502e98614790;p=ghc-hetmet.git diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index ee84cd0..224a9cc 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,7 +1,7 @@ {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.102 2002/03/29 21:39:37 sof Exp $ +-- $Id: Main.hs,v 1.117 2002/12/19 09:37:32 simonmar Exp $ -- -- GHC Driver program -- @@ -18,67 +18,76 @@ module Main (main) where #ifdef GHCI -import InteractiveUI(ghciWelcomeMsg, interactiveUI) +import InteractiveUI +import DriverPhases( objish_file ) #endif -import Finder ( initFinder ) import CompManager ( cmInit, cmLoadModules, cmDepAnal ) import HscTypes ( GhciMode(..) ) import Config ( cBooterVersion, cGhcUnregisterised, cProjectVersion ) import SysTools ( getPackageConfigPath, initSysTools, cleanTempFiles ) -import Packages ( showPackages ) - -import DriverPipeline ( doLink, doMkDLL, genPipeline, pipeLoop ) +import Packages ( showPackages, getPackageConfigMap, basePackage, + haskell98Package + ) +import DriverPipeline ( staticLink, doMkDLL, genPipeline, pipeLoop ) import DriverState ( buildCoreToDo, buildStgToDo, - findBuildTag, getPackageInfo, unregFlags, + findBuildTag, + getPackageExtraGhcOpts, unregFlags, v_GhcMode, v_GhcModeFlag, GhcMode(..), - v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs, + v_Keep_tmp_files, v_Ld_inputs, v_Ways, v_OptLevel, v_Output_file, v_Output_hi, - v_Package_details, v_Ways, getPackageExtraGhcOpts, - readPackageConf + readPackageConf, verifyOutputFiles, v_NoLink, + v_Build_tag ) import DriverFlags ( buildStaticHscOpts, dynamic_flags, processArgs, static_flags) import DriverMkDepend ( beginMkDependHS, endMkDependHS ) -import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, objish_file ) +import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, isSourceFile ) import DriverUtil ( add, handle, handleDyn, later, splitFilename, - unknownFlagErr, getFileSuffix ) + unknownFlagsErr, getFileSuffix ) import CmdLineOpts ( dynFlag, restoreDynFlags, saveDynFlags, setDynFlags, getDynFlags, dynFlag, DynFlags(..), HscLang(..), v_Static_hsc_opts, defaultHscLang ) +import BasicTypes ( failed ) import Outputable import Util import Panic ( GhcException(..), panic ) --- Standard Haskell libraries -import IO -import Directory ( doesFileExist ) -import IOExts ( readIORef, writeIORef ) -import Exception ( throwDyn, Exception(..), +import DATA_IOREF ( readIORef, writeIORef ) +import EXCEPTION ( throwDyn, Exception(..), AsyncException(StackOverflow) ) -import System ( getArgs, exitWith, ExitCode(..) ) -import Monad -import List -import Maybe #ifndef mingw32_HOST_OS -import Concurrent ( myThreadId ) +import CONCURRENT ( myThreadId ) # if __GLASGOW_HASKELL__ < 500 -import Exception ( raiseInThread ) +import EXCEPTION ( raiseInThread ) #define throwTo raiseInThread # else -import Exception ( throwTo ) +import EXCEPTION ( throwTo ) # endif +#if __GLASGOW_HASKELL__ > 504 +import System.Posix.Signals +#else import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) -import Dynamic ( toDyn ) #endif +import DYNAMIC ( toDyn ) +#endif + +-- Standard Haskell libraries +import IO +import Directory ( doesFileExist ) +import System ( getArgs, exitWith, ExitCode(..) ) +import Monad +import List +import Maybe + ----------------------------------------------------------------------------- -- ToDo: @@ -165,7 +174,7 @@ main = do putStr "warning: -O conflicts with --interactive; -O turned off.\n" writeIORef v_OptLevel 0 orig_ways <- readIORef v_Ways - when (not (null orig_ways) && mode == DoInteractive) $ + when (notNull orig_ways && mode == DoInteractive) $ do throwDyn (UsageError "--interactive can't be used with -prof, -ticky, -unreg or -smp.") @@ -193,9 +202,13 @@ main = -- by module basis, using only the -fvia-C and -fasm flags. If the global -- HscLang is not HscC or HscAsm, -fvia-C and -fasm have no effect. dyn_flags <- getDynFlags + build_tag <- readIORef v_Build_tag let lang = case mode of DoInteractive -> HscInterpreted - _other -> hscLang dyn_flags + _other | build_tag /= "" -> HscC + | otherwise -> hscLang dyn_flags + -- for ways other that the normal way, we must + -- compile via C. setDynFlags (dyn_flags{ coreToDo = core_todo, stgToDo = stg_todo, @@ -211,9 +224,9 @@ main = -- save the "initial DynFlags" away saveDynFlags - -- complain about any unknown flags - mapM unknownFlagErr [ f | f@('-':_) <- srcs ] - + -- perform some checks of the options set / report unknowns. + checkOptions srcs + verb <- dynFlag verbosity -- Show the GHCi banner @@ -232,16 +245,12 @@ main = when (verb >= 2) (hPutStrLn stderr ("Using package config file: " ++ conf_file)) - pkg_details <- readIORef v_Package_details + pkg_details <- getPackageConfigMap showPackages pkg_details when (verb >= 3) (hPutStrLn stderr ("Hsc static flags: " ++ unwords static_opts)) - -- initialise the finder - pkg_avails <- getPackageInfo - initFinder pkg_avails - -- mkdependHS is special when (mode == DoMkDependHS) beginMkDependHS @@ -257,8 +266,9 @@ main = if (mode == DoInteractive) then beginInteractive srcs else do -- -o sanity checking + let real_srcs = filter isSourceFile srcs -- filters out .a and .o that might appear o_file <- readIORef v_Output_file - if (srcs `lengthExceeds` 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) + if (real_srcs `lengthExceeds` 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL) then throwDyn (UsageError "can't apply -o to multiple source files") else do @@ -280,19 +290,15 @@ main = let not_hs_file = not (haskellish_src_file src) pp <- if not_hs_file || mode == StopBefore Hsc || mode == StopBefore HsPp then return src_and_suff else do --- hPutStrLn stderr "before" >> hFlush stderr phases <- genPipeline (StopBefore Hsc) stop_flag False{-not persistent-} defaultHscLang src_and_suff --- hPutStrLn stderr "after" >> hFlush stderr pipeLoop phases src_and_suff False{-no linking-} False{-no -o flag-} basename suffix -- rest of compilation hsc_lang <- dynFlag hscLang --- hPutStrLn stderr ("before-1 " ++ show (pp,mode)) >> hFlush stderr phases <- genPipeline mode stop_flag True hsc_lang pp --- hPutStrLn stderr "after" >> hFlush stderr (r,_) <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-} basename suffix return r @@ -300,24 +306,35 @@ main = o_files <- mapM compileFile srcs when (mode == DoMkDependHS) endMkDependHS - when (mode == DoLink) (doLink o_files) + + omit_linking <- readIORef v_NoLink + when (mode == DoLink && not omit_linking) + (staticLink o_files [basePackage, haskell98Package]) + -- we always link in the base package in one-shot linking. + -- any other packages required must be given using -package + -- options on the command-line. + when (mode == DoMkDLL) (doMkDLL o_files) beginMake :: [String] -> IO () -beginMake fileish_args - = do let (objs, mods) = partition objish_file fileish_args - mapM (add v_Ld_inputs) objs - - case mods of - [] -> throwDyn (UsageError "no input files") - _ -> do dflags <- getDynFlags - state <- cmInit Batch - graph <- cmDepAnal state dflags mods - (_, ok, _) <- cmLoadModules state dflags graph - when (not ok) (exitWith (ExitFailure 1)) - return () +beginMake fileish_args = do + -- anything that doesn't look like a Haskell source filename or + -- a module name is passed straight through to the linker + let (inputs, objects) = partition looks_like_an_input fileish_args + mapM_ (add v_Ld_inputs) objects + + case inputs of + [] -> throwDyn (UsageError "no input files") + _ -> do dflags <- getDynFlags + state <- cmInit Batch + graph <- cmDepAnal state dflags inputs + (_, ok_flag, _) <- cmLoadModules state dflags graph + when (failed ok_flag) (exitWith (ExitFailure 1)) + return () + where + looks_like_an_input m = haskellish_src_file m || '.' `notElem` m beginInteractive :: [String] -> IO () @@ -325,11 +342,20 @@ beginInteractive :: [String] -> IO () beginInteractive = throwDyn (CmdLineError "not built for interactive use") #else beginInteractive fileish_args - = do minus_ls <- readIORef v_Cmdline_libraries + = do state <- cmInit Interactive let (objs, mods) = partition objish_file fileish_args - libs = map Left objs ++ map Right minus_ls - state <- cmInit Interactive - interactiveUI state mods libs + interactiveUI state mods objs #endif + +checkOptions :: [String] -> IO () +checkOptions srcs = do + -- complain about any unknown flags + let unknown_opts = [ f | f@('-':_) <- srcs ] + when (notNull unknown_opts) (unknownFlagsErr unknown_opts) + -- verify that output files point somewhere sensible. + verifyOutputFiles + -- and anything else that it might be worth checking for + -- before kicking of a compilation (pipeline). +