X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FObjLink.lhs;h=ec916164ce590f6dee07d8a228d7f803c931d077;hb=2b8358cfe8b6399874090c099e3b96e932c6ccbb;hp=4047301e02328de2ad4be7b8130cbabc12960ac3;hpb=7fc749a43b4b6b85d234fa95d4928648259584f4;p=ghc-hetmet.git

diff --git a/compiler/ghci/ObjLink.lhs b/compiler/ghci/ObjLink.lhs
index 4047301..ec91616 100644
--- a/compiler/ghci/ObjLink.lhs
+++ b/compiler/ghci/ObjLink.lhs
@@ -9,15 +9,6 @@
 Primarily, this module consists of an interface to the C-land dynamic linker.
 
 \begin{code}
-{-# OPTIONS -#include "Linker.h" #-}
-
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module ObjLink ( 
    initObjLinker,	 -- :: IO ()
    loadDLL,		 -- :: String -> IO (Maybe String)
@@ -28,15 +19,14 @@ 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(..) )
 
 
 
@@ -79,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