X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=b979232ae210c924b8b8c118f0d5435afb5012a4;hb=d254a44b8392ff0a4327f1916ef921887ce78769;hp=7a4fe316b0a257923282e4b1e68f55ff9e1b3ce7;hpb=8fd92abe33abf8f618f8aa060391e880cdad3cd3;p=ghc-hetmet.git diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 7a4fe31..b979232 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,9 +1,8 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.91 2001/07/19 14:23:16 rrt Exp $ -- -- GHC Driver -- --- (c) Simon Marlow 2000 +-- (c) The University of Glasgow 2002 -- ----------------------------------------------------------------------------- @@ -12,7 +11,6 @@ module DriverPipeline ( -- interfaces for the batch-mode driver - GhcMode(..), getGhcMode, v_GhcMode, genPipeline, runPipeline, pipeLoop, -- interfaces for the compilation manager (interpreted/batch-mode) @@ -34,7 +32,7 @@ import DriverUtil import DriverMkDepend import DriverPhases import DriverFlags -import SysTools ( newTempName, addFilesToClean, getSysMan, unDosifyPath ) +import SysTools ( newTempName, addFilesToClean, getSysMan, copy ) import qualified SysTools import HscMain import Finder @@ -47,7 +45,9 @@ import Config import Panic import Util +#ifdef GHCI import Time ( getClockTime ) +#endif import Directory import System import IOExts @@ -58,34 +58,6 @@ import Monad import Maybe import PackedString -import MatchPS - ------------------------------------------------------------------------------ --- GHC modes of operation - -modeFlag :: String -> Maybe GhcMode -modeFlag "-M" = Just $ DoMkDependHS -modeFlag "--mk-dll" = Just $ DoMkDLL -modeFlag "-E" = Just $ StopBefore Hsc -modeFlag "-C" = Just $ StopBefore HCc -modeFlag "-S" = Just $ StopBefore As -modeFlag "-c" = Just $ StopBefore Ln -modeFlag "--make" = Just $ DoMake -modeFlag "--interactive" = Just $ DoInteractive -modeFlag _ = Nothing - -getGhcMode :: [String] - -> IO ( [String] -- rest of command line - , GhcMode - , String -- "GhcMode" flag - ) -getGhcMode flags - = case my_partition modeFlag flags of - ([] , rest) -> return (rest, DoLink, "") -- default is to do linking - ([(flag,one)], rest) -> return (rest, one, flag) - (_ , _ ) -> - throwDyn (UsageError - "only one of the flags -M, -E, -C, -S, -c, --make, --interactive, -mk-dll is allowed") ----------------------------------------------------------------------------- -- genPipeline @@ -136,6 +108,10 @@ genPipeline todo stop_flag persistent_output lang (filename,suffix) split <- readIORef v_Split_object_files mangle <- readIORef v_Do_asm_mangling keep_hc <- readIORef v_Keep_hc_files +#ifdef ILX + keep_il <- readIORef v_Keep_il_files + keep_ilx <- readIORef v_Keep_ilx_files +#endif keep_raw_s <- readIORef v_Keep_raw_s_files keep_s <- readIORef v_Keep_s_files osuf <- readIORef v_Object_suf @@ -158,26 +134,39 @@ genPipeline todo stop_flag persistent_output lang (filename,suffix) let ----------- ----- ---- --- -- -- - - - - pipeline - | todo == DoMkDependHS = [ Unlit, Cpp, MkDependHS ] + pipeline = preprocess ++ compile + + preprocess + | haskellish = [ Unlit, Cpp, HsPp ] + | otherwise = [ ] + + compile + | todo == DoMkDependHS = [ MkDependHS ] + + | cish = [ Cc, As ] | haskellish = case real_lang of - HscC | split && mangle -> [ Unlit, Cpp, Hsc, HCc, Mangle, - SplitMangle, SplitAs ] - | mangle -> [ Unlit, Cpp, Hsc, HCc, Mangle, As ] + HscC | split && mangle -> [ Hsc, HCc, Mangle, SplitMangle, SplitAs ] + | mangle -> [ Hsc, HCc, Mangle, As ] + | split -> not_valid + | otherwise -> [ Hsc, HCc, As ] + + HscCore | split && mangle -> [ Hsc, HCc, Mangle, SplitMangle, SplitAs ] + | mangle -> [ Hsc, HCc, Mangle, As ] | split -> not_valid - | otherwise -> [ Unlit, Cpp, Hsc, HCc, As ] + | otherwise -> [ Hsc, HCc, As ] - HscAsm | split -> [ Unlit, Cpp, Hsc, SplitMangle, SplitAs ] - | otherwise -> [ Unlit, Cpp, Hsc, As ] + HscAsm | split -> [ Hsc, SplitMangle, SplitAs ] + | otherwise -> [ Hsc, As ] HscJava | split -> not_valid | otherwise -> error "not implemented: compiling via Java" +#ifdef ILX HscILX | split -> not_valid - | otherwise -> [ Unlit, Cpp, Hsc ] - - | cish = [ Cc, As ] + | otherwise -> [ Hsc, Ilx2Il, Ilasm ] +#endif + HscNothing -> [ Hsc, HCc ] -- HCc is a dummy stop phase | otherwise = [ ] -- just pass this file through to the linker @@ -186,28 +175,32 @@ genPipeline todo stop_flag persistent_output lang (filename,suffix) stop_phase = case todo of StopBefore As | split -> SplitAs +#ifdef ILX + | real_lang == HscILX -> Ilasm +#endif StopBefore phase -> phase DoMkDependHS -> Ln DoLink -> Ln + DoMkDLL -> Ln ----------- ----- ---- --- -- -- - - - -- this shouldn't happen. - if start_phase /= Ln && start_phase `notElem` pipeline - then throwDyn (CmdLineError ("can't find starting phase for " - ++ filename)) - else do - + when (start_phase /= Ln && start_phase `notElem` pipeline) + (throwDyn (CmdLineError ("can't find starting phase for " + ++ filename))) -- if we can't find the phase we're supposed to stop before, -- something has gone wrong. This test carefully avoids the -- case where we aren't supposed to do any compilation, because the file -- is already in linkable form (for example). - if start_phase `elem` pipeline && - (stop_phase /= Ln && stop_phase `notElem` pipeline) - then throwDyn (UsageError - ("flag " ++ stop_flag - ++ " is incompatible with source file `" ++ filename ++ "'")) - else do - +-- hPutStrLn stderr (show ((start_phase `elem` pipeline,stop_phase /= Ln,stop_phase `notElem` pipeline), start_phase, stop_phase, pipeline,todo)) +-- hFlush stderr + when (start_phase `elem` pipeline && + (stop_phase /= Ln && stop_phase `notElem` pipeline)) + (do + throwDyn (UsageError + ("flag `" ++ stop_flag + ++ "' is incompatible with source file `" + ++ filename ++ "'" ++ show pipeline ++ show stop_phase))) let -- .o and .hc suffixes can be overriden by command-line options: myPhaseInputExt Ln | Just s <- osuf = s @@ -233,6 +226,10 @@ genPipeline todo stop_flag persistent_output lang (filename,suffix) Mangle | keep_raw_s -> Persistent As | keep_s -> Persistent HCc | keep_hc -> Persistent +#ifdef ILX + Ilx2Il | keep_ilx -> Persistent + Ilasm | keep_il -> Persistent +#endif _other -> Temporary -- add information about output files to the pipeline @@ -264,22 +261,37 @@ runPipeline pipeline (input_fn,suffix) do_linking use_ofile where (basename, _) = splitFilename input_fn pipeLoop [] input_fn _ _ _ _ = return input_fn -pipeLoop ((phase, keep, o_suffix):phases) +pipeLoop (all_phases@((phase, keep, o_suffix):phases)) (input_fn,real_suff) do_linking use_ofile orig_basename orig_suffix = do output_fn <- outputFileName (null phases) keep o_suffix - mbCarryOn <- run_phase phase orig_basename orig_suffix input_fn output_fn + mbCarryOn <- run_phase phase orig_basename orig_suffix + input_fn output_fn -- sometimes we bail out early, eg. when the compiler's recompilation -- checker has determined that recompilation isn't necessary. case mbCarryOn of Nothing -> do - let (_,keep,final_suffix) = last phases + let (_,keep,final_suffix) = last all_phases ofile <- outputFileName True keep final_suffix return (ofile, final_suffix) -- carry on ... - Just fn -> + Just fn -> do + {- + Check to see whether we've reached the end of the + pipeline, but did so with an ineffective last stage. + (i.e., it returned the input_fn as the output filename). + + If we did and the output is persistent, copy the contents + of input_fn into the file where the pipeline's output is + expected to end up. + -} + atEnd <- finalStage (null phases) + when (atEnd && fn == input_fn) + (copy "Saving away compilation pipeline's output" + input_fn + output_fn) {- Notice that in order to keep the invariant that we can determine a compilation pipeline's 'start phase' just @@ -300,9 +312,14 @@ pipeLoop ((phase, keep, o_suffix):phases) pipeLoop phases (fn, o_suffix) do_linking use_ofile orig_basename orig_suffix where + finalStage lastPhase = do + o_file <- readIORef v_Output_file + return (lastPhase && not do_linking && use_ofile && isJust o_file) + outputFileName last_phase keep suffix = do o_file <- readIORef v_Output_file - if last_phase && not do_linking && use_ofile && isJust o_file + atEnd <- finalStage last_phase + if atEnd then case o_file of Just s -> return s Nothing -> error "outputFileName" @@ -324,10 +341,13 @@ run_phase :: Phase run_phase Unlit _basename _suff input_fn output_fn = do unlit_flags <- getOpts opt_L - -- The -h option passes the file name for unlit to put in a #line directive; - -- we undosify it so that it doesn't contain backslashes in Windows, which - -- would disappear in error messages - SysTools.runUnlit (unlit_flags ++ ["-h", unDosifyPath input_fn, input_fn, output_fn]) + -- The -h option passes the file name for unlit to put in a #line directive + SysTools.runUnlit (map SysTools.Option unlit_flags ++ + [ SysTools.Option "-h" + , SysTools.Option input_fn + , SysTools.FileOption "" input_fn + , SysTools.FileOption "" output_fn + ]) return (Just output_fn) ------------------------------------------------------------------------------- @@ -355,56 +375,94 @@ run_phase Cpp basename suff input_fn output_fn verb <- getVerbFlag (md_c_flags, _) <- machdepCCOpts - SysTools.runCpp ([verb] - ++ include_paths - ++ hs_src_cpp_opts - ++ hscpp_opts - ++ md_c_flags - ++ [ "-x", "c", input_fn, "-o", output_fn ]) + SysTools.runCpp ([SysTools.Option verb] + ++ map SysTools.Option include_paths + ++ map SysTools.Option hs_src_cpp_opts + ++ map SysTools.Option hscpp_opts + ++ map SysTools.Option md_c_flags + ++ [ SysTools.Option "-x" + , SysTools.Option "c" + , SysTools.Option input_fn + -- We hackily use Option instead of FileOption here, so that the file + -- name is not back-slashed on Windows. cpp is capable of + -- dealing with / in filenames, so it works fine. Furthermore + -- if we put in backslashes, cpp outputs #line directives + -- with *double* backslashes. And that in turn means that + -- our error messages get double backslashes in them. + -- In due course we should arrange that the lexer deals + -- with these \\ escapes properly. + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ]) + return (Just output_fn) + +------------------------------------------------------------------------------- +-- HsPp phase +run_phase HsPp basename suff input_fn output_fn + = do src_opts <- getOptionsFromSource input_fn + unhandled_flags <- processArgs dynamic_flags src_opts [] + checkProcessArgsResult unhandled_flags basename suff + + let orig_fn = basename ++ '.':suff + do_pp <- dynFlag ppFlag + if not do_pp then + -- no need to preprocess, just pass input file along + -- to the next phase of the pipeline. + return (Just input_fn) + else do + hspp_opts <- getOpts opt_F + hs_src_pp_opts <- readIORef v_Hs_source_pp_opts + SysTools.runPp ( [ SysTools.Option orig_fn + , SysTools.Option input_fn + , SysTools.FileOption "" output_fn + ] ++ + map SysTools.Option hs_src_pp_opts ++ + map SysTools.Option hspp_opts + ) return (Just output_fn) ----------------------------------------------------------------------------- -- MkDependHS phase -run_phase MkDependHS basename suff input_fn output_fn = do - src <- readFile input_fn - let (import_sources, import_normals, _) = getImports src - - let orig_fn = basename ++ '.':suff - deps_sources <- mapM (findDependency True orig_fn) import_sources - deps_normals <- mapM (findDependency False orig_fn) import_normals - let deps = deps_sources ++ deps_normals - - osuf_opt <- readIORef v_Object_suf - let osuf = case osuf_opt of - Nothing -> phaseInputExt Ln - Just s -> s - - extra_suffixes <- readIORef v_Dep_suffixes - let suffixes = osuf : map (++ ('_':osuf)) extra_suffixes - ofiles = map (\suf -> basename ++ '.':suf) suffixes - - objs <- mapM odir_ify ofiles - +run_phase MkDependHS basename suff input_fn output_fn + = do src <- readFile input_fn + let (import_sources, import_normals, _) = getImports src + let orig_fn = basename ++ '.':suff + deps_sources <- mapM (findDependency True orig_fn) import_sources + deps_normals <- mapM (findDependency False orig_fn) import_normals + let deps = deps_sources ++ deps_normals + + osuf_opt <- readIORef v_Object_suf + let osuf = case osuf_opt of + Nothing -> phaseInputExt Ln + Just s -> s + + extra_suffixes <- readIORef v_Dep_suffixes + let suffixes = osuf : map (++ ('_':osuf)) extra_suffixes + ofiles = map (\suf -> basename ++ '.':suf) suffixes + + objs <- mapM odir_ify ofiles + -- Handle for file that accumulates dependencies - hdl <- readIORef v_Dep_tmp_hdl + hdl <- readIORef v_Dep_tmp_hdl -- std dependency of the object(s) on the source file - hPutStrLn hdl (unwords objs ++ " : " ++ basename ++ '.':suff) - - let genDep (dep, False {- not an hi file -}) = - hPutStrLn hdl (unwords objs ++ " : " ++ dep) - genDep (dep, True {- is an hi file -}) = do - hisuf <- readIORef v_Hi_suf - let dep_base = remove_suffix '.' dep - deps = (dep_base ++ hisuf) - : map (\suf -> dep_base ++ suf ++ '_':hisuf) extra_suffixes + hPutStrLn hdl (unwords (map escapeSpaces objs) ++ " : " ++ + escapeSpaces (basename ++ '.':suff)) + + let genDep (dep, False {- not an hi file -}) = + hPutStrLn hdl (unwords (map escapeSpaces objs) ++ " : " ++ + escapeSpaces dep) + genDep (dep, True {- is an hi file -}) = do + hisuf <- readIORef v_Hi_suf + let dep_base = remove_suffix '.' dep + deps = (dep_base ++ hisuf) + : map (\suf -> dep_base ++ suf ++ '_':hisuf) extra_suffixes -- length objs should be == length deps - sequence_ (zipWith (\o d -> hPutStrLn hdl (o ++ " : " ++ d)) objs deps) + sequence_ (zipWith (\o d -> hPutStrLn hdl (escapeSpaces o ++ " : " ++ escapeSpaces d)) objs deps) - mapM genDep [ d | Just d <- deps ] - - return (Just output_fn) + sequence_ (map genDep [ d | Just d <- deps ]) + return (Just output_fn) -- add the lines to dep_makefile: -- always: @@ -424,6 +482,7 @@ run_phase MkDependHS basename suff input_fn output_fn = do -- (where .o is $osuf, and the other suffixes come from -- the cmdline -s options). + ----------------------------------------------------------------------------- -- Hsc phase @@ -458,8 +517,8 @@ run_phase Hsc basename suff input_fn output_fn (srcimps,imps,mod_name) <- getImportsFromFile input_fn -- build a ModuleLocation to pass to hscMain. - Just (mod, location') - <- mkHomeModuleLocn mod_name basename (Just (basename ++ '.':suff)) + (mod, location') + <- mkHomeModuleLocn mod_name basename (basename ++ '.':suff) -- take -ohi into account if present ohi <- readIORef v_Output_hi @@ -478,10 +537,13 @@ run_phase Hsc basename suff input_fn output_fn do_recomp <- readIORef v_Recomp todo <- readIORef v_GhcMode expl_o_file <- readIORef v_Output_file - let o_file = - case expl_o_file of - Nothing -> unJust "source_unchanged" (ml_obj_file location) - Just x -> x + + let o_file -- if the -o option is given and IT IS THE OBJECT FILE FOR + -- THIS COMPILATION, then use that to determine if the + -- source is unchanged. + | Just x <- expl_o_file, todo == StopBefore Ln = x + | otherwise = unJust "source_unchanged" (ml_obj_file location) + source_unchanged <- if not (do_recomp && ( todo == DoLink || todo == StopBefore Ln )) then return False @@ -500,7 +562,7 @@ run_phase Hsc basename suff input_fn output_fn let dyn_flags' = dyn_flags { hscOutName = output_fn, hscStubCOutName = basename ++ "_stub.c", hscStubHOutName = basename ++ "_stub.h", - extCoreName = basename ++ ".core" } + extCoreName = basename ++ ".hcr" } -- run the compiler! pcs <- initPersistentCompilerState @@ -524,13 +586,14 @@ run_phase Hsc basename suff input_fn output_fn HscRecomp pcs details iface stub_h_exists stub_c_exists _maybe_interpreted_code -> do - -- deal with stubs - maybe_stub_o <- compileStub dyn_flags' stub_c_exists - case maybe_stub_o of - Nothing -> return () - Just stub_o -> add v_Ld_inputs stub_o - - return (Just output_fn) + -- deal with stubs + maybe_stub_o <- compileStub dyn_flags' stub_c_exists + case maybe_stub_o of + Nothing -> return () + Just stub_o -> add v_Ld_inputs stub_o + case hscLang dyn_flags of + HscNothing -> return Nothing + _ -> return (Just output_fn) } ----------------------------------------------------------------------------- @@ -569,8 +632,20 @@ run_phase cc_phase basename suff input_fn output_fn | otherwise = [ ] excessPrecision <- readIORef v_Excess_precision - SysTools.runCc ([ "-x", "c", input_fn, "-o", output_fn ] - ++ md_c_flags + + -- force the C compiler to interpret this file as C when + -- compiling .hc files, by adding the -x c option. + let langopt + | cc_phase == HCc = [ SysTools.Option "-x", SysTools.Option "c"] + | otherwise = [ ] + + SysTools.runCc (langopt ++ + [ SysTools.FileOption "" input_fn + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ (if cc_phase == HCc && mangle then md_regd_c_flags else []) @@ -581,7 +656,7 @@ run_phase cc_phase basename suff input_fn output_fn ++ (if excessPrecision then [] else [ "-ffloat-store" ]) ++ include_paths ++ pkg_extra_cc_opts - ) + )) return (Just output_fn) -- ToDo: postprocess the output from gcc @@ -596,9 +671,11 @@ run_phase Mangle _basename _suff input_fn output_fn return [ show n_regs ] else return [] - SysTools.runMangle (mangler_opts - ++ [ input_fn, output_fn ] - ++ machdep_opts) + SysTools.runMangle (map SysTools.Option mangler_opts + ++ [ SysTools.FileOption "" input_fn + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option machdep_opts) return (Just output_fn) ----------------------------------------------------------------------------- @@ -610,7 +687,10 @@ run_phase SplitMangle _basename _suff input_fn output_fn split_s_prefix <- SysTools.newTempName "split" let n_files_fn = split_s_prefix - SysTools.runSplit [input_fn, split_s_prefix, n_files_fn] + SysTools.runSplit [ SysTools.FileOption "" input_fn + , SysTools.FileOption "" split_s_prefix + , SysTools.FileOption "" n_files_fn + ] -- Save the number of split files for future references s <- readFile n_files_fn @@ -630,9 +710,13 @@ run_phase As _basename _suff input_fn output_fn = do as_opts <- getOpts opt_a cmdline_include_paths <- readIORef v_Include_paths - SysTools.runAs (as_opts - ++ [ "-I" ++ p | p <- cmdline_include_paths ] - ++ [ "-c", input_fn, "-o", output_fn ]) + SysTools.runAs (map SysTools.Option as_opts + ++ [ SysTools.Option ("-I" ++ p) | p <- cmdline_include_paths ] + ++ [ SysTools.Option "-c" + , SysTools.FileOption "" input_fn + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ]) return (Just output_fn) run_phase SplitAs basename _suff _input_fn output_fn @@ -642,7 +726,7 @@ run_phase SplitAs basename _suff _input_fn output_fn odir <- readIORef v_Output_dir let real_odir = case odir of - Nothing -> basename + Nothing -> basename ++ "_split" Just d -> d let assemble_file n @@ -650,11 +734,46 @@ run_phase SplitAs basename _suff _input_fn output_fn let output_o = newdir real_odir (basename ++ "__" ++ show n ++ ".o") real_o <- osuf_ify output_o - SysTools.runAs (as_opts ++ ["-c", "-o", real_o, input_s]) + SysTools.runAs (map SysTools.Option as_opts ++ + [ SysTools.Option "-c" + , SysTools.Option "-o" + , SysTools.FileOption "" real_o + , SysTools.FileOption "" input_s + ]) mapM_ assemble_file [1..n] return (Just output_fn) +#ifdef ILX +----------------------------------------------------------------------------- +-- Ilx2Il phase +-- Run ilx2il over the ILX output, getting an IL file + +run_phase Ilx2Il _basename _suff input_fn output_fn + = do ilx2il_opts <- getOpts opt_I + SysTools.runIlx2il (map SysTools.Option ilx2il_opts + ++ [ SysTools.Option "--no-add-suffix-to-assembly", + SysTools.Option "mscorlib", + SysTools.Option "-o", + SysTools.FileOption "" output_fn, + SysTools.FileOption "" input_fn ]) + return (Just output_fn) + +----------------------------------------------------------------------------- +-- Ilasm phase +-- Run ilasm over the IL, getting a DLL + +run_phase Ilasm _basename _suff input_fn output_fn + = do ilasm_opts <- getOpts opt_i + SysTools.runIlasm (map SysTools.Option ilasm_opts + ++ [ SysTools.Option "/QUIET", + SysTools.Option "/DLL", + SysTools.FileOption "/OUT=" output_fn, + SysTools.FileOption "" input_fn ]) + return (Just output_fn) + +#endif -- ILX + ----------------------------------------------------------------------------- -- MoveBinary sort-of-phase -- After having produced a binary, move it somewhere else and generate a @@ -743,7 +862,7 @@ mk_pvm_wrapper_script pvm_executable pvm_executable_base sysMan = unlines $ -- Complain about non-dynamic flags in OPTIONS pragmas checkProcessArgsResult flags basename suff - = do when (not (null flags)) (throwDyn (ProgramError ( + = do when (notNull flags) (throwDyn (ProgramError ( basename ++ "." ++ suff ++ ": static flags are not allowed in {-# OPTIONS #-} pragmas:\n\t" ++ unwords flags)) (ExitFailure 1)) @@ -790,8 +909,12 @@ doLink o_files = do head (library_dirs (head std_pkg)) ++ "/PrelMain.dll_o" ] (md_c_flags, _) <- machdepCCOpts - SysTools.runLink ( [verb, "-o", output_fn] - ++ md_c_flags + SysTools.runLink ( [ SysTools.Option verb + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ o_files ++ extra_os ++ extra_ld_inputs @@ -802,14 +925,8 @@ doLink o_files = do ++ pkg_extra_ld_opts ++ extra_ld_opts ++ if static && not no_hs_main then -#ifdef LEADING_UNDERSCORE - [ "-u", "_PrelMain_mainIO_closure" , - "-u", "___init_PrelMain"] -#else - [ "-u", "PrelMain_mainIO_closure" , - "-u", "__init_PrelMain"] -#endif - else []) + [ "-u", prefixUnderscore "Main_zdmain_closure"] + else [])) -- parallel only: move binary to another dir -- HWL ways_ <- readIORef v_Ways @@ -862,8 +979,12 @@ doMkDLL o_files = do (md_c_flags, _) <- machdepCCOpts SysTools.runMkDLL - ([ verb, "-o", output_fn ] - ++ md_c_flags + ([ SysTools.Option verb + , SysTools.Option "-o" + , SysTools.FileOption "" output_fn + ] + ++ map SysTools.Option ( + md_c_flags ++ o_files ++ extra_os ++ [ "--target=i386-mingw32" ] @@ -873,11 +994,11 @@ doMkDLL o_files = do ++ pkg_lib_path_opts ++ pkg_lib_opts ++ pkg_extra_ld_opts - ++ (case findPS (packString (concat extra_ld_opts)) (packString "--def") of - Nothing -> [ "--export-all" ] - Just _ -> [ "" ]) + ++ (if "--def" `elem` (concatMap words extra_ld_opts) + then [ "" ] + else [ "--export-all" ]) ++ extra_ld_opts - ) + )) ----------------------------------------------------------------------------- -- Just preprocess a file, put the result in a temp. file (used by the @@ -887,9 +1008,10 @@ preprocess :: FilePath -> IO FilePath preprocess filename = ASSERT(haskellish_src_file filename) do restoreDynFlags -- Restore to state of last save + let fInfo = (filename, getFileSuffix filename) pipeline <- genPipeline (StopBefore Hsc) ("preprocess") False - defaultHscLang (filename, getFileSuffix filename) - (fn,_) <- runPipeline pipeline (filename,getFileSuffix filename) + defaultHscLang fInfo + (fn,_) <- runPipeline pipeline fInfo False{-no linking-} False{-no -o flag-} return fn @@ -936,7 +1058,7 @@ compile ghci_mode summary source_unchanged have_object showPass dyn_flags - (showSDoc (text "Compiling" <+> ppr (name_of_summary summary))) + (showSDoc (text "Compiling" <+> ppr (modSummaryName summary))) let verb = verbosity dyn_flags let location = ms_location summary @@ -952,17 +1074,30 @@ compile ghci_mode summary source_unchanged have_object let hsc_lang = hscLang dyn_flags (basename, _) = splitFilename input_fn - output_fn <- case hsc_lang of - HscAsm -> newTempName (phaseInputExt As) - HscC -> newTempName (phaseInputExt HCc) - HscJava -> newTempName "java" -- ToDo - HscILX -> return (basename ++ ".ilx") -- newTempName "ilx" -- ToDo - HscInterpreted -> return (error "no output file") + keep_hc <- readIORef v_Keep_hc_files +#ifdef ILX + keep_il <- readIORef v_Keep_il_files +#endif + keep_s <- readIORef v_Keep_s_files + + output_fn <- + case hsc_lang of + HscAsm | keep_s -> return (basename ++ '.':phaseInputExt As) + | otherwise -> newTempName (phaseInputExt As) + HscC | keep_hc -> return (basename ++ '.':phaseInputExt HCc) + | otherwise -> newTempName (phaseInputExt HCc) + HscJava -> newTempName "java" -- ToDo +#ifdef ILX + HscILX | keep_il -> return (basename ++ '.':phaseInputExt Ilasm) + | otherwise -> newTempName (phaseInputExt Ilx2Il) +#endif + HscInterpreted -> return (error "no output file") + HscNothing -> return (error "no output file") let dyn_flags' = dyn_flags { hscOutName = output_fn, hscStubCOutName = basename ++ "_stub.c", hscStubHOutName = basename ++ "_stub.h", - extCoreName = basename ++ ".core" } + extCoreName = basename ++ ".hcr" } -- figure out which header files to #include in a generated .hc file c_includes <- getPackageCIncludes @@ -978,10 +1113,14 @@ compile ghci_mode summary source_unchanged have_object writeIORef v_HCHeader cc_injects + -- -no-recomp should also work with --make + do_recomp <- readIORef v_Recomp + let source_unchanged' = source_unchanged && do_recomp + -- run the compiler hsc_result <- hscMain ghci_mode dyn_flags' (ms_mod summary) location - source_unchanged have_object old_iface hst hit pcs + source_unchanged' have_object old_iface hst hit pcs case hsc_result of HscFail pcs -> return (CompErrs pcs) @@ -990,7 +1129,6 @@ compile ghci_mode summary source_unchanged have_object HscRecomp pcs details iface stub_h_exists stub_c_exists maybe_interpreted_code -> do - let maybe_stub_o <- compileStub dyn_flags' stub_c_exists let stub_unlinked = case maybe_stub_o of @@ -1004,8 +1142,10 @@ compile ghci_mode summary source_unchanged have_object -- as our "unlinked" object. HscInterpreted -> case maybe_interpreted_code of +#ifdef GHCI Just (bcos,itbl_env) -> do tm <- getClockTime return ([BCOs bcos itbl_env], tm) +#endif Nothing -> panic "compile: no interpreted code" -- we're in batch mode: finish the compilation pipeline. @@ -1022,7 +1162,7 @@ compile ghci_mode summary source_unchanged have_object o_time <- getModificationTime o_file return ([DotO o_file], o_time) - let linkable = LM unlinked_time (moduleName (ms_mod summary)) + let linkable = LM unlinked_time (modSummaryName summary) (hs_unlinked ++ stub_unlinked) return (CompOK pcs details iface (Just linkable))