[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (f5e5316)
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/f5e531652ae8fce2916db895549c1baeaed9fc61 >--------------------------------------------------------------- commit f5e531652ae8fce2916db895549c1baeaed9fc61 Merge: 699f8e1... 3862220... Author: Ian Lynagh <[email protected]> Date: Thu Nov 8 12:18:08 2012 +0000 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/basicTypes/DataCon.lhs | 2 +- compiler/cmm/CmmParse.y | 6 +++ compiler/cmm/MkGraph.hs | 8 +---- compiler/codeGen/StgCmmForeign.hs | 8 ++++- compiler/ghci/RtClosureInspect.hs | 39 +++++++++++++++++++--- compiler/typecheck/TcInteract.lhs | 67 +++++++++++++++++++++--------------- compiler/typecheck/TcRnTypes.lhs | 2 +- compiler/typecheck/TcSMonad.lhs | 66 ++++++++++++++++++++---------------- docs/users_guide/ghci.xml | 2 +- includes/mkDerivedConstants.c | 3 ++ rts/Exception.cmm | 17 +++++++-- rts/PrimOps.cmm | 11 +++++- rts/STM.c | 15 -------- rts/STM.h | 8 ---- utils/ghc-pkg/Main.hs | 2 +- 15 files changed, 153 insertions(+), 103 deletions(-)