[commit: ghc] cardinality: Merge remote-tracking branch 'origin/master' into cardinality (0d6b726)
Simon Peyton Jones
simonpj at microsoft.com
Fri Feb 15 17:54:32 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : cardinality
http://hackage.haskell.org/trac/ghc/changeset/0d6b726fbd67af84bb462de31a15bc8728818784
>---------------------------------------------------------------
commit 0d6b726fbd67af84bb462de31a15bc8728818784
Merge: 0f1d940... 536ee09...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Feb 15 13:05:30 2013 +0000
Merge remote-tracking branch 'origin/master' into cardinality
.gitignore | 1 -
.gitmodules | 3 +
README | 104 --
README.md | 100 ++
aclocal.m4 | 92 ++-
compiler/basicTypes/IdInfo.lhs | 2 +-
compiler/basicTypes/Name.lhs | 24 +-
compiler/basicTypes/RdrName.lhs | 6 +-
compiler/cmm/CmmCallConv.hs | 9 +-
compiler/cmm/CmmCommonBlockElim.hs | 1 +
compiler/cmm/CmmExpr.hs | 17 +
compiler/cmm/CmmLex.x | 3 +
compiler/cmm/CmmMachOp.hs | 69 ++
compiler/cmm/CmmParse.y | 2 +
compiler/cmm/CmmType.hs | 86 ++-
compiler/cmm/CmmUtils.hs | 65 +-
compiler/cmm/PprC.hs | 68 ++
compiler/cmm/PprCmmExpr.hs | 2 +
compiler/codeGen/CgUtils.hs | 7 +
compiler/codeGen/StgCmmCon.hs | 2 +-
compiler/codeGen/StgCmmLayout.hs | 64 +-
compiler/codeGen/StgCmmPrim.hs | 643 ++++++++---
compiler/coreSyn/CoreFVs.lhs | 11 +-
compiler/coreSyn/CoreSubst.lhs | 13 +-
compiler/coreSyn/CoreSyn.lhs | 4 +-
compiler/coreSyn/CoreUtils.lhs | 6 +-
compiler/coreSyn/PprCore.lhs | 32 +-
compiler/coreSyn/PprExternalCore.lhs | 5 -
compiler/coreSyn/TrieMap.lhs | 38 +-
compiler/deSugar/Check.lhs | 20 +-
compiler/deSugar/Coverage.lhs | 16 +-
compiler/deSugar/Desugar.lhs | 2 +-
compiler/deSugar/DsArrows.lhs | 2 +-
compiler/deSugar/DsExpr.lhs | 42 +-
compiler/deSugar/DsListComp.lhs | 2 +-
compiler/deSugar/DsMeta.hs | 13 +-
compiler/deSugar/Match.lhs | 73 +-
compiler/ghc.cabal.in | 1 +
compiler/ghci/ByteCodeAsm.lhs | 26 +-
compiler/ghci/ByteCodeItbls.lhs | 2 +-
compiler/ghci/ByteCodeLink.lhs | 2 +-
compiler/ghci/LibFFI.hsc | 4 +-
compiler/ghci/Linker.lhs | 26 +-
compiler/hsSyn/Convert.lhs | 14 +-
compiler/hsSyn/HsDecls.lhs | 13 +-
compiler/hsSyn/HsExpr.lhs | 12 +-
compiler/hsSyn/HsExpr.lhs-boot | 19 +-
compiler/hsSyn/HsPat.lhs | 12 +-
compiler/hsSyn/HsPat.lhs-boot | 8 +-
compiler/hsSyn/HsTypes.lhs | 2 +-
compiler/hsSyn/HsUtils.lhs | 6 +-
compiler/iface/BinIface.hs | 2 +-
compiler/iface/LoadIface.lhs | 16 +-
compiler/iface/MkIface.lhs | 20 +-
compiler/iface/TcIface.lhs | 35 +-
compiler/llvmGen/Llvm.hs | 2 +-
compiler/llvmGen/Llvm/AbsSyn.hs | 15 +
compiler/llvmGen/Llvm/PpLlvm.hs | 39 +-
compiler/llvmGen/Llvm/Types.hs | 67 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 14 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 183 +++-
compiler/llvmGen/LlvmCodeGen/Data.hs | 8 +
compiler/llvmGen/LlvmCodeGen/Regs.hs | 7 +
compiler/main/DriverMkDepend.hs | 6 +-
compiler/main/DriverPipeline.hs | 19 +-
compiler/main/DynFlags.hs | 33 +-
compiler/main/DynamicLoading.hs | 4 +-
compiler/main/ErrUtils.lhs | 3 +-
compiler/main/GHC.hs | 16 +-
compiler/main/GhcMake.hs | 2 +-
compiler/main/HscTypes.lhs | 56 +-
compiler/main/InteractiveEval.hs | 17 +-
compiler/main/PlatformConstants.hs | 12 +
compiler/main/StaticFlags.hs | 4 +-
compiler/main/SysTools.lhs | 10 +-
compiler/main/TidyPgm.lhs | 25 +-
compiler/nativeGen/AsmCodeGen.lhs | 47 +-
compiler/nativeGen/PPC/CodeGen.hs | 1 +
compiler/nativeGen/PPC/Instr.hs | 164 ++-
compiler/nativeGen/SPARC/CodeGen.hs | 1 +
compiler/nativeGen/X86/CodeGen.hs | 63 +-
compiler/nativeGen/X86/Instr.hs | 6 +-
compiler/parser/Parser.y.pp | 45 +-
compiler/parser/RdrHsSyn.lhs | 117 +-
compiler/prelude/PrelNames.lhs | 106 ++-
compiler/prelude/PrelNames.lhs-boot | 3 +-
compiler/prelude/TysPrim.lhs | 47 +-
compiler/prelude/TysWiredIn.lhs | 2 +-
compiler/prelude/primops.txt.pp | 494 ++++++++
compiler/rename/RnEnv.lhs | 18 +-
compiler/rename/RnExpr.lhs | 45 +-
compiler/rename/RnPat.lhs | 21 +-
compiler/rename/RnSource.lhs | 10 +-
compiler/simplCore/OccurAnal.lhs | 12 +-
compiler/simplCore/SimplCore.lhs | 34 +-
compiler/specialise/SpecConstr.lhs | 138 ++--
compiler/specialise/Specialise.lhs | 396 ++++---
compiler/stgSyn/StgSyn.lhs | 4 +-
compiler/stranal/WwLib.lhs | 2 +-
compiler/typecheck/TcBinds.lhs | 9 +-
compiler/typecheck/TcDeriv.lhs | 94 ++-
compiler/typecheck/TcErrors.lhs | 2 +-
compiler/typecheck/TcExpr.lhs | 111 ++-
compiler/typecheck/TcGenDeriv.lhs | 179 ++--
compiler/typecheck/TcGenGenerics.lhs | 7 +-
compiler/typecheck/TcHsSyn.lhs | 32 +-
compiler/typecheck/TcHsType.lhs | 2 +-
compiler/typecheck/TcInstDcls.lhs | 284 ++----
compiler/typecheck/TcPat.lhs | 14 +-
compiler/typecheck/TcRnDriver.lhs | 5 +-
compiler/typecheck/TcRnTypes.lhs | 2 +
compiler/typecheck/TcSimplify.lhs | 4 +-
compiler/typecheck/TcTyClsDecls.lhs | 69 +-
compiler/typecheck/TcUnify.lhs | 2 +-
compiler/typecheck/TcValidity.lhs | 156 +++-
compiler/types/Coercion.lhs | 5 +-
compiler/types/FamInstEnv.lhs | 5 +-
compiler/types/InstEnv.lhs | 2 +-
compiler/types/TyCon.lhs | 52 +-
compiler/types/TypeRep.lhs | 48 +-
compiler/utils/Exception.hs | 5 +-
compiler/utils/Outputable.lhs | 4 +-
compiler/vectorise/Vectorise.hs | 397 +++----
compiler/vectorise/Vectorise/Builtins/Base.hs | 3 +-
.../vectorise/Vectorise/Builtins/Initialise.hs | 8 +-
compiler/vectorise/Vectorise/Convert.hs | 22 +-
compiler/vectorise/Vectorise/Env.hs | 121 +-
compiler/vectorise/Vectorise/Exp.hs | 1228 +++++++++++---------
compiler/vectorise/Vectorise/Monad.hs | 29 +-
compiler/vectorise/Vectorise/Monad/Global.hs | 73 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 13 +-
compiler/vectorise/Vectorise/Monad/Local.hs | 117 +-
compiler/vectorise/Vectorise/Type/Classify.hs | 51 +-
compiler/vectorise/Vectorise/Type/Env.hs | 220 ++--
compiler/vectorise/Vectorise/Type/Type.hs | 13 +-
compiler/vectorise/Vectorise/Utils.hs | 25 +-
configure.ac | 37 +-
docs/users_guide/7.6.1-notes.xml | 427 -------
docs/users_guide/7.8.1-notes.xml | 33 +
docs/users_guide/flags.xml | 21 +
docs/users_guide/glasgow_exts.xml | 218 ++++-
docs/users_guide/parallel.xml | 2 +-
docs/users_guide/phases.xml | 15 +
docs/users_guide/safe_haskell.xml | 4 +-
docs/users_guide/ug-ent.xml.in | 2 +-
docs/users_guide/using.xml | 46 +-
ghc.mk | 1 +
ghc/InteractiveUI.hs | 2 +-
includes/Cmm.h | 7 +-
includes/CodeGen.Platform.hs | 27 +
includes/HsFFI.h | 4 +
includes/Rts.h | 2 +-
includes/rts/Globals.h | 2 +
includes/rts/Stable.h | 15 +-
includes/rts/storage/FunTypes.h | 35 +-
includes/rts/storage/GC.h | 2 +-
includes/stg/MachRegs.h | 24 +-
includes/stg/MiscClosures.h | 4 +-
includes/stg/Regs.h | 42 +
includes/stg/Types.h | 2 +
.../Distribution/InstalledPackageInfo/Binary.hs | 2 +-
libraries/containers | 2 +-
libraries/random | 1 +
libraries/time | 2 +-
libraries/vector | 2 +-
mk/config.mk.in | 6 +-
mk/custom-settings.mk | 2 +-
packages | 4 +-
rts/Globals.c | 14 +
rts/Hash.c | 5 +
rts/Hash.h | 3 +-
rts/HsFFI.c | 18 +
rts/Linker.c | 9 +
rts/Prelude.h | 1 +
rts/PrimOps.cmm | 20 +-
rts/RetainerProfile.c | 2 +-
rts/RtsStartup.c | 4 +-
rts/Schedule.c | 7 +
rts/Stable.c | 624 ++++++-----
rts/Stable.h | 29 +-
rts/Stats.c | 71 +-
rts/Stats.h | 4 +-
rts/ghc.mk | 2 +-
rts/package.conf.in | 2 +
rts/posix/OSMem.c | 2 +-
rts/sm/Compact.c | 2 +-
rts/sm/GC.c | 45 +-
rts/sm/GCAux.c | 8 +
rts/sm/GCThread.h | 1 -
rts/sm/Storage.c | 30 +-
rts/sm/Storage.h | 4 +-
rts/win32/AsyncIO.c | 6 +-
rts/win32/AsyncIO.h | 2 +-
rts/win32/IOManager.c | 42 +-
rts/win32/IOManager.h | 4 +-
ghc/Makefile => rules/add-dependency.mk | 9 +-
rules/build-prog.mk | 8 +
sync-all | 2 +-
utils/deriveConstants/DeriveConstants.hs | 9 +
utils/genapply/GenApply.hs | 66 +-
utils/genprimopcode/Main.hs | 35 +-
utils/ghc-cabal/ghc.mk | 3 +-
utils/ghc-pkg/ghc.mk | 48 +-
utils/ghctags/Main.hs | 2 +-
utils/hp2ps/ghc.mk | 2 +-
205 files changed, 6043 insertions(+), 3697 deletions(-)
More information about the ghc-commits
mailing list