[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (ef786b6)
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/ef786b6cbc5f67a673bf8c10be5311317c1e7b88 >--------------------------------------------------------------- commit ef786b6cbc5f67a673bf8c10be5311317c1e7b88 Merge: 879aae1... cc2a4d5... Author: Ian Lynagh <[email protected]> Date: Tue Oct 9 12:33:00 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/codeGen/CgPrimOp.hs | 35 +++++++++++++++------------- compiler/codeGen/StgCmmPrim.hs | 39 ++++++++++++++++++-------------- compiler/rename/RnNames.lhs | 2 +- includes/Cmm.h | 12 +++++---- rts/HeapStackCheck.cmm | 2 +- rts/StgStdThunks.cmm | 49 ++++++++++++++++++++------------------- rts/Updates.cmm | 8 +++--- rts/Updates.h | 4 +- 8 files changed, 81 insertions(+), 70 deletions(-)