Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e26443e75fdf33301df22d6da4911e888bb10282 >--------------------------------------------------------------- commit e26443e75fdf33301df22d6da4911e888bb10282 Merge: fdf98d6... 36f8cab... Author: David Waern <[email protected]> Date: Tue Nov 29 02:09:28 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 72 ++++- compiler/basicTypes/Var.lhs | 5 +- compiler/cmm/PprC.hs | 3 +- compiler/codeGen/CgForeignCall.hs | 191 ++++++------ compiler/codeGen/StgCmmForeign.hs | 167 +++++----- compiler/coreSyn/CoreUtils.lhs | 7 + compiler/deSugar/Desugar.lhs | 8 +- compiler/deSugar/DsForeign.lhs | 79 ++++-- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 1 + compiler/main/DynFlags.hs | 2 + compiler/main/HscMain.hs | 13 +- compiler/main/StaticFlagParser.hs | 1 + compiler/main/StaticFlags.hs | 6 + compiler/parser/Lexer.x | 5 + compiler/parser/Parser.y.pp | 4 + compiler/prelude/ForeignCall.lhs | 17 +- compiler/typecheck/TcCanonical.lhs | 334 ++++++++++--------- compiler/typecheck/TcForeign.lhs | 1 + compiler/typecheck/TcHsSyn.lhs | 70 ++++- compiler/typecheck/TcInteract.lhs | 345 +++++++++++--------- compiler/typecheck/TcRnDriver.lhs | 1 + compiler/typecheck/TcRnMonad.lhs | 2 +- compiler/typecheck/TcRnTypes.lhs | 21 +- compiler/typecheck/TcSMonad.lhs | 188 +++++++---- compiler/typecheck/TcSimplify.lhs | 6 +- compiler/types/Coercion.lhs | 1 + 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 | 4 +- docs/users_guide/glasgow_exts.xml | 6 - docs/users_guide/profiling.xml | 15 +- rules/build-package-way.mk | 2 +- sync-all | 5 + validate | 6 +- 41 files changed, 992 insertions(+), 706 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
