Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master
http://hackage.haskell.org/trac/ghc/changeset/945c24bdb015c2373cadf0a902af62102509e9aa >--------------------------------------------------------------- commit 945c24bdb015c2373cadf0a902af62102509e9aa Author: Paolo Capriotti <[email protected]> Date: Tue Apr 24 11:35:35 2012 +0100 Remove hardcoded mangling of the n_capability symbol (#5864) This was breaking cross-module inlining, since the symbol ended up being mangled twice, if the call happened to be inlined into another module. >--------------------------------------------------------------- GHC/Conc/Sync.lhs | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/GHC/Conc/Sync.lhs b/GHC/Conc/Sync.lhs index 928fbf1..af2521d 100644 --- a/GHC/Conc/Sync.lhs +++ b/GHC/Conc/Sync.lhs @@ -319,11 +319,8 @@ foreign import ccall unsafe "getNumberOfProcessors" numSparks :: IO Int numSparks = IO $ \s -> case numSparks# s of (# s', n #) -> (# s', I# n #) -#if defined(mingw32_HOST_OS) && defined(__PIC__) -foreign import ccall "_imp__n_capabilities" n_capabilities :: Ptr CInt -#else foreign import ccall "&n_capabilities" n_capabilities :: Ptr CInt -#endif + childHandler :: SomeException -> IO () childHandler err = catchException (real_handler err) childHandler _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
