Commit 7f5af24f authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Windows build fix

parent c3f4c6fa
...@@ -22,7 +22,10 @@ import ByteCodeAsm ...@@ -22,7 +22,10 @@ import ByteCodeAsm
import ByteCodeLink import ByteCodeLink
import LibFFI import LibFFI
import Constants
import DynFlags
import Outputable import Outputable
import Platform
import Name import Name
import MkId import MkId
import Id import Id
...@@ -40,7 +43,6 @@ import TyCon ...@@ -40,7 +43,6 @@ import TyCon
import Util import Util
import VarSet import VarSet
import TysPrim import TysPrim
import DynFlags
import ErrUtils import ErrUtils
import Unique import Unique
import FastString import FastString
...@@ -1032,8 +1034,9 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l ...@@ -1032,8 +1034,9 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l
void marshall_code ( StgWord* ptr_to_top_of_stack ) void marshall_code ( StgWord* ptr_to_top_of_stack )
-} -}
-- resolve static address -- resolve static address
get_target_info get_target_info = do
= case target of dflags <- getDynFlags
case target of
DynamicTarget DynamicTarget
-> return (False, panic "ByteCodeGen.generateCCall(dyn)") -> return (False, panic "ByteCodeGen.generateCCall(dyn)")
...@@ -1044,11 +1047,10 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l ...@@ -1044,11 +1047,10 @@ generateCCall d0 s p (CCallSpec target cconv safety) fn args_r_to_l
return (True, res) return (True, res)
where where
stdcall_adj_target stdcall_adj_target
#ifdef mingw32_TARGET_OS | OSMinGW32 <- platformOS (targetPlatform dflags)
| StdCallConv <- cconv , StdCallConv <- cconv
= let size = fromIntegral a_reps_sizeW * wORD_SIZE in = let size = fromIntegral a_reps_sizeW * wORD_SIZE in
mkFastString (unpackFS target ++ '@':show size) mkFastString (unpackFS target ++ '@':show size)
#endif
| otherwise | otherwise
= target = target
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment