Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/69605562f4961fb38939a0b729d650953e46e041 >--------------------------------------------------------------- commit 69605562f4961fb38939a0b729d650953e46e041 Merge: 661c1c1... f73d60b... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Mon Nov 26 12:18:54 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc .gitignore | 12 -- .gitmodules | 36 +++++++ aclocal.m4 | 2 +- compiler/cmm/CmmInfo.hs | 3 +- compiler/cmm/PprC.hs | 8 +- compiler/cmm/SMRep.lhs | 11 ++- compiler/codeGen/StgCmm.hs | 13 ++- compiler/codeGen/StgCmmBind.hs | 40 ++++++-- compiler/codeGen/StgCmmClosure.hs | 8 ++ compiler/codeGen/StgCmmHeap.hs | 6 +- compiler/coreSyn/CoreSyn.lhs | 2 +- compiler/ghc.mk | 3 + compiler/iface/LoadIface.lhs | 6 +- compiler/iface/MkIface.lhs | 13 ++- compiler/main/DriverPipeline.hs | 4 +- compiler/main/GHC.hs | 4 +- compiler/prelude/PrimOp.lhs | 15 +++- compiler/prelude/primops.txt.pp | 24 +++++ compiler/typecheck/TcHsType.lhs | 5 +- compiler/typecheck/TcInstDcls.lhs | 8 +- compiler/typecheck/TcRnTypes.lhs | 7 +- compiler/utils/Outputable.lhs | 8 +- docs/users_guide/flags.xml | 6 + docs/users_guide/glasgow_exts.xml | 161 +++++++++++++++++++++++++----- docs/users_guide/profiling.xml | 18 +++- includes/rts/storage/ClosureTypes.h | 37 ++++---- includes/stg/MiscClosures.h | 3 +- libraries/Cabal | 1 + libraries/Win32 | 1 + libraries/binary | 1 + libraries/bytestring | 1 + libraries/containers | 1 + libraries/haskeline | 1 + libraries/pretty | 1 + libraries/primitive | 1 + libraries/terminfo | 1 + libraries/transformers | 1 + libraries/vector | 1 + libraries/xhtml | 1 + mk/config.mk.in | 28 +++-- mk/validate-settings.mk | 15 ++- rts/ClosureFlags.c | 5 +- rts/Exception.cmm | 2 +- rts/LdvProfile.c | 1 + rts/Linker.c | 7 +- rts/PrimOps.cmm | 2 +- rts/Printer.c | 14 +++ rts/ProfHeap.c | 3 +- rts/RetainerProfile.c | 5 +- rts/STM.c | 63 +++++++----- rts/STM.h | 2 +- rts/Schedule.c | 2 +- rts/StgMiscClosures.cmm | 7 +- rts/sm/Compact.c | 1 + rts/sm/Evac.c | 12 +-- rts/sm/GC.c | 22 ++++- rts/sm/GC.h | 8 ++- rts/sm/Sanity.c | 3 +- rts/sm/Scav.c | 73 +++++++++++++- rts/sm/Storage.c | 9 ++ rts/sm/Storage.h | 3 +- rules/build-package-way.mk | 11 -- sync-all | 84 +++++++++++---- utils/deriveConstants/DeriveConstants.hs | 14 +-- utils/genprimopcode/Lexer.x | 5 + utils/genprimopcode/Main.hs | 29 +++++- utils/genprimopcode/Parser.y | 13 +++ utils/genprimopcode/ParserM.hs | 5 + utils/genprimopcode/Syntax.hs | 9 ++ utils/hpc/HpcCombine.hs | 116 +++++++++++----------- utils/hpc/HpcDraft.hs | 31 +++--- utils/hpc/HpcFlags.hs | 140 ++++++++++++++------------ utils/hpc/HpcLexer.hs | 6 +- utils/hpc/HpcMarkup.hs | 1 + utils/hpc/HpcOverlay.hs | 41 ++++---- utils/hpc/HpcReport.hs | 41 ++++---- utils/hpc/HpcShowTix.hs | 23 ++-- utils/hpc/Main.hs | 114 +++++++++++---------- utils/hpc/hpc-bin.cabal | 1 + 79 files changed, 972 insertions(+), 474 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
