[commit: ghc] new-typeable: Merge remote-tracking branch 'origin' into new-typeable (1cdb321)
José Pedro Magalhães <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-typeable http://hackage.haskell.org/trac/ghc/changeset/1cdb32132b723e5fff82caadec85aaa7ee029309 >--------------------------------------------------------------- commit 1cdb32132b723e5fff82caadec85aaa7ee029309 Merge: 101334a... 3a82618... Author: Jose Pedro Magalhaes <[email protected]> Date: Mon Nov 26 15:42:58 2012 +0000 Merge remote-tracking branch 'origin' into new-typeable .gitignore | 12 --- .gitmodules | 36 ++++++++ aclocal.m4 | 2 +- compiler/cmm/CmmInfo.hs | 3 +- compiler/cmm/PprC.hs | 2 +- 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/ghc.mk | 3 + compiler/iface/IfaceType.lhs | 2 +- compiler/iface/LoadIface.lhs | 6 +- compiler/iface/MkIface.lhs | 13 ++- compiler/main/DriverPipeline.hs | 4 +- compiler/main/ErrUtils.lhs | 5 +- compiler/main/GHC.hs | 4 +- compiler/prelude/PrimOp.lhs | 15 +++- compiler/prelude/primops.txt.pp | 24 ++++++ compiler/rename/RnNames.lhs | 6 +- compiler/rename/RnTypes.lhs | 15 ++++ compiler/typecheck/TcForeign.lhs | 164 +++++++++++++++++++----------------- compiler/typecheck/TcHsType.lhs | 35 ++++++-- compiler/typecheck/TcRnDriver.lhs | 29 ++++++- compiler/typecheck/TcRnTypes.lhs | 45 +++++++--- compiler/types/Kind.lhs | 61 +++++++++----- compiler/types/Type.lhs | 18 ++++- compiler/utils/Outputable.lhs | 8 +- docs/users_guide/profiling.xml | 18 +++- 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/Linker.c | 4 +- sync-all | 84 ++++++++++++++----- 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 + 60 files changed, 844 insertions(+), 482 deletions(-)