[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (b01edb0)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/b01edb03b0b1c61e170eb325e643b77c99042e68 >--------------------------------------------------------------- commit b01edb03b0b1c61e170eb325e643b77c99042e68 Merge: b243d30... 0b3811c... Author: Simon Peyton Jones <[email protected]> Date: Wed Oct 24 19:57:55 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/CmmOpt.hs | 14 +++++++++++++ compiler/cmm/CmmPipeline.hs | 36 +++++++++++++++++++++++++++++++++ compiler/cmm/CmmProcPoint.hs | 43 +++++++++++++++++++++------------------ compiler/cmm/CmmSink.hs | 30 ++++++++++++++++++++------- compiler/cmm/CmmUtils.hs | 2 + compiler/ghci/Linker.lhs | 4 +- compiler/main/DynFlags.hs | 27 +++++++++++++++++------- compiler/parser/Parser.y.pp | 8 ++++++- compiler/prelude/PrelNames.lhs | 13 ++++++++++++ compiler/prelude/PrelRules.lhs | 30 +++++++++++++++++++++++++++ includes/Cmm.h | 3 ++ includes/stg/MiscClosures.h | 6 ++-- rts/PrimOps.cmm | 6 ++-- rts/Profiling.c | 4 ++- rts/Schedule.c | 6 ++-- rules/build-prog.mk | 2 + rules/shell-wrapper.mk | 6 ++-- 17 files changed, 188 insertions(+), 52 deletions(-)