[commit: ghc] master: Merge branch 'master' into atomics (e251a51)
git at git.haskell.org
git at git.haskell.org
Sat Aug 31 22:10:26 CEST 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/e251a51a990c3a9c95dabab139d42ad69479f61c/ghc
>---------------------------------------------------------------
commit e251a51a990c3a9c95dabab139d42ad69479f61c
Merge: 6fd60b2 ea87014
Author: Ryan Newton <rrnewton at gmail.com>
Date: Sat Aug 31 15:28:02 2013 -0400
Merge branch 'master' into atomics
>---------------------------------------------------------------
e251a51a990c3a9c95dabab139d42ad69479f61c
aclocal.m4 | 6 +-
compiler/basicTypes/BasicTypes.lhs | 9 +-
compiler/cmm/CmmExpr.hs | 6 +-
compiler/cmm/cmm-notes | 2 +-
compiler/codeGen/StgCmm.hs | 7 +-
compiler/codeGen/StgCmmBind.hs | 16 +-
compiler/codeGen/StgCmmClosure.hs | 147 +-
compiler/codeGen/StgCmmExpr.hs | 111 +-
compiler/codeGen/StgCmmMonad.hs | 125 +-
compiler/codeGen/StgCmmProf.hs | 71 +-
compiler/coreSyn/CoreSubst.lhs | 27 +-
compiler/coreSyn/CoreSyn.lhs | 14 +-
compiler/coreSyn/CoreTidy.lhs | 7 +-
compiler/coreSyn/CoreUnfold.lhs | 6 +-
compiler/coreSyn/CoreUtils.lhs | 48 +-
compiler/coreSyn/PprCore.lhs | 2 +-
compiler/deSugar/DsMeta.hs | 16 +
compiler/ghci/ByteCodeInstr.lhs | 2 +-
compiler/hsSyn/HsBinds.lhs | 127 +-
compiler/hsSyn/HsExpr.lhs | 60 +-
compiler/iface/BinIface.hs | 2 -
compiler/iface/IfaceSyn.lhs | 35 +-
compiler/iface/MkIface.lhs | 263 ++--
compiler/iface/TcIface.lhs | 74 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 4 +-
compiler/main/DriverPipeline.hs | 95 +-
compiler/main/DynFlags.hs | 22 +-
compiler/main/GhcMake.hs | 2 +-
compiler/main/GhcMonad.hs | 8 +
compiler/main/HscTypes.lhs | 22 +-
compiler/main/Packages.lhs | 17 +-
compiler/main/SysTools.lhs | 17 +-
compiler/main/TidyPgm.lhs | 5 -
compiler/parser/Parser.y.pp | 4 +-
compiler/rename/RnEnv.lhs | 2 +-
compiler/rename/RnNames.lhs | 9 +-
compiler/rename/RnPat.lhs | 228 +--
compiler/simplCore/OccurAnal.lhs | 4 +-
compiler/simplCore/SimplCore.lhs | 11 +-
compiler/simplCore/SimplEnv.lhs | 2 +-
compiler/simplCore/Simplify.lhs | 8 +-
compiler/specialise/SpecConstr.lhs | 2 +-
compiler/stranal/WorkWrap.lhs | 32 +-
compiler/typecheck/TcDeriv.lhs | 2 +-
compiler/typecheck/TcErrors.lhs | 77 +-
compiler/typecheck/TcRnTypes.lhs | 5 +-
compiler/typecheck/TcSimplify.lhs | 85 +-
compiler/typecheck/TcTyClsDecls.lhs | 4 +-
compiler/types/CoAxiom.lhs | 8 +-
compiler/types/InstEnv.lhs | 55 +-
compiler/types/TypeRep.lhs | 2 +-
compiler/types/Unify.lhs | 26 +-
compiler/utils/FastString.lhs | 2 +-
compiler/utils/Fingerprint.hsc | 41 +-
compiler/vectorise/Vectorise/Builtins/Base.hs | 4 +-
docs/storage-mgt/rp.tex | 2 +-
docs/users_guide/7.8.1-notes.xml | 124 +-
docs/users_guide/flags.xml | 77 +-
docs/users_guide/ghci.xml | 17 +-
docs/users_guide/glasgow_exts.xml | 68 +-
docs/users_guide/phases.xml | 32 +-
docs/users_guide/separate_compilation.xml | 35 +-
docs/users_guide/using.xml | 564 +++----
ghc/InteractiveUI.hs | 22 +-
ghc/ghc-bin.cabal.in | 5 +-
includes/stg/SMP.h | 9 +-
libraries/Cabal | 2 +-
.../Distribution/InstalledPackageInfo/Binary.hs | 6 +-
libraries/bin-package-db/bin-package-db.cabal | 4 +-
libraries/binary | 2 +-
libraries/bytestring | 2 +-
libraries/containers | 2 +-
libraries/haskeline | 2 +-
libraries/time | 2 +-
mk/config.mk.in | 4 +-
rts/CheckUnload.c | 303 ++++
rts/CheckUnload.h | 20 +
rts/Linker.c | 124 +-
rts/LinkerInternals.h | 12 +-
rts/StgCRun.c | 2 +-
rts/ghc-frontpanel.glade | 1622 --------------------
rts/ghc.mk | 4 -
rts/posix/OSMem.c | 21 +
rts/sm/GC.c | 5 +
settings.in | 1 +
sync-all | 32 +-
utils/dll-split/Main.hs | 2 +-
utils/genprimopcode/Main.hs | 2 +-
utils/ghc-cabal/Main.hs | 13 +-
utils/ghc-cabal/ghc-cabal.cabal | 2 +-
validate | 50 +-
91 files changed, 2341 insertions(+), 2843 deletions(-)
More information about the ghc-commits
mailing list