X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDriverPipeline.hs;h=22ce65b83b807ce8eb04f8eb3fbb3d018dbc1243;hb=ace2d4a6b98b30397ba9f572aff64c13524cad3b;hp=16a172598351af288384511ed61ff21e0f9b0c8a;hpb=b1ab4b8a607addc4d097588db5761313c996a41f;p=ghc-hetmet.git

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 16a1725..22ce65b 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -12,16 +12,13 @@ module DriverPipeline (
    oneShot, compileFile,
 
 	-- Interfaces for the batch-mode driver
-   staticLink,
+   linkBinary,
 
 	-- Interfaces for the compilation manager (interpreted/batch-mode)
    preprocess, 
    compile, CompResult(..), 
    link, 
 
-        -- DLL building
-   doMkDLL,
-
   ) where
 
 #include "HsVersions.h"
@@ -314,13 +311,13 @@ link LinkBinary dflags batch_attempt_linking hpt
 
 	-- Don't showPass in Batch mode; doLink will do that for us.
 	let link = case ghcLink dflags of
-	        MkDLL       -> doMkDLL
-	        LinkBinary  -> staticLink
+	        LinkBinary  -> linkBinary
+	        LinkDynLib  -> linkDynLib
 	link dflags obj_files pkg_deps
 
         debugTraceMsg dflags 3 (text "link: done")
 
-	-- staticLink only returns if it succeeds
+	-- linkBinary only returns if it succeeds
         return Succeeded
 
    | otherwise
@@ -375,8 +372,8 @@ doLink dflags stop_phase o_files
   | otherwise
   = case ghcLink dflags of
 	NoLink     -> return ()
-	LinkBinary -> staticLink dflags o_files link_pkgs
-	MkDLL      -> doMkDLL dflags o_files link_pkgs
+	LinkBinary -> linkBinary dflags o_files link_pkgs
+	LinkDynLib -> linkDynLib dflags o_files []
   where
    -- Always link in the haskell98 package for static linking.  Other
    -- packages have to be specified via the -package flag.
@@ -1050,7 +1047,7 @@ runPhase SplitAs stop dflags basename _suff _input_fn get_output_fn maybe_loc
 -- wrapper script calling the binary. Currently, we need this only in 
 -- a parallel way (i.e. in GUM), because PVM expects the binary in a
 -- central directory.
--- This is called from staticLink below, after linking. I haven't made it
+-- This is called from linkBinary below, after linking. I haven't made it
 -- a separate phase to minimise interfering with other modules, and
 -- we don't need the generality of a phase (MoveBinary is always
 -- done after linking and makes only sense in a parallel setup)   -- HWL
@@ -1164,8 +1161,8 @@ getHCFilePackages filename =
 -- read any interface files), so the user must explicitly specify all
 -- the packages.
 
-staticLink :: DynFlags -> [FilePath] -> [PackageId] -> IO ()
-staticLink dflags o_files dep_packages = do
+linkBinary :: DynFlags -> [FilePath] -> [PackageId] -> IO ()
+linkBinary dflags o_files dep_packages = do
     let verb = getVerbFlag dflags
         output_fn = exeFileName dflags
 
@@ -1276,16 +1273,12 @@ exeFileName dflags
 	"a.out"
 #endif
 
------------------------------------------------------------------------------
--- Making a DLL (only for Win32)
-
-doMkDLL :: DynFlags -> [String] -> [PackageId] -> IO ()
-doMkDLL dflags o_files dep_packages = do
+linkDynLib :: DynFlags -> [String] -> [PackageId] -> IO ()
+linkDynLib dflags o_files dep_packages = do
     let verb = getVerbFlag dflags
     let static = opt_Static
     let no_hs_main = dopt Opt_NoHsMain dflags
     let o_file = outputFile dflags
-    let output_fn = case o_file of { Just s -> s; Nothing -> "HSdll.dll"; }
 
     pkg_lib_paths <- getPackageLibraryPath dflags dep_packages
     let pkg_lib_path_opts = map ("-L"++) pkg_lib_paths
@@ -1298,7 +1291,15 @@ doMkDLL dflags o_files dep_packages = do
 	-- probably _stub.o files
     extra_ld_inputs <- readIORef v_Ld_inputs
 
-	-- opts from -optdll-<blah>
+    let (md_c_flags, _) = machdepCCOpts dflags
+#if defined(mingw32_HOST_OS)
+    -----------------------------------------------------------------------------
+    -- Making a DLL
+    -----------------------------------------------------------------------------
+
+    let output_fn = case o_file of { Just s -> s; Nothing -> "HSdll.dll"; }
+
+    -- opts from -optdll-<blah>
     let extra_ld_opts = getOpts dflags opt_dll 
 
     let pstate = pkgState dflags
@@ -1309,8 +1310,6 @@ doMkDLL dflags o_files dep_packages = do
                    then []
                    else [ head (libraryDirs rts_pkg) ++ "/Main.dll_o",
                           head (libraryDirs base_pkg) ++ "/PrelMain.dll_o" ]
-
-    let (md_c_flags, _) = machdepCCOpts dflags
     SysTools.runMkDLL dflags
 	 ([ SysTools.Option verb
 	  , SysTools.Option "-o"
@@ -1330,7 +1329,30 @@ doMkDLL dflags o_files dep_packages = do
 	       then [ "" ]
                else [ "--export-all" ])
 	))
-
+#else
+    -----------------------------------------------------------------------------
+    -- Making a DSO
+    -----------------------------------------------------------------------------
+    -- opts from -optl-<blah>
+    let extra_ld_opts = getOpts dflags opt_l 
+    let output_fn = case o_file of { Just s -> s; Nothing -> "a.out"; }
+
+    SysTools.runLink dflags
+	 ([ SysTools.Option verb
+	  , SysTools.Option "-o"
+	  , SysTools.FileOption "" output_fn
+	  ]
+	 ++ map SysTools.Option (
+	    md_c_flags
+	 ++ o_files
+	 ++ [ "-shared", "-Wl,-Bsymbolic" ] -- we need symbolic linking to resolve non-PIC intra-package-relocations
+	 ++ extra_ld_inputs
+	 ++ lib_path_opts
+	 ++ extra_ld_opts
+	 ++ pkg_lib_path_opts
+	 ++ pkg_link_opts
+	))
+#endif
 -- -----------------------------------------------------------------------------
 -- Running CPP