[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (723a2bc)
Iavor Diatchki <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats http://hackage.haskell.org/trac/ghc/changeset/723a2bc697c3ae06a3391a08a7d1b51c68fe581b >--------------------------------------------------------------- commit 723a2bc697c3ae06a3391a08a7d1b51c68fe581b Merge: 6be7783... 42cb30b... Author: Iavor S. Diatchki <[email protected]> Date: Sat Sep 29 13:56:39 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats compiler/cmm/CLabel.hs | 22 +- compiler/cmm/CmmBuildInfoTables.hs | 27 +- compiler/cmm/CmmInfo.hs | 7 + compiler/cmm/CmmLayoutStack.hs | 6 +- compiler/cmm/CmmOpt.hs | 269 ------------------ compiler/cmm/CmmRewriteAssignments.hs | 3 +- compiler/cmm/CmmSink.hs | 25 ++- compiler/codeGen/CodeGen.lhs | 234 ---------------- compiler/codeGen/StgCmm.hs | 8 +- compiler/codeGen/StgCmmExpr.hs | 4 +- compiler/codeGen/StgCmmHeap.hs | 57 +++-- compiler/codeGen/StgCmmUtils.hs | 7 +- compiler/ghc.cabal.in | 2 - compiler/main/DynFlags.hs | 6 +- compiler/main/HscMain.hs | 54 +++-- compiler/nativeGen/AsmCodeGen.lhs | 15 +- compiler/nativeGen/X86/CodeGen.hs | 30 ++- compiler/nativeGen/X86/Cond.hs | 69 +++-- compiler/parser/Lexer.x | 5 - compiler/rename/RnEnv.lhs | 21 +- compiler/rename/RnPat.lhs | 2 +- compiler/rename/RnSource.lhs | 479 ++++++++++++++++----------------- compiler/simplStg/SRT.lhs | 166 ------------ compiler/simplStg/SimplStg.lhs | 13 +- compiler/stgSyn/StgSyn.lhs | 12 +- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/utils/Bag.lhs | 1 + compiler/utils/Serialized.hs | 10 + docs/users_guide/glasgow_exts.xml | 5 +- docs/users_guide/using.xml | 18 ++ ghc.mk | 3 +- ghc/ghc.mk | 2 +- includes/mkDerivedConstants.c | 348 +++++++++++++----------- includes/rts/Flags.h | 1 + includes/rts/storage/ClosureMacros.h | 35 ++- includes/rts/storage/GC.h | 1 + mk/validate-settings.mk | 6 + rts/Interpreter.c | 2 +- rts/Printer.c | 6 +- rts/RtsFlags.c | 15 +- rts/Schedule.c | 16 +- rts/Schedule.h | 28 ++- rts/Timer.c | 27 +- rts/posix/Select.c | 15 +- rts/sm/BlockAlloc.c | 8 +- rts/sm/Evac.c | 14 +- rts/sm/GC.c | 7 +- rts/sm/GCAux.c | 2 +- rts/sm/Storage.c | 20 +- rules/build-prog.mk | 10 +- rules/shell-wrapper.mk | 19 +- utils/ghc-pkg/ghc.mk | 2 +- utils/runghc/ghc.mk | 2 +- 53 files changed, 810 insertions(+), 1358 deletions(-)