X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=2dbee8841f5432720bdc04bc0565dc331aaf920a;hb=4a3042fcc68554ef59966430d2c6f1b70470d222;hp=75c266117b4cefec8fec99e765cee9aa4673ceeb;hpb=6720aae478aeffab9d93b33b76e8718130cd4a7b;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 75c2661..2dbee88 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -9,7 +9,7 @@ module DriverPipeline ( -- Run a series of compilation steps in a pipeline, for a -- collection of source files. - oneShot, + oneShot, compileFile, -- Interfaces for the batch-mode driver staticLink, @@ -22,13 +22,12 @@ module DriverPipeline ( -- DLL building doMkDLL, - matchOptions, -- used in module GHC ) where #include "HsVersions.h" import Packages -import GetImports +import HeaderInfo import DriverPhases import SysTools ( newTempName, addFilesToClean, getSysMan, copy ) import qualified SysTools @@ -41,23 +40,24 @@ import ErrUtils import DynFlags import StaticFlags ( v_Ld_inputs, opt_Static, WayName(..) ) import Config -import RdrName ( GlobalRdrEnv ) import Panic import Util import StringBuffer ( hGetStringBuffer ) import BasicTypes ( SuccessFlag(..) ) import Maybes ( expectJust ) -import Ctype ( is_ident ) - -import ParserCoreUtils ( getCoreModuleName ) +import ParserCoreUtils ( getCoreModuleName ) +import SrcLoc ( unLoc ) +import SrcLoc ( Located(..) ) import EXCEPTION import DATA_IOREF ( readIORef, writeIORef, IORef ) +import GLAEXTS ( Int(..) ) import Directory import System import IO import Monad +import Data.List ( isSuffixOf ) import Maybe @@ -70,10 +70,10 @@ import Maybe -- We return the augmented DynFlags, because they contain the result -- of slurping in the OPTIONS pragmas -preprocess :: DynFlags -> FilePath -> IO (DynFlags, FilePath) -preprocess dflags filename = - ASSERT2(isHaskellSrcFilename filename, text filename) - runPipeline anyHsc dflags filename Temporary Nothing{-no ModLocation-} +preprocess :: DynFlags -> (FilePath, Maybe Phase) -> IO (DynFlags, FilePath) +preprocess dflags (filename, mb_phase) = + ASSERT2(isJust mb_phase || isHaskellSrcFilename filename, text filename) + runPipeline anyHsc dflags (filename, mb_phase) Temporary Nothing{-no ModLocation-} -- --------------------------------------------------------------------------- -- Compile @@ -91,6 +91,7 @@ compile :: HscEnv -> ModSummary -> Maybe Linkable -- Just linkable <=> source unchanged -> Maybe ModIface -- Old interface, if available + -> Int -> Int -> IO CompResult data CompResult @@ -101,9 +102,9 @@ data CompResult | CompErrs -compile hsc_env mod_summary maybe_old_linkable old_iface = do +compile hsc_env mod_summary maybe_old_linkable old_iface mod_index nmods = do - let dflags0 = hsc_dflags hsc_env + let dflags0 = ms_hspp_opts mod_summary this_mod = ms_mod mod_summary src_flavour = ms_hsc_src mod_summary @@ -113,19 +114,11 @@ compile hsc_env mod_summary maybe_old_linkable old_iface = do showPass dflags0 ("Compiling " ++ showModMsg have_object mod_summary) - let verb = verbosity dflags0 let location = ms_location mod_summary let input_fn = expectJust "compile:hs" (ml_hs_file location) - let input_fnpp = expectJust "compile:hspp" (ms_hspp_file mod_summary) - - when (verb >= 2) (hPutStrLn stderr ("compile: input file " ++ input_fnpp)) + let input_fnpp = ms_hspp_file mod_summary - -- Add in the OPTIONS from the source file - -- This is nasty: we've done this once already, in the compilation manager - -- It might be better to cache the flags in the ml_hspp_file field,say - opts <- getOptionsFromSource input_fnpp - (dflags1,unhandled_flags) <- parseDynamicFlags dflags0 opts - checkProcessArgsResult unhandled_flags input_fn + debugTraceMsg dflags0 2 (text "compile: input file" <+> text input_fnpp) let (basename, _) = splitFilename input_fn @@ -133,11 +126,11 @@ compile hsc_env mod_summary maybe_old_linkable old_iface = do -- This is needed when we try to compile the .hc file later, if it -- imports a _stub.h file that we created here. let current_dir = directoryOf basename - old_paths = includePaths dflags1 - dflags = dflags1 { includePaths = current_dir : old_paths } + old_paths = includePaths dflags0 + dflags = dflags0 { includePaths = current_dir : old_paths } -- Figure out what lang we're generating - let hsc_lang = hscMaybeAdjustTarget dflags StopLn src_flavour (hscTarget dflags) + let hsc_lang = hscTarget dflags -- ... and what the next phase should be let next_phase = hscNextPhase dflags src_flavour hsc_lang -- ... and what file to generate the output into @@ -146,85 +139,104 @@ compile hsc_env mod_summary maybe_old_linkable old_iface = do let dflags' = dflags { hscTarget = hsc_lang, hscOutName = output_fn, - hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h", extCoreName = basename ++ ".hcr" } -- -no-recomp should also work with --make let do_recomp = dopt Opt_RecompChecking dflags source_unchanged = isJust maybe_old_linkable && do_recomp hsc_env' = hsc_env { hsc_dflags = dflags' } - + object_filename = ml_obj_file location + + let getStubLinkable False = return [] + getStubLinkable True + = do stub_o <- compileStub dflags' this_mod location + return [ DotO stub_o ] + + handleBatch (HscNoRecomp, iface, details) + = ASSERT (isJust maybe_old_linkable) + return (CompOK details iface maybe_old_linkable) + handleBatch (HscRecomp hasStub, iface, details) + | isHsBoot src_flavour + = return (CompOK details iface Nothing) + | otherwise + = do stub_unlinked <- getStubLinkable hasStub + (hs_unlinked, unlinked_time) <- + case hsc_lang of + HscNothing + -> return ([], ms_hs_date mod_summary) + -- We're in --make mode: finish the compilation pipeline. + _other + -> do runPipeline StopLn dflags (output_fn,Nothing) Persistent + (Just location) + -- The object filename comes from the ModLocation + o_time <- getModificationTime object_filename + return ([DotO object_filename], o_time) + let linkable = LM unlinked_time this_mod + (hs_unlinked ++ stub_unlinked) + return (CompOK details iface (Just linkable)) + + handleInterpreted (InteractiveNoRecomp, iface, details) + = ASSERT (isJust maybe_old_linkable) + return (CompOK details iface maybe_old_linkable) + handleInterpreted (InteractiveRecomp hasStub comp_bc, iface, details) + = do stub_unlinked <- getStubLinkable hasStub + let hs_unlinked = [BCOs comp_bc] + unlinked_time = ms_hs_date mod_summary + -- Why do we use the timestamp of the source file here, + -- rather than the current time? This works better in + -- the case where the local clock is out of sync + -- with the filesystem's clock. It's just as accurate: + -- if the source is modified, then the linkable will + -- be out of date. + let linkable = LM unlinked_time this_mod + (hs_unlinked ++ stub_unlinked) + return (CompOK details iface (Just linkable)) + + let runCompiler compiler handle + = do mbResult <- compiler hsc_env' mod_summary + source_unchanged old_iface + (Just (mod_index, nmods)) + case mbResult of + Nothing -> return CompErrs + Just result -> handle result -- run the compiler - hsc_result <- hscMain hsc_env' printErrorsAndWarnings mod_summary - source_unchanged have_object old_iface - - case hsc_result of - HscFail -> return CompErrs - - HscNoRecomp details iface -> - ASSERT(isJust maybe_old_linkable) - return (CompOK details iface maybe_old_linkable) - - HscRecomp details iface - stub_h_exists stub_c_exists maybe_interpreted_code - - | isHsBoot src_flavour -- No further compilation to do - -> return (CompOK details iface Nothing) - - | otherwise -- Normal Haskell source files - -> do - let - maybe_stub_o <- compileStub dflags' stub_c_exists - let stub_unlinked = case maybe_stub_o of - Nothing -> [] - Just stub_o -> [ DotO stub_o ] - - (hs_unlinked, unlinked_time) <- - case hsc_lang of - - -- in interpreted mode, just return the compiled code - -- as our "unlinked" object. - HscInterpreted -> - case maybe_interpreted_code of -#ifdef GHCI - Just comp_bc -> return ([BCOs comp_bc], ms_hs_date mod_summary) - -- Why do we use the timestamp of the source file here, - -- rather than the current time? This works better in - -- the case where the local clock is out of sync - -- with the filesystem's clock. It's just as accurate: - -- if the source is modified, then the linkable will - -- be out of date. -#endif - Nothing -> panic "compile: no interpreted code" - - -- we're in batch mode: finish the compilation pipeline. - _other -> do - let object_filename = ml_obj_file location - - runPipeline StopLn dflags output_fn Persistent - (Just location) - -- the object filename comes from the ModLocation - - o_time <- getModificationTime object_filename - return ([DotO object_filename], o_time) - - let linkable = LM unlinked_time this_mod - (hs_unlinked ++ stub_unlinked) - - return (CompOK details iface (Just linkable)) + case hsc_lang of + HscInterpreted | not (isHsBoot src_flavour) -- We can't compile boot files to + -- bytecode so don't even try. + -> runCompiler hscCompileInteractive handleInterpreted + _other + -> runCompiler hscCompileBatch handleBatch ----------------------------------------------------------------------------- -- stub .h and .c files (for foreign export support) -compileStub dflags stub_c_exists - | not stub_c_exists = return Nothing - | stub_c_exists = do +-- The _stub.c file is derived from the haskell source file, possibly taking +-- into account the -stubdir option. +-- +-- Consequently, we derive the _stub.o filename from the haskell object +-- filename. +-- +-- This isn't necessarily the same as the object filename we +-- would get if we just compiled the _stub.c file using the pipeline. +-- For example: +-- +-- ghc src/A.hs -odir obj +-- +-- results in obj/A.o, and src/A_stub.c. If we compile src/A_stub.c with +-- -odir obj, we would get obj/src/A_stub.o, which is wrong; we want +-- obj/A_stub.o. + +compileStub :: DynFlags -> Module -> ModLocation -> IO FilePath +compileStub dflags mod location = do + let (o_base, o_ext) = splitFilename (ml_obj_file location) + stub_o = o_base ++ "_stub" `joinFileExt` o_ext + -- compile the _stub.c file w/ gcc - let stub_c = hscStubCOutName dflags - (_, stub_o) <- runPipeline StopLn dflags - stub_c Persistent Nothing{-no ModLocation-} - return (Just stub_o) + let (stub_c,_) = mkStubPaths dflags mod location + runPipeline StopLn dflags (stub_c,Nothing) + (SpecificFile stub_o) Nothing{-no ModLocation-} + + return stub_o -- --------------------------------------------------------------------------- @@ -249,6 +261,9 @@ link Interactive dflags batch_attempt_linking hpt return Succeeded #endif +link JustTypecheck dflags batch_attempt_linking hpt + = return Succeeded + link BatchCompile dflags batch_attempt_linking hpt | batch_attempt_linking = do @@ -259,52 +274,65 @@ link BatchCompile dflags batch_attempt_linking hpt pkg_deps = concatMap (dep_pkgs . mi_deps . hm_iface) home_mod_infos -- the linkables to link - linkables = map (fromJust.hm_linkable) home_mod_infos + linkables = map (expectJust "link".hm_linkable) home_mod_infos - when (verb >= 3) $ do - hPutStrLn stderr "link: linkables are ..." - hPutStrLn stderr (showSDoc (vcat (map ppr linkables))) + debugTraceMsg dflags 3 (text "link: linkables are ..." $$ vcat (map ppr linkables)) -- check for the -no-link flag if isNoLink (ghcLink dflags) - then do when (verb >= 3) $ - hPutStrLn stderr "link(batch): linking omitted (-c flag given)." + then do debugTraceMsg dflags 3 (text "link(batch): linking omitted (-c flag given).") return Succeeded else do - when (verb >= 1) $ - hPutStrLn stderr "Linking ..." - let getOfiles (LM _ _ us) = map nameOfObject (filter isObject us) obj_files = concatMap getOfiles linkables + exe_file = exeFileName dflags + + -- if the modification time on the executable is later than the + -- modification times on all of the objects, then omit linking + -- (unless the -no-recomp flag was given). + e_exe_time <- IO.try $ getModificationTime exe_file + let linking_needed + | Left _ <- e_exe_time = True + | Right t <- e_exe_time = + any (t <) (map linkableTime linkables) + + if dopt Opt_RecompChecking dflags && not linking_needed + then do debugTraceMsg dflags 1 (text exe_file <+> ptext SLIT("is up to date, linking not required.")) + return Succeeded + else do + + debugTraceMsg dflags 1 (ptext SLIT("Linking") <+> text exe_file + <+> text "...") + -- Don't showPass in Batch mode; doLink will do that for us. - staticLink dflags obj_files pkg_deps + let link = case ghcLink dflags of + MkDLL -> doMkDLL + StaticLink -> staticLink + link dflags obj_files pkg_deps - when (verb >= 3) (hPutStrLn stderr "link: done") + debugTraceMsg dflags 3 (text "link: done") -- staticLink only returns if it succeeds return Succeeded | otherwise - = do when (verb >= 3) $ do - hPutStrLn stderr "link(batch): upsweep (partially) failed OR" - hPutStrLn stderr " Main.main not exported; not linking." + = do debugTraceMsg dflags 3 (text "link(batch): upsweep (partially) failed OR" $$ + text " Main.main not exported; not linking.") return Succeeded - where - verb = verbosity dflags -- ----------------------------------------------------------------------------- -- Compile files in one-shot mode. -oneShot :: DynFlags -> Phase -> [String] -> IO () +oneShot :: DynFlags -> Phase -> [(String, Maybe Phase)] -> IO () oneShot dflags stop_phase srcs = do o_files <- mapM (compileFile dflags stop_phase) srcs doLink dflags stop_phase o_files -compileFile :: DynFlags -> Phase -> FilePath -> IO FilePath -compileFile dflags stop_phase src = do +compileFile :: DynFlags -> Phase -> (FilePath, Maybe Phase) -> IO FilePath +compileFile dflags stop_phase (src, mb_phase) = do exists <- doesFileExist src when (not exists) $ throwDyn (CmdLineError ("does not exist: " ++ src)) @@ -328,7 +356,7 @@ compileFile dflags stop_phase src = do other -> stop_phase (_, out_file) <- runPipeline stop_phase' dflags - src output Nothing{-no ModLocation-} + (src, mb_phase) output Nothing{-no ModLocation-} return out_file @@ -373,17 +401,21 @@ data PipelineOutput -- the output must go into the specified file. runPipeline - :: Phase -- When to stop - -> DynFlags -- Dynamic flags - -> FilePath -- Input filename - -> PipelineOutput -- Output filename - -> Maybe ModLocation -- A ModLocation, if this is a Haskell module + :: Phase -- When to stop + -> DynFlags -- Dynamic flags + -> (FilePath,Maybe Phase) -- Input filename (and maybe -x suffix) + -> PipelineOutput -- Output filename + -> Maybe ModLocation -- A ModLocation, if this is a Haskell module -> IO (DynFlags, FilePath) -- (final flags, output filename) -runPipeline stop_phase dflags input_fn output maybe_loc +runPipeline stop_phase dflags (input_fn, mb_phase) output maybe_loc = do let (basename, suffix) = splitFilename input_fn - start_phase = startPhase suffix + + -- If we were given a -x flag, then use that phase to start from + start_phase + | Just x_phase <- mb_phase = x_phase + | otherwise = startPhase suffix -- We want to catch cases of "you can't get there from here" before -- we start the pipeline, because otherwise it will just run off the @@ -457,7 +489,7 @@ getOutputFilename dflags stop_phase output basename = func where hcsuf = hcSuf dflags - odir = outputDir dflags + odir = objectDir dflags osuf = objectSuf dflags keep_hc = dopt Opt_KeepHcFiles dflags keep_raw_s = dopt Opt_KeepRawSFiles dflags @@ -491,11 +523,11 @@ getOutputFilename dflags stop_phase output basename | StopLn <- next_phase = return odir_persistent | otherwise = return persistent - persistent = basename ++ '.':suffix + persistent = basename `joinFileExt` suffix odir_persistent | Just loc <- maybe_location = ml_obj_file loc - | Just d <- odir = replaceFilenameDirectory persistent d + | Just d <- odir = d `joinFileName` persistent | otherwise = persistent @@ -550,9 +582,9 @@ runPhase (Unlit sf) _stop dflags _basename _suff input_fn get_output_fn maybe_lo -- (b) runs cpp if necessary runPhase (Cpp sf) _stop dflags0 basename suff input_fn get_output_fn maybe_loc - = do src_opts <- getOptionsFromSource input_fn - (dflags,unhandled_flags) <- parseDynamicFlags dflags0 src_opts - checkProcessArgsResult unhandled_flags (basename++'.':suff) + = do src_opts <- getOptionsFromFile input_fn + (dflags,unhandled_flags) <- parseDynamicFlags dflags0 (map unLoc src_opts) + checkProcessArgsResult unhandled_flags (basename `joinFileExt` suff) if not (dopt Opt_Cpp dflags) then -- no need to preprocess CPP, just pass input file along @@ -573,7 +605,7 @@ runPhase (HsPp sf) _stop dflags basename suff input_fn get_output_fn maybe_loc return (Hsc sf, dflags, maybe_loc, input_fn) else do let hspp_opts = getOpts dflags opt_F - let orig_fn = basename ++ '.':suff + let orig_fn = basename `joinFileExt` suff output_fn <- get_output_fn (Hsc sf) maybe_loc SysTools.runPp dflags ( [ SysTools.Option orig_fn @@ -608,7 +640,7 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma ; return (Nothing, mkModule m) } other -> do { buf <- hGetStringBuffer input_fn - ; (_,_,mod_name) <- getImports dflags buf input_fn + ; (_,_,L _ mod_name) <- getImports dflags buf input_fn ; return (Just buf, mod_name) } -- Build a ModLocation to pass to hscMain. @@ -643,13 +675,14 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma | otherwise = location3 -- Make the ModSummary to hand to hscMain - src_timestamp <- getModificationTime (basename ++ '.':suff) + src_timestamp <- getModificationTime (basename `joinFileExt` suff) let unused_field = panic "runPhase:ModSummary field" -- Some fields are not looked at by hscMain mod_summary = ModSummary { ms_mod = mod_name, ms_hsc_src = src_flavour, - ms_hspp_file = Just input_fn, + ms_hspp_file = input_fn, + ms_hspp_opts = dflags, ms_hspp_buf = hspp_buf, ms_location = location4, ms_hs_date = src_timestamp, @@ -684,14 +717,12 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma else return False -- get the DynFlags - let hsc_lang = hscMaybeAdjustTarget dflags stop src_flavour (hscTarget dflags) + let hsc_lang = hscTarget dflags let next_phase = hscNextPhase dflags src_flavour hsc_lang output_fn <- get_output_fn next_phase (Just location4) let dflags' = dflags { hscTarget = hsc_lang, hscOutName = output_fn, - hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h", extCoreName = basename ++ ".hcr" } hsc_env <- newHscEnv dflags' @@ -700,36 +731,28 @@ runPhase (Hsc src_flavour) stop dflags0 basename suff input_fn get_output_fn _ma addHomeModuleToFinder hsc_env mod_name location4 -- run the compiler! - result <- hscMain hsc_env printErrorsAndWarnings + mbResult <- hscCompileOneShot hsc_env mod_summary source_unchanged - False -- No object file Nothing -- No iface - - case result of - - HscFail -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)) - - HscNoRecomp details iface -> do - SysTools.touch dflags' "Touching object file" o_file - return (StopLn, dflags', Just location4, o_file) - - HscRecomp _details _iface - stub_h_exists stub_c_exists - _maybe_interpreted_code -> do - - -- Deal with stubs - maybe_stub_o <- compileStub dflags' stub_c_exists - case maybe_stub_o of - Nothing -> return () - Just stub_o -> consIORef v_Ld_inputs stub_o - - -- In the case of hs-boot files, generate a dummy .o-boot - -- stamp file for the benefit of Make - case src_flavour of - HsBootFile -> SysTools.touch dflags' "Touching object file" o_file - other -> return () - - return (next_phase, dflags', Just location4, output_fn) + Nothing -- No "module i of n" progress info + + case mbResult of + Nothing -> throwDyn (PhaseFailed "hsc" (ExitFailure 1)) + Just HscNoRecomp + -> do SysTools.touch dflags' "Touching object file" o_file + -- The .o file must have a later modification date + -- than the source file (else we wouldn't be in HscNoRecomp) + -- but we touch it anyway, to keep 'make' happy (we think). + return (StopLn, dflags', Just location4, o_file) + Just (HscRecomp hasStub) + -> do when hasStub $ + do stub_o <- compileStub dflags' mod_name location4 + consIORef v_Ld_inputs stub_o + -- In the case of hs-boot files, generate a dummy .o-boot + -- stamp file for the benefit of Make + when (isHsBoot src_flavour) $ + SysTools.touch dflags' "Touching object file" o_file + return (next_phase, dflags', Just location4, output_fn) ----------------------------------------------------------------------------- -- Cmm phase @@ -742,14 +765,12 @@ runPhase CmmCpp stop dflags basename suff input_fn get_output_fn maybe_loc runPhase Cmm stop dflags basename suff input_fn get_output_fn maybe_loc = do - let hsc_lang = hscMaybeAdjustTarget dflags stop HsSrcFile (hscTarget dflags) + let hsc_lang = hscTarget dflags let next_phase = hscNextPhase dflags HsSrcFile hsc_lang output_fn <- get_output_fn next_phase maybe_loc let dflags' = dflags { hscTarget = hsc_lang, hscOutName = output_fn, - hscStubCOutName = basename ++ "_stub.c", - hscStubHOutName = basename ++ "_stub.h", extCoreName = basename ++ ".hcr" } ok <- hscCmmFile dflags' input_fn @@ -794,6 +815,9 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc let excessPrecision = dopt Opt_ExcessPrecision dflags + let cc_opt | optLevel dflags >= 2 = "-O2" + | otherwise = "-O" + -- Decide next phase let mangle = dopt Opt_DoAsmMangling dflags @@ -802,12 +826,29 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc | otherwise = As output_fn <- get_output_fn next_phase maybe_loc - -- force the C compiler to interpret this file as C when - -- compiling .hc files, by adding the -x c option. - let langopt | hcc = [ SysTools.Option "-x", SysTools.Option "c"] - | otherwise = [ ] + let + more_hcc_opts = +#if i386_TARGET_ARCH + -- on x86 the floating point regs have greater precision + -- than a double, which leads to unpredictable results. + -- By default, we turn this off with -ffloat-store unless + -- the user specified -fexcess-precision. + (if excessPrecision then [] else [ "-ffloat-store" ]) ++ +#endif + -- gcc's -fstrict-aliasing allows two accesses to memory + -- to be considered non-aliasing if they have different types. + -- This interacts badly with the C code we generate, which is + -- very weakly typed, being derived from C--. + ["-fno-strict-aliasing"] - SysTools.runCc dflags (langopt ++ + + + SysTools.runCc dflags ( + -- force the C compiler to interpret this file as C when + -- compiling .hc files, by adding the -x c option. + -- Also useful for plain .c files, just in case GHC saw a + -- -x c option. + [ SysTools.Option "-x", SysTools.Option "c"] ++ [ SysTools.FileOption "" input_fn , SysTools.Option "-o" , SysTools.FileOption "" output_fn @@ -818,11 +859,13 @@ runPhase cc_phase stop dflags basename suff input_fn get_output_fn maybe_loc ++ (if hcc && mangle then md_regd_c_flags else []) - ++ [ verb, "-S", "-Wimplicit", "-O" ] + ++ (if hcc + then more_hcc_opts + else []) + ++ [ verb, "-S", "-Wimplicit", cc_opt ] ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] ++ cc_opts ++ split_opt - ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts )) @@ -910,34 +953,64 @@ runPhase As stop dflags _basename _suff input_fn get_output_fn maybe_loc runPhase SplitAs stop dflags basename _suff _input_fn get_output_fn maybe_loc - = do let as_opts = getOpts dflags opt_a + = do + output_fn <- get_output_fn StopLn maybe_loc + + let (base_o, _) = splitFilename output_fn + split_odir = base_o ++ "_split" + osuf = objectSuf dflags + + createDirectoryHierarchy split_odir + + -- remove M_split/ *.o, because we're going to archive M_split/ *.o + -- later and we don't want to pick up any old objects. + fs <- getDirectoryContents split_odir + mapM_ removeFile $ map (split_odir `joinFileName`) + $ filter (osuf `isSuffixOf`) fs + + let as_opts = getOpts dflags opt_a (split_s_prefix, n) <- readIORef v_Split_info - let real_odir - | Just d <- outputDir dflags = d - | otherwise = basename ++ "_split" + let split_s n = split_s_prefix ++ "__" ++ show n `joinFileExt` "s" + split_obj n = split_odir `joinFileName` + filenameOf base_o ++ "__" ++ show n + `joinFileExt` osuf let assemble_file n - = do let input_s = split_s_prefix ++ "__" ++ show n ++ ".s" - let output_o = replaceFilenameDirectory - (basename ++ "__" ++ show n ++ ".o") - real_odir - let osuf = objectSuf dflags - let real_o = replaceFilenameSuffix output_o osuf - SysTools.runAs dflags - (map SysTools.Option as_opts ++ - [ SysTools.Option "-c" - , SysTools.Option "-o" - , SysTools.FileOption "" real_o - , SysTools.FileOption "" input_s - ]) + = SysTools.runAs dflags + (map SysTools.Option as_opts ++ + [ SysTools.Option "-c" + , SysTools.Option "-o" + , SysTools.FileOption "" (split_obj n) + , SysTools.FileOption "" (split_s n) + ]) mapM_ assemble_file [1..n] - output_fn <- get_output_fn StopLn maybe_loc + -- and join the split objects into a single object file: + let ld_r args = SysTools.runLink dflags ([ + SysTools.Option "-nostdlib", + SysTools.Option "-nodefaultlibs", + SysTools.Option "-Wl,-r", + SysTools.Option ld_x_flag, + SysTools.Option "-o", + SysTools.FileOption "" output_fn ] ++ args) + ld_x_flag | null cLD_X = "" + | otherwise = "-Wl,-x" + + if cLdIsGNULd == "YES" + then do + let script = split_odir `joinFileName` "ld.script" + writeFile script $ + "INPUT(" ++ unwords (map split_obj [1..n]) ++ ")" + ld_r [SysTools.FileOption "" script] + else do + ld_r (map (SysTools.FileOption "" . split_obj) [1..n]) + return (StopLn, dflags, maybe_loc, output_fn) + ----------------------------------------------------------------------------- -- MoveBinary sort-of-phase -- After having produced a binary, move it somewhere else and generate a @@ -1061,18 +1134,12 @@ getHCFilePackages filename = staticLink :: DynFlags -> [FilePath] -> [PackageId] -> IO () staticLink dflags o_files dep_packages = do let verb = getVerbFlag dflags + output_fn = exeFileName dflags -- get the full list of packages to link with, by combining the -- explicit packages with the auto packages and all of their -- dependencies, and eliminating duplicates. - let o_file = outputFile dflags -#if defined(mingw32_HOST_OS) - let output_fn = case o_file of { Just s -> s; Nothing -> "main.exe"; } -#else - let output_fn = case o_file of { Just s -> s; Nothing -> "a.out"; } -#endif - pkg_lib_paths <- getPackageLibraryPath dflags dep_packages let pkg_lib_path_opts = map ("-L"++) pkg_lib_paths @@ -1158,6 +1225,24 @@ staticLink dflags o_files dep_packages = do if success then return () else throwDyn (InstallationError ("cannot move binary to PVM dir"))) + +exeFileName :: DynFlags -> FilePath +exeFileName dflags + | Just s <- outputFile dflags = +#if defined(mingw32_HOST_OS) + if null (suffixOf s) + then s `joinFileExt` "exe" + else s +#else + s +#endif + | otherwise = +#if defined(mingw32_HOST_OS) + "main.exe" +#else + "a.out" +#endif + ----------------------------------------------------------------------------- -- Making a DLL (only for Win32) @@ -1280,57 +1365,6 @@ hsSourceCppOpts = , "-D__CONCURRENT_HASKELL__" ] ------------------------------------------------------------------------------ --- Reading OPTIONS pragmas - -getOptionsFromSource - :: String -- input file - -> IO [String] -- options, if any -getOptionsFromSource file - = do h <- openFile file ReadMode - look h `finally` hClose h - where - look h = do - r <- tryJust ioErrors (hGetLine h) - case r of - Left e | isEOFError e -> return [] - | otherwise -> ioError e - Right l' -> do - let l = removeSpaces l' - case () of - () | null l -> look h - | prefixMatch "#" l -> look h - | prefixMatch "{-# LINE" l -> look h -- -} - | Just opts <- matchOptions l - -> do rest <- look h - return (opts ++ rest) - | otherwise -> return [] - --- detect {-# OPTIONS_GHC ... #-}. For the time being, we accept OPTIONS --- instead of OPTIONS_GHC, but that is deprecated. -matchOptions s - | Just s1 <- maybePrefixMatch "{-#" s -- -} - = matchOptions1 (removeSpaces s1) - | otherwise - = Nothing - where - matchOptions1 s - | Just s2 <- maybePrefixMatch "OPTIONS" s - = case () of - _ | Just s3 <- maybePrefixMatch "_GHC" s2, not (is_ident (head s3)) - -> matchOptions2 s3 - | not (is_ident (head s2)) - -> matchOptions2 s2 - | otherwise - -> Just [] -- OPTIONS_anything is ignored, not treated as start of source - | Just s2 <- maybePrefixMatch "INCLUDE" s, not (is_ident (head s2)), - Just s3 <- maybePrefixMatch "}-#" (reverse s2) - = Just ["-#include", removeSpaces (reverse s3)] - | otherwise = Nothing - matchOptions2 s - | Just s3 <- maybePrefixMatch "}-#" (reverse s) = Just (words (reverse s3)) - | otherwise = Nothing - -- ----------------------------------------------------------------------------- -- Misc. @@ -1342,27 +1376,8 @@ hscNextPhase dflags other hsc_lang = HscC -> HCc HscAsm | dopt Opt_SplitObjs dflags -> SplitMangle | otherwise -> As - HscNothing -> StopLn - HscInterpreted -> StopLn + HscNothing -> HCc _other -> StopLn - -hscMaybeAdjustTarget :: DynFlags -> Phase -> HscSource -> HscTarget -> HscTarget -hscMaybeAdjustTarget dflags stop HsBootFile current_hsc_lang - = HscNothing -- No output (other than Foo.hi-boot) for hs-boot files -hscMaybeAdjustTarget dflags stop other current_hsc_lang - = hsc_lang - where - keep_hc = dopt Opt_KeepHcFiles dflags - hsc_lang - -- don't change the lang if we're interpreting - | current_hsc_lang == HscInterpreted = current_hsc_lang - - -- force -fvia-C if we are being asked for a .hc file - | HCc <- stop = HscC - | keep_hc = HscC - -- otherwise, stick to the plan - | otherwise = current_hsc_lang - GLOBAL_VAR(v_Split_info, ("",0), (String,Int)) -- The split prefix and number of files