[commit: ghc] master: Remove an ifdef from ghci/ByteCodeAsm.lhs (b10b2c1)
Ian Lynagh
igloo at earth.li
Sun May 1 18:55:34 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b10b2c17bad2da6b325fdf5d85a5fa17dbb5e1cc
>---------------------------------------------------------------
commit b10b2c17bad2da6b325fdf5d85a5fa17dbb5e1cc
Author: Ian Lynagh <igloo at earth.li>
Date: Sun May 1 16:34:51 2011 +0100
Remove an ifdef from ghci/ByteCodeAsm.lhs
>---------------------------------------------------------------
compiler/ghci/ByteCodeAsm.lhs | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs
index dfc77e5..e3c57b5 100644
--- a/compiler/ghci/ByteCodeAsm.lhs
+++ b/compiler/ghci/ByteCodeAsm.lhs
@@ -395,12 +395,11 @@ mkBits findLabel st proto_insns
= do st_l1 <- addToSS st_l0 (BCONPtrItbl (getName dcon))
return (sizeSS16 st_l0, (st_i0,st_l1,st_p0))
-#ifdef mingw32_TARGET_OS
literal st (MachLabel fs (Just sz) _)
+ | cTargetOS == Windows
= litlabel st (appendFS fs (mkFastString ('@':show sz)))
-- On Windows, stdcall labels have a suffix indicating the no. of
-- arg words, e.g. foo at 8. testcase: ffi012(ghci)
-#endif
literal st (MachLabel fs _ _) = litlabel st fs
literal st (MachWord w) = int st (fromIntegral w)
literal st (MachInt j) = int st (fromIntegral j)
More information about the Cvs-ghc
mailing list