[commit: ghc] cardinality: Merge remote-tracking branch 'origin/master' into cardinality (1db4e54)
Simon Peyton Jones
simonpj at microsoft.com
Fri Mar 22 15:36:40 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : cardinality
https://github.com/ghc/ghc/commit/1db4e5441a350b95ab45b3588943043ae7c5d698
>---------------------------------------------------------------
commit 1db4e5441a350b95ab45b3588943043ae7c5d698
Merge: f6a5446 cc097a4
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu Mar 21 16:26:52 2013 +0000
Merge remote-tracking branch 'origin/master' into cardinality
aclocal.m4 | 32 +
compiler/ghc.mk | 10 +
compiler/ghci/Linker.lhs | 84 +-
compiler/iface/LoadIface.lhs | 6 +-
compiler/iface/MkIface.lhs | 2 +-
compiler/main/DriverPipeline.hs | 6 +
compiler/main/DynFlags.hs | 87 +-
compiler/main/GHC.hs | 2 +
compiler/main/HscMain.hs | 2 +-
compiler/main/InteractiveEval.hs | 16 +-
compiler/main/SysTools.lhs | 2 +
compiler/parser/Lexer.x | 2 +-
compiler/typecheck/TcRnDriver.lhs | 33 +-
compiler/typecheck/TcTyClsDecls.lhs | 533 ++-
compiler/typecheck/TcType.lhs | 2 +-
compiler/typecheck/TcValidity.lhs | 9 +-
compiler/types/FamInstEnv.lhs | 14 +-
compiler/types/InstEnv.lhs | 13 +-
compiler/utils/Fingerprint.hsc | 1 +
compiler/utils/Platform.hs | 4 +
compiler/utils/Util.lhs | 9 +-
configure.ac | 1 +
distrib/configure.ac.in | 1 +
docs/users_guide/flags.xml | 6 +
docs/users_guide/glasgow_exts.xml | 29 +
ghc.mk | 12 +-
ghc/InteractiveUI.hs | 16 +-
ghc/Main.hs | 51 +-
ghc/ghc.mk | 6 +
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 | 44 +-
mk/validate-settings.mk | 6 +-
rts/Linker.c | 14 +-
rts/ghc.mk | 6 +-
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 ---
rules/build-package-data.mk | 2 +-
rules/build-package-way.mk | 2 +-
rules/build-prog.mk | 25 +-
rules/distdir-opts.mk | 4 +-
rules/hs-suffix-way-rules-srcdir.mk | 6 +-
rules/library-path.mk | 6 +-
rules/shell-wrapper.mk | 4 +-
settings.in | 1 +
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 -
106 files changed, 638 insertions(+), 28274 deletions(-)
More information about the ghc-commits
mailing list