[commit: ghc] cardinality: Merge remote-tracking branch 'origin/master' into cardinality (f078027)
Simon Peyton Jones
simonpj at microsoft.com
Fri Mar 8 19:07:34 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : cardinality
http://hackage.haskell.org/trac/ghc/changeset/f0780277280fab1e931f79418299977d898b59a1
>---------------------------------------------------------------
commit f0780277280fab1e931f79418299977d898b59a1
Merge: f2777c1 df2e867
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Mon Mar 4 13:22:08 2013 +0000
Merge remote-tracking branch 'origin/master' into cardinality
HACKING | 63 ---
HACKING.md | 149 +++++++
README.md | 67 ++-
aclocal.m4 | 113 +++--
bindisttest/ghc.mk | 2 +-
boot | 5 +-
compiler/codeGen/StgCmmPrim.hs | 4 +
compiler/deSugar/Coverage.lhs | 3 +
compiler/deSugar/DsArrows.lhs | 484 ++++++++++++---------
compiler/ghc.mk | 87 ++--
compiler/ghci/Linker.lhs | 31 +-
compiler/hsSyn/HsDecls.lhs | 35 +-
compiler/hsSyn/HsExpr.lhs | 17 +-
compiler/hsSyn/HsUtils.lhs | 7 +-
compiler/iface/TcIface.lhs | 2 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 3 +
compiler/main/CodeOutput.lhs | 21 +-
compiler/main/DriverPipeline.hs | 273 ++++++------
compiler/main/DynFlags.hs | 21 +-
compiler/main/DynFlags.hs-boot | 1 +
compiler/main/GHC.hs | 1 -
compiler/main/GhcMonad.hs | 10 +-
compiler/main/HscMain.hs | 28 +-
compiler/main/SysTools.lhs | 3 +-
compiler/nativeGen/X86/CodeGen.hs | 20 +-
compiler/parser/Lexer.x | 9 +-
compiler/parser/Parser.y.pp | 4 +-
compiler/parser/RdrHsSyn.lhs | 4 +-
compiler/prelude/PrelRules.lhs | 9 +
compiler/prelude/primops.txt.pp | 11 +
compiler/rename/RnExpr.lhs | 4 +-
compiler/rename/RnSource.lhs | 3 +-
compiler/rename/RnTypes.lhs | 2 +-
compiler/simplCore/CoreMonad.lhs | 4 +-
compiler/stgSyn/StgSyn.lhs | 2 +-
compiler/typecheck/TcArrows.lhs | 272 ++++++------
compiler/typecheck/TcCanonical.lhs | 150 ++++---
compiler/typecheck/TcDeriv.lhs | 4 +-
compiler/typecheck/TcHsSyn.lhs | 8 +-
compiler/typecheck/TcInteract.lhs | 1 +
compiler/typecheck/TcPat.lhs | 2 +-
compiler/typecheck/TcRnDriver.lhs | 43 +-
compiler/typecheck/TcRnTypes.lhs | 33 +-
compiler/typecheck/TcSMonad.lhs | 5 +-
compiler/types/Kind.lhs | 9 +-
compiler/types/Type.lhs | 4 +
compiler/utils/Exception.hs | 24 +-
compiler/utils/Outputable.lhs | 7 +-
compiler/utils/Platform.hs | 13 +-
compiler/vectorise/Vectorise/Exp.hs | 11 +-
configure.ac | 108 ++---
distrib/configure.ac.in | 3 -
docs/users_guide/extending_ghc.xml | 11 +-
docs/users_guide/glasgow_exts.xml | 56 ++-
driver/ghc/ghc.mk | 4 +-
driver/ghci/ghc.mk | 10 +-
driver/haddock/ghc.mk | 4 +-
driver/split/ghc.mk | 5 +-
ghc.mk | 445 ++++++++-----------
ghc/GhciMonad.hs | 5 -
ghc/InteractiveUI.hs | 5 +-
ghc/ghc.mk | 36 +-
includes/Cmm.h | 8 +-
includes/rts/prof/CCS.h | 2 +-
includes/rts/storage/SMPClosureOps.h | 4 +-
includes/stg/MiscClosures.h | 1 +
libraries/Cabal | 2 +-
libraries/Win32 | 2 +-
libraries/bin-package-db/bin-package-db.cabal | 2 +-
libraries/binary | 2 +-
libraries/bytestring | 2 +-
libraries/haskeline | 2 +-
libraries/pretty | 2 +-
libraries/random | 2 +-
mk/config.mk.in | 141 +-----
mk/custom-settings.mk | 2 +-
mk/project.mk.in | 13 +-
mk/tree.mk | 19 -
mk/validate-settings.mk | 8 +-
mk/ways.mk | 2 +-
packages | 2 +-
rts/Prelude.h | 1 +
rts/ProfHeap.c | 2 +-
rts/RtsStartup.c | 1 +
rts/Schedule.c | 40 +-
rts/StgCRun.c | 10 +-
rts/Updates.h | 4 +-
rts/ghc.mk | 19 +-
rts/posix/OSThreads.c | 4 +-
rts/sm/Evac.c | 17 +-
rts/win32/ThrIOManager.c | 10 +-
rts/win32/libHSbase.def | 1 +
rules/build-dependencies.mk | 15 +-
rules/build-package-data.mk | 16 +-
rules/build-package-way.mk | 6 +-
rules/build-package.mk | 21 +-
rules/build-perl.mk | 35 +-
rules/build-prog.mk | 46 +-
rules/c-suffix-rules.mk | 3 +-
rules/cmm-suffix-rules.mk | 4 -
rules/distdir-opts.mk | 112 +++++
rules/distdir-way-opts.mk | 98 +----
rules/extra-packages.mk | 48 --
rules/foreachLibrary.mk | 43 ++
rules/haddock.mk | 9 +-
rules/hi-rule.mk | 34 +-
rules/hs-suffix-rules-srcdir.mk | 77 +---
...les-srcdir.mk => hs-suffix-way-rules-srcdir.mk} | 48 +-
.../{hs-suffix-rules.mk => hs-suffix-way-rules.mk} | 33 +-
rules/manual-package-config.mk | 4 +-
rules/package-config.mk | 4 +-
rules/pretty_commands.mk | 2 +-
rules/shell-wrapper.mk | 4 +-
settings.in | 1 +
sync-all | 77 +++-
utils/Makefile | 119 -----
utils/compare_sizes/ghc.mk | 2 +-
utils/count_lines/ghc.mk | 2 +-
utils/deriveConstants/ghc.mk | 2 +-
utils/genapply/ghc.mk | 2 +-
utils/genprimopcode/ghc.mk | 2 +-
utils/ghc-cabal/ghc.mk | 36 +-
utils/ghc-pkg/Main.hs | 3 +-
utils/ghc-pkg/ghc-pkg.cabal | 2 +-
utils/ghc-pkg/ghc.mk | 77 +---
utils/ghc-pwd/ghc.mk | 2 +-
utils/ghctags/ghc.mk | 2 +-
utils/hp2ps/ghc.mk | 2 +-
utils/hpc/ghc.mk | 2 +-
utils/lndir/Makefile | 17 -
utils/mkUserGuidePart/ghc.mk | 2 +-
utils/runghc/ghc.mk | 4 +-
utils/runghc/runghc.hs | 2 +-
utils/touchy/ghc.mk | 2 +-
utils/unlit/ghc.mk | 2 +-
135 files changed, 2041 insertions(+), 2090 deletions(-)
More information about the ghc-commits
mailing list