Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b41a351025f0a6e96676891415c409060050e7e8 >--------------------------------------------------------------- commit b41a351025f0a6e96676891415c409060050e7e8 Merge: ac11b1f... 1f7433b... Author: Simon Peyton Jones <[email protected]> Date: Tue Nov 29 15:50:12 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 72 ++++- compiler/basicTypes/Var.lhs | 5 +- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmExpr.hs | 6 +- compiler/cmm/CmmLex.x | 5 +- compiler/cmm/CmmLint.hs | 2 +- compiler/cmm/CmmOpt.hs | 6 +- compiler/cmm/CmmParse.y | 8 +- compiler/cmm/OldCmm.hs | 3 +- compiler/cmm/OldPprCmm.hs | 7 +- compiler/cmm/PprC.hs | 23 +- compiler/cmm/PprCmmExpr.hs | 1 + compiler/codeGen/CgCase.lhs | 2 +- compiler/codeGen/CgClosure.lhs | 11 +- compiler/codeGen/CgForeignCall.hs | 197 ++++++------ compiler/codeGen/CgPrimOp.hs | 2 + compiler/codeGen/CgProf.hs | 23 +- compiler/codeGen/CgUtils.hs | 33 +- compiler/codeGen/StgCmmForeign.hs | 169 +++++----- compiler/codeGen/StgCmmPrim.hs | 3 + compiler/codeGen/StgCmmProf.hs | 15 +- compiler/codeGen/StgCmmUtils.hs | 8 +- compiler/coreSyn/CoreUtils.lhs | 7 + compiler/deSugar/Desugar.lhs | 8 +- compiler/deSugar/DsForeign.lhs | 79 ++++-- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 3 +- compiler/main/DynFlags.hs | 2 + compiler/main/HscMain.hs | 13 +- compiler/main/StaticFlagParser.hs | 1 + compiler/main/StaticFlags.hs | 6 + compiler/nativeGen/AsmCodeGen.lhs | 4 +- compiler/nativeGen/PPC/CodeGen.hs | 2 +- compiler/nativeGen/SPARC/CodeGen.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 4 +- compiler/parser/Lexer.x | 29 +- compiler/parser/Parser.y.pp | 4 + compiler/prelude/ForeignCall.lhs | 17 +- compiler/prelude/primops.txt.pp | 3 + compiler/typecheck/TcCanonical.lhs | 347 +++++++++++--------- compiler/typecheck/TcForeign.lhs | 1 + compiler/typecheck/TcGenGenerics.lhs | 5 +- compiler/typecheck/TcHsSyn.lhs | 74 ++++- compiler/typecheck/TcHsType.lhs | 121 ++++--- compiler/typecheck/TcInteract.lhs | 344 +++++++++++--------- compiler/typecheck/TcMType.lhs | 24 +- compiler/typecheck/TcRnDriver.lhs | 1 + compiler/typecheck/TcRnMonad.lhs | 2 +- compiler/typecheck/TcRnTypes.lhs | 43 ++- compiler/typecheck/TcSMonad.lhs | 196 ++++++++---- compiler/typecheck/TcSimplify.lhs | 24 +- compiler/types/Coercion.lhs | 1 + compiler/types/Kind.lhs | 12 +- compiler/types/Type.lhs | 8 +- compiler/utils/UniqFM.lhs | 13 +- compiler/vectorise/Vectorise/Builtins.hs | 3 +- compiler/vectorise/Vectorise/Builtins/Base.hs | 8 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 30 +-- compiler/vectorise/Vectorise/Env.hs | 7 - compiler/vectorise/Vectorise/Monad.hs | 2 - compiler/vectorise/Vectorise/Monad/Global.hs | 41 +++- configure.ac | 3 + distrib/configure.ac.in | 3 + docs/users_guide/flags.xml | 11 +- docs/users_guide/glasgow_exts.xml | 249 +++++++++++++- docs/users_guide/profiling.xml | 59 +++- ghc/ghc.mk | 7 +- ghc/hschooks.c | 4 + includes/Cmm.h | 2 +- includes/Rts.h | 30 ++ includes/RtsAPI.h | 9 + includes/mkDerivedConstants.c | 1 + includes/rts/Flags.h | 21 +- includes/rts/prof/CCS.h | 7 +- includes/rts/storage/TSO.h | 6 + includes/stg/MiscClosures.h | 1 - includes/stg/Regs.h | 1 + rts/Apply.cmm | 2 +- rts/AutoApply.h | 12 +- rts/Capability.c | 24 ++- rts/Exception.cmm | 4 +- rts/GetTime.h | 14 +- rts/HeapStackCheck.cmm | 13 +- rts/Interpreter.c | 4 +- rts/PrimOps.cmm | 53 ++-- rts/ProfHeap.c | 3 +- rts/ProfHeap.h | 4 +- rts/Profiling.c | 136 +++++--- rts/Proftimer.c | 12 +- rts/RetainerProfile.h | 3 + rts/RtsFlags.c | 82 ++--- rts/Schedule.c | 6 +- rts/Stats.c | 162 +++++----- rts/Stats.h | 6 +- rts/StgMiscClosures.cmm | 2 +- rts/StgStdThunks.cmm | 4 +- rts/Task.c | 6 +- rts/Task.h | 14 +- rts/Threads.c | 12 +- rts/Ticker.h | 2 +- rts/eventlog/EventLog.c | 2 +- rts/posix/GetTime.c | 38 +-- rts/posix/Itimer.c | 122 +++----- rts/posix/Itimer.h | 2 - rts/posix/Select.c | 39 ++- rts/posix/Select.h | 8 +- rts/sm/GC.c | 18 +- rts/sm/GCThread.h | 6 +- rts/sm/Storage.c | 4 +- rts/win32/GetTime.c | 31 +- rts/win32/Ticker.c | 178 +++-------- rules/build-package-way.mk | 2 +- rules/build-prog.mk | 4 + sync-all | 5 + utils/genapply/GenApply.hs | 2 +- validate | 6 +- 115 files changed, 2097 insertions(+), 1458 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
