Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2686c83118d009f215547e96c6af4bc2f72c43d3 >--------------------------------------------------------------- commit 2686c83118d009f215547e96c6af4bc2f72c43d3 Merge: 01fa3bc... e37893c... Author: Simon Peyton Jones <[email protected]> Date: Mon Nov 14 22:23:19 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/codeGen/CgPrimOp.hs | 2 +- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/deSugar/Coverage.lhs | 3 - compiler/deSugar/DsMonad.lhs | 20 +++--- compiler/iface/LoadIface.lhs | 2 +- compiler/iface/TcIface.lhs | 41 ++++++++--- compiler/iface/TcIface.lhs-boot | 4 +- compiler/simplCore/FloatOut.lhs | 14 +++- compiler/simplCore/Simplify.lhs | 67 ++++++++++-------- compiler/typecheck/TcMType.lhs | 89 +++++++++++------------- compiler/typecheck/TcPat.lhs | 7 +-- compiler/typecheck/TcRules.lhs | 4 - compiler/vectorise/Vectorise/Env.hs | 34 ++++++--- compiler/vectorise/Vectorise/Exp.hs | 10 --- compiler/vectorise/Vectorise/Monad.hs | 3 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 4 +- compiler/vectorise/Vectorise/Type/Classify.hs | 22 +++--- compiler/vectorise/Vectorise/Type/Env.hs | 14 +++- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 33 +++++---- ghc.mk | 11 ++-- mk/validate-settings.mk | 3 +- rts/Exception.cmm | 4 +- rts/Profiling.c | 24 ++++++- rts/Profiling.h | 2 +- rts/RaiseAsync.c | 2 +- 25 files changed, 236 insertions(+), 185 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
