[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (2e43779)
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/2e43779c758294571bdf5ef6f2be440487d8e196 >--------------------------------------------------------------- commit 2e43779c758294571bdf5ef6f2be440487d8e196 Merge: 545bb79... 9f68cce... Author: Simon Peyton Jones <[email protected]> Date: Tue Nov 6 16:26:57 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/Id.lhs | 271 +++++----- compiler/basicTypes/Module.lhs | 8 + compiler/basicTypes/Name.lhs | 227 ++++---- compiler/cmm/CmmParse.y | 6 + compiler/cmm/MkGraph.hs | 8 +- compiler/codeGen/StgCmmForeign.hs | 8 +- compiler/codeGen/StgCmmPrim.hs | 152 +++--- compiler/deSugar/DsForeign.lhs | 9 +- compiler/deSugar/DsMonad.lhs | 3 + compiler/main/DriverMkDepend.hs | 44 +- compiler/main/DynFlags.hs | 17 +- compiler/main/InteractiveEval.hs | 10 +- compiler/nativeGen/NCGMonad.hs | 105 ++-- compiler/nativeGen/X86/CodeGen.hs | 4 +- compiler/rename/RnBinds.lhs | 1 + compiler/rename/RnEnv.lhs | 2 +- compiler/rename/RnExpr.lhs | 1 + compiler/simplCore/CoreMonad.lhs | 8 +- compiler/specialise/SpecConstr.lhs | 1065 +++++++++++++++++------------------ compiler/typecheck/TcBinds.lhs | 1 + compiler/typecheck/TcEnv.lhs | 26 +- compiler/typecheck/TcRnMonad.lhs | 3 - compiler/typecheck/TcRnTypes.lhs | 585 ++++++++++---------- compiler/typecheck/TcTyClsDecls.lhs | 1 + compiler/utils/IOEnv.hs | 5 + compiler/utils/Maybes.lhs | 9 - compiler/utils/UniqFM.lhs | 2 +- docs/users_guide/flags.xml | 6 + docs/users_guide/ghci.xml | 15 +- ghc.mk | 5 + ghc/ghc.mk | 2 +- includes/Rts.h | 6 + includes/mkDerivedConstants.c | 3 + includes/rts/storage/Closures.h | 2 - mk/config.mk.in | 8 +- rts/Exception.cmm | 17 +- rts/HeapStackCheck.cmm | 6 +- rts/PrimOps.cmm | 15 +- rts/STM.c | 15 - rts/STM.h | 8 - rts/StgCRun.c | 2 +- rts/StgMiscClosures.cmm | 2 +- rts/ghc.mk | 2 +- rts/sm/GC.c | 8 +- rules/build-dependencies.mk | 12 +- 45 files changed, 1369 insertions(+), 1346 deletions(-)