Filter out the FFI library when loading package in ghci

[ghc-hetmet.git] / compiler / ghci / ObjLink.lhs

diff --git a/compiler/ghci/ObjLink.lhs b/compiler/ghci/ObjLink.lhs
index 7675c71..ec91616 100644 (file)
--- a/compiler/ghci/ObjLink.lhs
+++ b/compiler/ghci/ObjLink.lhs
@@ -9,8 +9,6 @@
 Primarily, this module consists of an interface to the C-land dynamic linker.
 
 \begin{code}
-{-# OPTIONS -#include "Linker.h" #-}
-
 module ObjLink ( 
    initObjLinker,       -- :: IO ()
    loadDLL,             -- :: String -> IO (Maybe String)
@@ -21,15 +19,16 @@ module ObjLink (
    resolveObjs          -- :: IO SuccessFlag
   )  where
 
-import Panic           ( panic )
+import Panic
 import BasicTypes      ( SuccessFlag, successIf )
 import Config          ( cLeadingUnderscore )
-import Outputable
 
 import Control.Monad    ( when )
 import Foreign.C
 import Foreign         ( nullPtr )
-import GHC.Exts         ( Ptr(..), unsafeCoerce# )
+import GHC.Exts         ( Ptr(..) )
+
+
 
 -- ---------------------------------------------------------------------------
 -- RTS Linker Interface
@@ -70,13 +69,13 @@ loadObj :: String -> IO ()
 loadObj str = do
    withCString str $ \c_str -> do
      r <- c_loadObj c_str
-     when (r == 0) (panic "loadObj: failed")
+     when (r == 0) (panic ("loadObj " ++ show str ++ ": failed"))
 
 unloadObj :: String -> IO ()
 unloadObj str =
    withCString str $ \c_str -> do
      r <- c_unloadObj c_str
-     when (r == 0) (panic "unloadObj: failed")
+     when (r == 0) (panic ("unloadObj " ++ show str ++ ": failed"))
 
 resolveObjs :: IO SuccessFlag
 resolveObjs = do
@@ -84,7 +83,7 @@ resolveObjs = do
    return (successIf (r /= 0))
 
 -- ---------------------------------------------------------------------------
--- Foreign declaractions to RTS entry points which does the real work;
+-- Foreign declarations to RTS entry points which does the real work;
 -- ---------------------------------------------------------------------------
 
 foreign import ccall unsafe "addDLL"      c_addDLL :: CString -> IO CString
@@ -94,5 +93,4 @@ foreign import ccall unsafe "lookupSymbol" c_lookupSymbol :: CString -> IO (Ptr
 foreign import ccall unsafe "loadObj"      c_loadObj :: CString -> IO Int
 foreign import ccall unsafe "unloadObj"    c_unloadObj :: CString -> IO Int
 foreign import ccall unsafe "resolveObjs"  c_resolveObjs :: IO Int
-
 \end{code}