Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-constraint-solver
http://hackage.haskell.org/trac/ghc/changeset/7ec5404a3fd277251a1ab353aa398adfc02b6d34 >--------------------------------------------------------------- commit 7ec5404a3fd277251a1ab353aa398adfc02b6d34 Merge: db89257... 1bbb89f... Author: Dimitrios Vytiniotis <[email protected]> Date: Wed Nov 16 15:28:43 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-constraint-solver compiler/basicTypes/Literal.lhs | 6 +- compiler/coreSyn/CoreArity.lhs | 193 +++++++++++++++++++++++----------- compiler/coreSyn/CoreLint.lhs | 13 +-- compiler/coreSyn/CoreSyn.lhs | 30 +++++- compiler/coreSyn/CoreUnfold.lhs | 106 +++++++++++-------- compiler/coreSyn/CoreUtils.lhs | 84 ++++++++------- compiler/deSugar/DsUtils.lhs | 8 +- compiler/main/DriverPipeline.hs | 61 ++++++----- compiler/main/DynFlags.hs | 2 + compiler/prelude/PrelRules.lhs | 3 + compiler/simplCore/SimplCore.lhs | 9 +- compiler/simplCore/SimplUtils.lhs | 69 ++++--------- compiler/simplCore/Simplify.lhs | 10 ++- compiler/specialise/SpecConstr.lhs | 4 +- compiler/typecheck/TcGenDeriv.lhs | 27 +++-- docs/users_guide/flags.xml | 9 ++ docs/users_guide/glasgow_exts.xml | 15 ++- docs/users_guide/using.xml | 14 +++ includes/Rts.h | 1 + includes/RtsAPI.h | 46 ++++++++- includes/RtsOpts.h | 20 ---- rts/RtsMain.h => includes/rts/Main.h | 4 +- mk/validate-settings.mk | 6 +- rts/Main.c | 24 ---- rts/RtsFlags.c | 26 +++-- rts/RtsFlags.h | 4 +- rts/RtsMain.c | 17 ++-- rts/RtsStartup.c | 14 +++- rts/ThreadPaused.c | 132 +++++++++++++----------- rts/ghc.mk | 13 +-- rts/hooks/RtsOpts.c | 14 --- validate | 85 +++++++++------ 32 files changed, 621 insertions(+), 448 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
