Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-new-co
http://hackage.haskell.org/trac/ghc/changeset/39bb1bd24f56d1abd9961813d9cd94b61c9d4c78 >--------------------------------------------------------------- commit 39bb1bd24f56d1abd9961813d9cd94b61c9d4c78 Merge: fdf8656... 44fbccd... Author: Simon Peyton Jones <[email protected]> Date: Wed Apr 20 11:32:05 2011 +0100 Merge branch 'master' into ghc-new-co HACKING | 7 +- aclocal.m4 | 10 +- boot | 39 ++++++ compiler/cmm/Cmm.hs | 21 ++- compiler/cmm/CmmExpr.hs | 6 +- compiler/cmm/CmmLint.hs | 15 +- compiler/cmm/MkGraph.hs | 2 +- compiler/cmm/OptimizationFuel.hs | 14 -- compiler/codeGen/CodeGen.lhs | 2 +- compiler/codeGen/StgCmm.hs | 3 +- compiler/main/DriverPipeline.hs | 66 +++++----- compiler/main/DynFlags.hs | 10 +- compiler/utils/GraphOps.hs | 15 +- compiler/utils/UniqFM.lhs | 23 +++- docs/users_guide/flags.xml | 7 + docs/users_guide/glasgow_exts.xml | 2 +- docs/users_guide/using.xml | 14 ++ ghc.mk | 1 + rts/Hash.c | 67 +++++----- rts/Linker.c | 18 ++- rts/Stats.c | 23 +++- rts/ghc.mk | 3 +- rts/sm/GC.c | 13 +- rts/sm/Sanity.c | 4 + rts/sm/Storage.c | 25 +++- rules/build-package.mk | 16 +-- rules/build-prog.mk | 16 +-- rules/dependencies.mk | 38 ++++++ sync-all | 254 +++++++++++++++++++------------------ utils/ghc-cabal/Main.hs | 3 +- validate | 2 +- 31 files changed, 437 insertions(+), 302 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
