From 65494b207a56d8efdafcbe27b17f3141374fdb27 Mon Sep 17 00:00:00 2001 From: rrt Date: Tue, 9 Jan 2001 17:16:36 +0000 Subject: [PATCH] [project @ 2001-01-09 17:16:35 by rrt] Add --mk-dll. --- ghc/compiler/main/DriverPipeline.hs | 89 +++++++++++++++++++++++++++++++---- ghc/compiler/main/DriverState.hs | 3 +- ghc/compiler/main/Main.hs | 7 +-- 3 files changed, 87 insertions(+), 12 deletions(-) diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 79c4d89..d7bc710 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverPipeline.hs,v 1.46 2001/01/03 14:28:26 simonmar Exp $ +-- $Id: DriverPipeline.hs,v 1.47 2001/01/09 17:16:35 rrt Exp $ -- -- GHC Driver -- @@ -19,12 +19,14 @@ module DriverPipeline ( preprocess, compile, CompResult(..), -- batch-mode linking interface - doLink + doLink, + -- DLL building + doMkDLL ) where #include "HsVersions.h" -import CmStaticInfo ( GhciMode(..) ) +import CmStaticInfo import CmTypes import GetImports import DriverState @@ -53,12 +55,15 @@ import IO import Monad import Maybe +import PackedString +import MatchPS + ----------------------------------------------------------------------------- -- GHC modes of operation data GhcMode = DoMkDependHS -- ghc -M - | DoMkDLL -- ghc -mk-dll + | DoMkDLL -- ghc --mk-dll | StopBefore Phase -- ghc -E | -C | -S | -c | DoMake -- ghc --make | DoInteractive -- ghc --interactive @@ -69,6 +74,7 @@ GLOBAL_VAR(v_GhcMode, error "todo", GhcMode) 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 @@ -88,7 +94,7 @@ getGhcMode flags ([(flag,one)], rest) -> return (rest, one, flag) (_ , _ ) -> throwDyn (OtherError - "only one of the flags -M, -E, -C, -S, -c, --make, --interactive is allowed") + "only one of the flags -M, -E, -C, -S, -c, --make, --interactive, -mk-dll is allowed") ----------------------------------------------------------------------------- -- genPipeline @@ -703,9 +709,8 @@ doLink o_files = do #ifdef mingw32_TARGET_OS let extra_os = if static || no_hs_main then [] --- else [ head (lib_paths (head rts_pkg)) ++ "/Main.dll_o", --- head (lib_paths (head std_pkg)) ++ "/PrelMain.dll_o" ] - else [] + else [ head (library_dirs (head rts_pkg)) ++ "/Main.dll_o", + head (library_dirs (head std_pkg)) ++ "/PrelMain.dll_o" ] #endif (md_c_flags, _) <- machdepCCOpts runSomething "Linker" @@ -732,6 +737,74 @@ doLink o_files = do ) ----------------------------------------------------------------------------- +-- Making a DLL + +-- only for Win32, but bits that are #ifdefed in doLn are still #ifdefed here +-- in a vain attempt to aid future portability +doMkDLL :: [String] -> IO () +doMkDLL o_files = do + ln <- readIORef v_Pgm_dll + verb <- getVerbFlag + static <- readIORef v_Static + let imp = if static then "" else "_imp" + no_hs_main <- readIORef v_NoHsMain + + o_file <- readIORef v_Output_file + let output_fn = case o_file of { Just s -> s; Nothing -> "HSdll.dll"; } + + pkg_lib_paths <- getPackageLibraryPath + let pkg_lib_path_opts = map ("-L"++) pkg_lib_paths + + lib_paths <- readIORef v_Library_paths + let lib_path_opts = map ("-L"++) lib_paths + + pkg_libs <- getPackageLibraries + let pkg_lib_opts = map (\lib -> "-l" ++ lib ++ imp) pkg_libs + + libs <- readIORef v_Cmdline_libraries + let lib_opts = map ("-l"++) (reverse libs) + -- reverse because they're added in reverse order from the cmd line + + pkg_extra_ld_opts <- getPackageExtraLdOpts + + -- probably _stub.o files + extra_ld_inputs <- readIORef v_Ld_inputs + + -- opts from -optdll- + extra_ld_opts <- getStaticOpts v_Opt_dll + + rts_pkg <- getPackageDetails ["rts"] + std_pkg <- getPackageDetails ["std"] +#ifdef mingw32_TARGET_OS + let extra_os = if static || no_hs_main + then [] + else [ head (library_dirs (head rts_pkg)) ++ "/Main.dll_o", + head (library_dirs (head std_pkg)) ++ "/PrelMain.dll_o" ] +#endif + (md_c_flags, _) <- machdepCCOpts + runSomething "DLL creator" + (unwords + ([ ln, verb, "-o", output_fn ] + ++ md_c_flags + ++ o_files +#ifdef mingw32_TARGET_OS + ++ extra_os + ++ [ "--target=i386-mingw32" ] +#endif + ++ extra_ld_inputs + ++ lib_path_opts + ++ lib_opts + ++ 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 _ -> [ "" ]) + ++ extra_ld_opts + ) + ) + +----------------------------------------------------------------------------- -- Just preprocess a file, put the result in a temp. file (used by the -- compilation manager during the summary phase). diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs index 99fee2b..6071c10 100644 --- a/ghc/compiler/main/DriverState.hs +++ b/ghc/compiler/main/DriverState.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverState.hs,v 1.21 2001/01/08 12:31:34 rrt Exp $ +-- $Id: DriverState.hs,v 1.22 2001/01/09 17:16:35 rrt Exp $ -- -- Settings for the driver -- @@ -654,6 +654,7 @@ GLOBAL_VAR(v_Pgm_m, error "pgm_m", String) GLOBAL_VAR(v_Pgm_s, error "pgm_s", String) GLOBAL_VAR(v_Pgm_a, cGCC, String) GLOBAL_VAR(v_Pgm_l, cGCC, String) +GLOBAL_VAR(v_Pgm_dll, cMkDLL, String) GLOBAL_VAR(v_Opt_dep, [], [String]) GLOBAL_VAR(v_Anti_opt_C, [], [String]) diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index b4fd16d..9487658 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.44 2001/01/03 11:48:06 simonmar Exp $ +-- $Id: Main.hs,v 1.45 2001/01/09 17:16:36 rrt Exp $ -- -- GHC Driver program -- @@ -256,7 +256,7 @@ main = -- sanity checking o_file <- readIORef v_Output_file ohi <- readIORef v_Output_hi - if length srcs > 1 && (isJust ohi || (isJust o_file && mode /= DoLink)) + if length srcs > 1 && (isJust ohi || (isJust o_file && mode /= DoLink && mode /= DoMkDLL)) then throwDyn (UsageError "can't apply -o or -ohi options to multiple source files") else do @@ -282,7 +282,7 @@ main = -- rest of compilation dyn_flags <- readIORef v_DynFlags phases <- genPipeline mode stop_flag True (hscLang dyn_flags) pp - r <- pipeLoop phases pp (mode==DoLink) True{-use -o flag-} + r <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL) True{-use -o flag-} basename suffix return r @@ -290,6 +290,7 @@ main = when (mode == DoMkDependHS) endMkDependHS when (mode == DoLink) (doLink o_files) + when (mode == DoMkDLL) (doMkDLL o_files) -- grab the last -B option on the command line, and -- set topDir to its value. -- 1.7.10.4