X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FLinker.lhs;h=66a4576171c280f07b2a88eda9cf6059a320294f;hp=8d0d6bab33e0d93c07547b2f87f879f86c6dcbcd;hb=e95ee1f718c6915c478005aad8af81705357d6ab;hpb=f871cf1bf889704a4ec1f0063ad4d96f31453ea3

diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs
index 8d0d6ba..66a4576 100644
--- a/compiler/ghci/Linker.lhs
+++ b/compiler/ghci/Linker.lhs
@@ -38,7 +38,7 @@ import Name
 import NameEnv
 import NameSet
 import qualified OccName
-import LazyUniqFM
+import UniqFM
 import Module
 import ListSetOps
 import DynFlags
@@ -51,7 +51,6 @@ import ErrUtils
 import SrcLoc
 import qualified Maybes
 import UniqSet
-import FiniteMap
 import Constants
 import FastString
 import Config		( cProjectVersion )
@@ -62,6 +61,7 @@ import Control.Monad
 import Data.Char
 import Data.IORef
 import Data.List
+import qualified Data.Map as Map
 import Foreign
 import Control.Concurrent.MVar
 
@@ -103,18 +103,18 @@ data PersistentLinkerState
 	-- When a new Unlinked is linked into the running image, or an existing
 	-- module in the image is replaced, the itbl_env must be updated
 	-- appropriately.
-        itbl_env    :: ItblEnv,
+        itbl_env    :: !ItblEnv,
 
 	-- The currently loaded interpreted modules (home package)
-	bcos_loaded :: [Linkable],
+	bcos_loaded :: ![Linkable],
 
 	-- And the currently-loaded compiled modules (home package)
-	objs_loaded :: [Linkable],
+	objs_loaded :: ![Linkable],
 
 	-- The currently-loaded packages; always object code
 	-- Held, as usual, in dependency order; though I am not sure if
 	-- that is really important
-	pkgs_loaded :: [PackageId]
+	pkgs_loaded :: ![PackageId]
      }
 
 emptyPLS :: DynFlags -> PersistentLinkerState
@@ -528,7 +528,16 @@ dieWith span msg = ghcError (ProgramError (showSDoc (mkLocMessage span msg)))
 checkNonStdWay :: DynFlags -> SrcSpan -> IO (Maybe String)
 checkNonStdWay dflags srcspan = do
   let tag = buildTag dflags
-  if null tag then return Nothing else do
+  if null tag {-  || tag == "dyn" -} then return Nothing else do
+    -- see #3604: object files compiled for way "dyn" need to link to the
+    -- dynamic packages, so we can't load them into a statically-linked GHCi.
+    -- we have to treat "dyn" in the same way as "prof".
+    --
+    -- In the future when GHCi is dynamically linked we should be able to relax
+    -- this, but they we may have to make it possible to load either ordinary
+    -- .o files or -dynamic .o files into GHCi (currently that's not possible
+    -- because the dynamic objects contain refs to e.g. __stginit_base_Prelude_dyn
+    -- whereas we have __stginit_base_Prelude_.
   let default_osuf = phaseInputExt StopLn
   if objectSuf dflags == default_osuf
 	then failNonStd srcspan
@@ -624,6 +633,7 @@ getLinkDeps hsc_env hpt pls maybe_normal_osuf span mods
             text "module" <+> ppr mod <+> 
             text "cannot be linked; it is only available as a boot module")))
 
+    no_obj :: Outputable a => a -> IO b
     no_obj mod = dieWith span $
 		     ptext (sLit "cannot find object file for module ") <> 
 			quotes (ppr mod) $$
@@ -648,7 +658,7 @@ getLinkDeps hsc_env hpt pls maybe_normal_osuf span mods
 		-- ...and then find the linkable for it
 	       mb_lnk <- findObjectLinkableMaybe mod loc ;
 	       case mb_lnk of {
-		  Nothing -> no_obj mod ;
+		  Nothing  -> no_obj mod ;
 		  Just lnk -> adjust_linkable lnk
 	      }}
 
@@ -683,7 +693,7 @@ getLinkDeps hsc_env hpt pls maybe_normal_osuf span mods
 linkModules :: DynFlags -> PersistentLinkerState -> [Linkable]
             -> IO (PersistentLinkerState, SuccessFlag)
 linkModules dflags pls linkables
-  = block $ do  -- don't want to be interrupted by ^C in here
+  = mask_ $ do  -- don't want to be interrupted by ^C in here
 	
 	let (objs, bcos) = partition isObjectLinkable 
                               (concatMap partitionLinkable linkables)
@@ -853,7 +863,7 @@ unload :: DynFlags
        -> [Linkable] -- ^ The linkables to *keep*.
        -> IO ()
 unload dflags linkables
-  = block $ do -- block, so we're safe from Ctrl-C in here
+  = mask_ $ do -- mask, so we're safe from Ctrl-C in here
   
 	-- Initialise the linker (if it's not been done already)
 	initDynLinker dflags
@@ -991,7 +1001,7 @@ linkPackages' dflags new_pks pls = do
 	| Just pkg_cfg <- lookupPackage pkg_map new_pkg
 	= do { 	-- Link dependents first
                pkgs' <- link pkgs [ Maybes.expectJust "link_one" $
-                                    lookupFM ipid_map ipid
+                                    Map.lookup ipid ipid_map
                                   | ipid <- depends pkg_cfg ]
 		-- Now link the package itself
 	     ; linkPackage dflags pkg_cfg
@@ -1075,23 +1085,20 @@ loadFrameworks pkg
 -- If it isn't present, we assume it's a dynamic library.
 locateOneObj :: [FilePath] -> String -> IO LibrarySpec
 locateOneObj dirs lib
- | not picIsOn
+  | not isDynamicGhcLib
     -- When the GHC package was not compiled as dynamic library 
-    -- (=__PIC__ not set), we search for .o libraries first.
+    -- (=DYNAMIC not set), we search for .o libraries.
   = do	{ mb_obj_path <- findFile mk_obj_path dirs 
 	; case mb_obj_path of
 	    Just obj_path -> return (Object obj_path)
-	    Nothing	  -> 
-                do { mb_lib_path <- findFile mk_dyn_lib_path dirs
-                   ; case mb_lib_path of
-                       Just _  -> return (DLL dyn_lib_name)
-                       Nothing -> return (DLL lib) }} -- We assume
- | otherwise
-    -- When the GHC package was compiled as dynamic library (=__PIC__ set),
+	    Nothing	  -> return (DLL lib) }
+
+  | otherwise
+    -- When the GHC package was compiled as dynamic library (=DYNAMIC set),
     -- we search for .so libraries first.
   = do	{ mb_lib_path <- findFile mk_dyn_lib_path dirs
 	; case mb_lib_path of
-	    Just _ -> return (DLL (lib ++ "-ghc" ++ cProjectVersion))
+	    Just _ -> return (DLL dyn_lib_name)
 	    Nothing	  ->
                 do { mb_obj_path <- findFile mk_obj_path dirs
                    ; case mb_obj_path of