Repository : http://darcs.haskell.org/ghc.git/
On branch : master https://github.com/ghc/ghc/commit/2ea79ab7bc4f24cce25e3b1b1029f177ae1875d1 >--------------------------------------------------------------- commit 2ea79ab7bc4f24cce25e3b1b1029f177ae1875d1 Author: Ian Lynagh <[email protected]> Date: Wed May 22 13:41:09 2013 +0100 Revert "Fix -dynamic-too on Windows" This reverts commit 5734f7afcc2b9acf857f8e0f745185bf01b91148. It didn't fully fix -dynamic-too on Windows >--------------------------------------------------------------- compiler/main/TidyPgm.lhs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/compiler/main/TidyPgm.lhs b/compiler/main/TidyPgm.lhs index 6213663..1c6bb39 100644 --- a/compiler/main/TidyPgm.lhs +++ b/compiler/main/TidyPgm.lhs @@ -1180,20 +1180,7 @@ hasCafRefs dflags this_pkg this_mod p arity expr | otherwise = NoCafRefs where mentions_cafs = isFastTrue (cafRefsE dflags p expr) - is_dynamic_name n = if gopt Opt_BuildDynamicToo dflags - then -- If we're building the dynamic way too, - -- then we need to check whether it's a - -- dynamic name there too. Note that this - -- means that the vanila code is more - -- pessimistic on Windows when -dynamic-too - -- is used, but the alternative is that - -- -dynamic-too is unusable on Windows - -- as even the interfaces in the integer - -- package don't match. - is_dynamic_name' dflags n || - is_dynamic_name' (doDynamicToo dflags) n - else is_dynamic_name' dflags n - is_dynamic_name' dflags' = isDllName dflags' this_pkg this_mod + is_dynamic_name = isDllName dflags this_pkg this_mod is_caf = not (arity > 0 || rhsIsStatic (targetPlatform dflags) is_dynamic_name expr) -- NB. we pass in the arity of the expression, which is expected _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
