[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (958faee)
Ian Lynagh <[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/958faee6f3069c349a2a60a925679249a6dc9475 >--------------------------------------------------------------- commit 958faee6f3069c349a2a60a925679249a6dc9475 Merge: 53e9916... 4270d7e... Author: Ian Lynagh <[email protected]> Date: Tue Nov 13 16:25:36 2012 +0000 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/cmm/CmmCallConv.hs | 6 +++--- compiler/cmm/CmmParse.y | 2 +- compiler/cmm/MkGraph.hs | 32 ++++++++------------------------ compiler/codeGen/StgCmmBind.hs | 21 +++++++++++---------- compiler/codeGen/StgCmmExpr.hs | 4 ++-- compiler/codeGen/StgCmmHeap.hs | 12 ++++-------- compiler/codeGen/StgCmmLayout.hs | 2 +- rts/PrimOps.cmm | 6 +++--- rts/StgStartup.cmm | 9 +++++---- rts/Updates.cmm | 18 +++++++++++++++++- rts/sm/Sanity.c | 13 ++++++++++--- 11 files changed, 65 insertions(+), 60 deletions(-)