[commit: ghc] tc-untouchables: Merge remote-tracking branch 'origin/master' into tc-untouchables (6e3e64a)
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 : tc-untouchables http://hackage.haskell.org/trac/ghc/changeset/6e3e64aeda1add215ffccca87931a60e4f8b53e5 >--------------------------------------------------------------- commit 6e3e64aeda1add215ffccca87931a60e4f8b53e5 Merge: 9a058b1... 42cb30b... Author: Simon Peyton Jones <[email protected]> Date: Fri Sep 28 15:53:45 2012 +0100 Merge remote-tracking branch 'origin/master' into tc-untouchables compiler/basicTypes/Literal.lhs | 7 +- compiler/cmm/CLabel.hs | 22 +- compiler/cmm/CmmBuildInfoTables.hs | 27 +- compiler/cmm/CmmInfo.hs | 7 + compiler/cmm/CmmLayoutStack.hs | 8 +- compiler/cmm/CmmOpt.hs | 269 ------------- compiler/cmm/CmmPipeline.hs | 3 +- compiler/cmm/CmmProcPoint.hs | 35 ++- compiler/cmm/CmmRewriteAssignments.hs | 3 +- compiler/cmm/CmmSink.hs | 25 +- compiler/cmm/CmmType.hs | 23 ++ compiler/cmm/MkGraph.hs | 44 +-- compiler/cmm/OldCmmLint.hs | 4 +- compiler/cmm/PprCmmDecl.hs | 9 +- compiler/codeGen/CgProf.hs | 9 +- compiler/codeGen/CgTicky.hs | 5 +- compiler/codeGen/CodeGen.lhs | 234 ------------ compiler/codeGen/StgCmm.hs | 8 +- compiler/codeGen/StgCmmBind.hs | 3 +- compiler/codeGen/StgCmmExpr.hs | 4 +- compiler/codeGen/StgCmmHeap.hs | 57 ++- compiler/codeGen/StgCmmLayout.hs | 7 +- compiler/codeGen/StgCmmProf.hs | 9 +- compiler/codeGen/StgCmmTicky.hs | 4 +- compiler/codeGen/StgCmmUtils.hs | 7 +- compiler/ghc.cabal.in | 2 - compiler/main/DynFlags.hs | 11 +- compiler/main/HscMain.hs | 54 ++-- compiler/nativeGen/AsmCodeGen.lhs | 85 +++-- compiler/nativeGen/Instruction.hs | 13 + compiler/nativeGen/PPC/Instr.hs | 2 + compiler/nativeGen/RegAlloc/Graph/Stats.hs | 386 ++++++++++---------- compiler/nativeGen/RegAlloc/Linear/Main.hs | 25 +- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 39 +-- compiler/nativeGen/RegAlloc/Liveness.hs | 7 +- compiler/nativeGen/SPARC/Instr.hs | 2 + compiler/nativeGen/X86/CodeGen.hs | 30 +- compiler/nativeGen/X86/Cond.hs | 69 ++-- compiler/nativeGen/X86/Instr.hs | 117 +++++-- compiler/nativeGen/X86/Regs.hs | 6 +- compiler/parser/Lexer.x | 5 - compiler/prelude/PrelRules.lhs | 55 ++-- 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/typecheck/TcRnMonad.lhs | 12 +- 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 | 392 +++++++++++--------- 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 +- 77 files changed, 1356 insertions(+), 1759 deletions(-)