summaryrefslogtreecommitdiff
path: root/compiler/ghci
diff options
context:
space:
mode:
authorBen.Lippmeier@anu.edu.au <unknown>2010-01-04 03:15:06 +0000
committerBen.Lippmeier@anu.edu.au <unknown>2010-01-04 03:15:06 +0000
commit6e9c0431a7cf2bf1a48f01db48c6a1d41fe15a09 (patch)
treeaf2b190722d7f5abd3a1940b4a0e3431bee61a30 /compiler/ghci
parent172b85497dc0da68176fa90c993abd9bcdc6b96f (diff)
downloadhaskell-6e9c0431a7cf2bf1a48f01db48c6a1d41fe15a09.tar.gz
Refactor PackageTarget back into StaticTarget
Diffstat (limited to 'compiler/ghci')
-rw-r--r--compiler/ghci/ByteCodeGen.lhs15
1 files changed, 1 insertions, 14 deletions
diff --git a/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs
index 99e896c024..5d1bd27ca8 100644
--- a/compiler/ghci/ByteCodeGen.lhs
+++ b/compiler/ghci/ByteCodeGen.lhs
@@ -1029,20 +1029,7 @@ generateCCall d0 s p (CCallSpec target cconv _) fn args_r_to_l
DynamicTarget
-> return (False, panic "ByteCodeGen.generateCCall(dyn)")
- PackageTarget target _
- -> do res <- ioToBc (lookupStaticPtr stdcall_adj_target)
- return (True, res)
- where
- stdcall_adj_target
-#ifdef mingw32_TARGET_OS
- | StdCallConv <- cconv
- = let size = fromIntegral a_reps_sizeW * wORD_SIZE in
- mkFastString (unpackFS target ++ '@':show size)
-#endif
- | otherwise
- = target
-
- StaticTarget target
+ StaticTarget target _
-> do res <- ioToBc (lookupStaticPtr stdcall_adj_target)
return (True, res)
where