[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (24ffa31)
Simon Peyton Jones
simonpj at microsoft.com
Fri Apr 19 11:26:37 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
https://github.com/ghc/ghc/commit/24ffa317d2c34698fabe9d55387eb1b67c52bd0a
>---------------------------------------------------------------
commit 24ffa317d2c34698fabe9d55387eb1b67c52bd0a
Merge: da65172 87baa31
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Apr 19 10:22:49 2013 +0100
Merge branch 'master' of http://darcs.haskell.org/ghc
README.md | 7 +-
aclocal.m4 | 45 +-
boot | 2 +-
compiler/HsVersions.h | 10 -
compiler/basicTypes/Demand.lhs | 29 +-
compiler/cmm/Bitmap.hs | 15 +-
compiler/cmm/CLabel.hs | 51 +-
compiler/cmm/Cmm.hs | 1 -
compiler/cmm/CmmBuildInfoTables.hs | 8 +-
compiler/cmm/CmmCallConv.hs | 8 +-
compiler/cmm/CmmCommonBlockElim.hs | 5 -
compiler/cmm/CmmContFlowOpt.hs | 3 +-
compiler/cmm/CmmNode.hs | 51 +-
compiler/cmm/CmmPipeline.hs | 16 +-
compiler/cmm/CmmProcPoint.hs | 1 -
compiler/cmm/CmmRewriteAssignments.hs | 3 -
compiler/cmm/CmmType.hs | 6 +
compiler/cmm/CmmUtils.hs | 15 +-
compiler/codeGen/StgCmmArgRep.hs | 135 +
compiler/codeGen/StgCmmBind.hs | 43 +-
compiler/codeGen/StgCmmClosure.hs | 5 +-
compiler/codeGen/StgCmmEnv.hs | 139 +-
compiler/codeGen/StgCmmExpr.hs | 10 +-
compiler/codeGen/StgCmmForeign.hs | 53 +-
compiler/codeGen/StgCmmHeap.hs | 91 +-
compiler/codeGen/StgCmmLayout.hs | 84 +-
compiler/codeGen/StgCmmMonad.hs | 330 +-
compiler/codeGen/StgCmmPrim.hs | 2 +-
compiler/codeGen/StgCmmTicky.hs | 664 ++-
compiler/codeGen/StgCmmUtils.hs | 9 +-
compiler/coreSyn/CorePrep.lhs | 74 +-
compiler/coreSyn/CoreUnfold.lhs | 53 +-
compiler/coreSyn/ExternalCore.lhs | 7 -
compiler/deSugar/DsBinds.lhs | 33 +-
compiler/ghc.cabal.in | 4 +-
compiler/ghc.mk | 44 +-
compiler/ghci/ByteCodeAsm.lhs | 18 +-
compiler/ghci/ByteCodeItbls.lhs | 384 +-
compiler/ghci/Linker.lhs | 84 +-
compiler/ghci/RtClosureInspect.hs | 4 +-
compiler/hsSyn/HsBinds.lhs | 7 -
compiler/iface/LoadIface.lhs | 9 +-
compiler/iface/MkIface.lhs | 2 +-
compiler/main/CodeOutput.lhs | 18 +-
compiler/main/DriverPipeline.hs | 527 +--
compiler/main/DynFlags.hs | 155 +-
compiler/main/GHC.hs | 12 +-
compiler/main/GhcMake.hs | 8 +-
compiler/main/HscMain.hs | 519 +--
compiler/main/HscTypes.lhs | 2 +-
compiler/main/InteractiveEval.hs | 56 +-
compiler/main/InteractiveEval.hs-boot | 3 -
compiler/main/InteractiveEvalTypes.hs | 65 +
compiler/main/Packages.lhs | 12 +-
compiler/main/SysTools.lhs | 2 +
compiler/nativeGen/AsmCodeGen.lhs | 81 +-
compiler/nativeGen/PIC.hs | 45 +-
compiler/nativeGen/PprBase.hs | 15 +-
compiler/nativeGen/RegAlloc/Linear/Base.hs | 2 +-
.../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +-
compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 2 +-
.../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 2 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 6 +-
compiler/nativeGen/SPARC/AddrMode.hs | 17 +-
compiler/nativeGen/SPARC/CodeGen.hs | 4 +-
compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 158 +-
compiler/parser/Lexer.x | 2 +-
compiler/prelude/TysWiredIn.lhs | 270 +-
compiler/rename/RnPat.lhs | 13 +-
compiler/simplCore/OccurAnal.lhs | 73 +-
compiler/simplCore/SimplCore.lhs | 15 +-
compiler/specialise/SpecConstr.lhs | 66 +-
compiler/stgSyn/CoreToStg.lhs | 11 +-
compiler/stranal/WwLib.lhs | 24 +-
compiler/typecheck/TcCanonical.lhs | 111 +-
compiler/typecheck/TcDeriv.lhs | 99 +-
compiler/typecheck/TcInstDcls.lhs | 2 +-
compiler/typecheck/TcRnDriver.lhs | 75 +-
compiler/typecheck/TcRules.lhs | 4 +-
compiler/typecheck/TcSimplify.lhs | 72 +-
compiler/typecheck/TcTyClsDecls.lhs | 533 ++-
compiler/typecheck/TcTyDecls.lhs | 23 +-
compiler/typecheck/TcType.lhs | 2 +-
compiler/typecheck/TcValidity.lhs | 73 +-
compiler/types/FamInstEnv.lhs | 14 +-
compiler/types/InstEnv.lhs | 13 +-
compiler/types/Type.lhs | 426 +-
compiler/utils/FastMutInt.lhs | 16 +-
compiler/utils/FastString.lhs | 2 -
compiler/utils/Fingerprint.hsc | 1 +
compiler/utils/IOEnv.hs | 20 -
compiler/utils/Maybes.lhs | 11 +-
compiler/utils/OrdList.lhs | 9 +-
compiler/utils/Outputable.lhs | 5 +-
compiler/utils/Platform.hs | 4 +
compiler/utils/Stream.hs | 4 +-
compiler/utils/UniqSet.lhs | 11 +-
compiler/utils/Util.lhs | 9 +-
configure.ac | 9 +-
distrib/configure.ac.in | 1 +
docs/comm/rts-libs/prelude.html | 4 +-
docs/users_guide/extending_ghc.xml | 4 +-
docs/users_guide/external_core.xml | 5 +-
docs/users_guide/flags.xml | 20 +-
docs/users_guide/ghci.xml | 18 +-
docs/users_guide/glasgow_exts.xml | 72 +-
docs/users_guide/profiling.xml | 172 +-
ghc.mk | 20 +-
ghc/InteractiveUI.hs | 16 +-
ghc/Main.hs | 51 +-
ghc/ghc.mk | 6 +
includes/Cmm.h | 43 +-
includes/rts/Ticky.h | 2 +-
includes/rts/storage/ClosureMacros.h | 4 -
includes/stg/Ticky.h | 51 +-
libraries/Cabal | 2 +-
.../Distribution/InstalledPackageInfo/Binary.hs | 6 -
libraries/bin-package-db/bin-package-db.cabal | 9 +-
mk/build.mk.sample | 2 +-
mk/config.mk.in | 83 +-
mk/validate-settings.mk | 6 +-
mk/ways.mk | 4 +-
packages | 89 +-
rts/Adjustor.c | 2 +-
rts/AutoApply.h | 6 +-
rts/Exception.cmm | 10 +-
rts/LdvProfile.c | 2 +-
rts/Linker.c | 50 +-
rts/ProfHeap.c | 3 +
rts/RaiseAsync.c | 6 +-
rts/STM.c | 8 +-
rts/Ticky.c | 128 +-
rts/VisCallbacks.c | 75 -
rts/VisCallbacks.h | 30 -
rts/VisSupport.c | 144 -
rts/VisSupport.h | 44 -
rts/VisWindow.c | 747 ----
rts/VisWindow.h | 5 -
rts/ghc.mk | 66 +-
rts/package.conf.in | 2 +-
rts/parallel/0Hash.c | 320 --
rts/parallel/0Parallel.h | 414 --
rts/parallel/0Unpack.c | 440 --
rts/parallel/Dist.c | 117 -
rts/parallel/Dist.h | 20 -
rts/parallel/FetchMe.h | 24 -
rts/parallel/FetchMe.hc | 180 -
rts/parallel/Global.c | 1090 -----
rts/parallel/GranSim.c | 3015 --------------
rts/parallel/GranSimRts.h | 268 --
rts/parallel/HLC.h | 63 -
rts/parallel/HLComms.c | 1810 ---------
rts/parallel/LLC.h | 130 -
rts/parallel/LLComms.c | 489 ---
rts/parallel/PEOpCodes.h | 58 -
rts/parallel/Pack.c | 4293 --------------------
rts/parallel/ParInit.c | 322 --
rts/parallel/ParInit.h | 19 -
rts/parallel/ParTicky.c | 450 --
rts/parallel/ParTicky.h | 60 -
rts/parallel/ParTypes.h | 38 -
rts/parallel/Parallel.c | 1140 ------
rts/parallel/ParallelDebug.c | 1955 ---------
rts/parallel/ParallelDebug.h | 79 -
rts/parallel/ParallelRts.h | 253 --
rts/parallel/RBH.c | 337 --
rts/parallel/SysMan.c | 650 ---
rts/sm/Storage.c | 4 +-
rules/build-dependencies.mk | 2 +-
rules/build-package-data.mk | 13 +-
rules/build-package-way.mk | 67 +-
rules/build-prog.mk | 25 +-
rules/distdir-opts.mk | 6 +-
rules/distdir-way-opts.mk | 15 +-
rules/hs-suffix-way-rules-srcdir.mk | 21 +
rules/library-path.mk | 6 +-
rules/shell-wrapper.mk | 4 +-
settings.in | 1 +
sync-all | 178 +-
utils/deriveConstants/DeriveConstants.hs | 1 +
utils/dll-split/Main.hs | 85 +
.../ghctags.cabal => dll-split/dll-split.cabal} | 7 +-
{driver/split => utils/dll-split}/ghc.mk | 14 +-
utils/ghc-cabal/Main.hs | 73 +-
utils/ghc-cabal/ghc.mk | 2 +-
utils/ghctags/Main.hs | 9 +-
utils/ltx/Makefile | 12 -
utils/ltx/ltx.prl | 229 --
utils/parallel/AVG.pl | 108 -
utils/parallel/GrAnSim.el | 432 --
utils/parallel/Makefile | 53 -
utils/parallel/RTS2gran.pl | 684 ----
utils/parallel/SN.pl | 280 --
utils/parallel/SPLIT.pl | 379 --
utils/parallel/avg-RTS.pl | 15 -
utils/parallel/get_SN.pl | 40 -
utils/parallel/ghc-fool-sort.pl | 23 -
utils/parallel/ghc-unfool-sort.pl | 16 -
utils/parallel/gp-ext-imp.pl | 86 -
utils/parallel/gr2RTS.pl | 138 -
utils/parallel/gr2ap.bash | 124 -
utils/parallel/gr2gran.bash | 113 -
utils/parallel/gr2java.pl | 322 --
utils/parallel/gr2jv.bash | 123 -
utils/parallel/gr2pe.pl | 1434 -------
utils/parallel/gr2ps.bash | 169 -
utils/parallel/gr2qp.pl | 329 --
utils/parallel/gran-extr.pl | 2114 ----------
utils/parallel/grs2gr.pl | 48 -
utils/parallel/par-aux.pl | 89 -
utils/parallel/ps-scale-y.pl | 188 -
utils/parallel/qp2ap.pl | 495 ---
utils/parallel/qp2ps.pl | 988 -----
utils/parallel/sn_filter.pl | 92 -
utils/parallel/stats.pl | 168 -
utils/parallel/template.pl | 141 -
utils/parallel/tf.pl | 148 -
utils/stat2resid/Makefile | 41 -
utils/stat2resid/parse-gcstats.prl | 232 --
utils/stat2resid/prefix.txt | 10 -
utils/stat2resid/process-gcstats.prl | 45 -
utils/stat2resid/stat2resid.prl | 81 -
utils/verbatim/Makefile | 17 -
utils/verbatim/verbatim.lex | 63 -
224 files changed, 4016 insertions(+), 32937 deletions(-)
More information about the ghc-commits
mailing list