[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (a47ee23)
Simon Peyton Jones
simonpj at microsoft.com
Fri Jan 25 13:50:34 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a47ee23a82a669808569b3865383bf932b67fa95
>---------------------------------------------------------------
commit a47ee23a82a669808569b3865383bf932b67fa95
Merge: 829be06... 388e1e8...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Jan 25 12:50:03 2013 +0000
Merge branch 'master' of http://darcs.haskell.org/ghc
aclocal.m4 | 40 +-
compiler/basicTypes/DataCon.lhs | 1 +
compiler/basicTypes/Demand.lhs | 1215 +++++++++++++++++++++++++------
compiler/basicTypes/Id.lhs | 55 +-
compiler/basicTypes/IdInfo.lhs | 54 +-
compiler/basicTypes/MkId.lhs | 60 +-
compiler/cmm/CmmInfo.hs | 155 ++++-
compiler/cmm/CmmLayoutStack.hs | 2 +-
compiler/cmm/CmmParse.y | 1 +
compiler/codeGen/StgCmmBind.hs | 1 +
compiler/codeGen/StgCmmExpr.hs | 1 +
compiler/codeGen/StgCmmLayout.hs | 122 +---
compiler/codeGen/StgCmmPrim.hs | 1 +
compiler/codeGen/StgCmmTicky.hs | 2 +-
compiler/coreSyn/CoreArity.lhs | 8 +-
compiler/coreSyn/CoreLint.lhs | 48 +--
compiler/coreSyn/CorePrep.lhs | 24 +-
compiler/coreSyn/CoreTidy.lhs | 4 +-
compiler/coreSyn/MkCore.lhs | 9 +-
compiler/coreSyn/PprCore.lhs | 12 +-
compiler/ghc.mk | 99 ++--
compiler/ghci/DebuggerUtils.hs | 2 +-
compiler/iface/BinIface.hs | 100 +---
compiler/iface/IfaceSyn.lhs | 22 +-
compiler/iface/MkIface.lhs | 6 +-
compiler/iface/TcIface.lhs | 22 +-
compiler/llvmGen/Llvm/Types.hs | 38 +-
compiler/llvmGen/LlvmCodeGen.hs | 7 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 2 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 141 +++--
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 3 +
compiler/main/CmdLineParser.hs | 10 +
compiler/main/DriverPipeline.hs | 36 +-
compiler/main/DynFlags.hs | 54 +-
compiler/main/HscMain.hs | 2 +
compiler/main/HscStats.lhs | 187 -----
compiler/main/InteractiveEval.hs | 1 +
compiler/main/PprTyThing.hs | 7 +-
compiler/main/SysTools.lhs | 13 +-
compiler/main/TidyPgm.lhs | 57 ++-
compiler/prelude/primops.txt.pp | 10 +-
compiler/simplCore/CSE.lhs | 15 +-
compiler/simplCore/FloatOut.lhs | 8 +-
compiler/simplCore/SetLevels.lhs | 30 +-
compiler/simplCore/SimplCore.lhs | 21 +-
compiler/simplCore/Simplify.lhs | 5 +-
compiler/specialise/SpecConstr.lhs | 22 +-
compiler/stranal/DmdAnal.lhs | 1077 +++++++++------------------
compiler/stranal/WorkWrap.lhs | 58 +--
compiler/stranal/WwLib.lhs | 131 +++--
compiler/typecheck/TcBinds.lhs | 1 +
compiler/typecheck/TcForeign.lhs | 5 +-
compiler/typecheck/TcMType.lhs | 55 --
compiler/typecheck/TcRnDriver.lhs | 1 +
compiler/typecheck/TcSimplify.lhs | 35 +-
compiler/typecheck/TcTyClsDecls.lhs | 1 +
compiler/types/Coercion.lhs | 20 +-
compiler/types/FamInstEnv.lhs | 5 +-
compiler/types/FunDeps.lhs | 145 ++---
compiler/types/OptCoercion.lhs | 88 ++-
compiler/types/TyCon.lhs | 10 +-
compiler/utils/Platform.hs | 4 +
configure.ac | 35 +-
docs/users_guide/glasgow_exts.xml | 6 +
docs/users_guide/intro.xml | 57 +--
docs/users_guide/ug-book.xml.in | 2 +-
ghc.mk | 22 +-
ghc/InteractiveUI.hs | 4 +-
ghc/ghc.mk | 2 +-
includes/Rts.h | 1 +
includes/rts/{Timer.h => GetTime.h} | 12 +-
includes/rts/Utils.h | 3 +
mk/build.mk.sample | 19 +
mk/config.mk.in | 27 +-
rts/Capability.c | 4 +-
rts/GetTime.h | 1 -
rts/Linker.c | 1 +
rts/Messages.c | 6 +-
rts/RtsUtils.c | 2 +-
rts/RtsUtils.h | 3 -
rts/Schedule.c | 20 +-
rts/Schedule.h | 25 +-
rts/Stats.h | 8 +-
rts/Task.c | 9 -
rts/Task.h | 6 -
rts/posix/Itimer.c | 18 +
rts/sm/GC.c | 25 +-
rts/sm/GCTDecl.h | 2 +-
rts/sm/GCThread.h | 4 +
rts/sm/Storage.c | 7 +
rules/build-package-data.mk | 12 +
settings.in | 1 +
utils/ghc-pkg/ghc.mk | 4 +-
93 files changed, 2530 insertions(+), 2189 deletions(-)
More information about the ghc-commits
mailing list