Repository : ssh://[email protected]/ghc On branch : ghc-parmake-gsoc Link : http://ghc.haskell.org/trac/ghc/changeset/d127a697192851ea6bf308525a8a8895da71b639/ghc
>--------------------------------------------------------------- commit d127a697192851ea6bf308525a8a8895da71b639 Merge: a2e338f 32ade41 Author: Patrick Palka <[email protected]> Date: Wed Sep 4 12:10:27 2013 -0400 Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc >--------------------------------------------------------------- d127a697192851ea6bf308525a8a8895da71b639 aclocal.m4 | 14 ++- boot | 2 +- compiler/basicTypes/MkId.lhs | 33 +++-- compiler/cmm/CmmNode.hs | 81 +++++++++++- compiler/cmm/CmmSink.hs | 116 ++++++++++------- compiler/codeGen/StgCmm.hs | 2 +- compiler/codeGen/StgCmmBind.hs | 3 +- compiler/codeGen/StgCmmCon.hs | 2 +- compiler/codeGen/StgCmmExpr.hs | 2 +- compiler/codeGen/StgCmmForeign.hs | 2 +- compiler/codeGen/StgCmmHeap.hs | 2 +- compiler/codeGen/StgCmmLayout.hs | 2 +- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/coreSyn/CoreLint.lhs | 23 +++- compiler/coreSyn/CorePrep.lhs | 2 +- compiler/coreSyn/CoreSyn.lhs | 31 +++-- compiler/coreSyn/CoreUnfold.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 1 - compiler/deSugar/Desugar.lhs | 29 ++--- compiler/iface/IfaceSyn.lhs | 15 +-- compiler/iface/MkIface.lhs | 1 - compiler/iface/TcIface.lhs | 46 ++----- compiler/main/HscMain.hs | 48 +++---- compiler/main/TidyPgm.lhs | 2 +- compiler/prelude/primops.txt.pp | 23 ++++ compiler/rename/RnExpr.lhs | 6 +- compiler/rename/RnPat.lhs | 5 +- compiler/rename/RnTypes.lhs | 4 +- compiler/simplCore/CoreMonad.lhs | 84 ++++++++++--- compiler/simplCore/OccurAnal.lhs | 70 ++++++----- compiler/simplCore/SimplCore.lhs | 15 +-- compiler/specialise/Specialise.lhs | 4 +- compiler/typecheck/TcBinds.lhs | 5 +- compiler/typecheck/TcInstDcls.lhs | 4 +- compiler/typecheck/TcMType.lhs | 6 +- compiler/typecheck/TcSMonad.lhs | 1 + compiler/typecheck/TcTyClsDecls.lhs | 16 +-- compiler/typecheck/TcTyDecls.lhs | 22 +++- compiler/typecheck/TcType.lhs | 2 +- compiler/typecheck/TcValidity.lhs | 23 ++-- compiler/types/Coercion.lhs | 5 +- compiler/types/Type.lhs | 10 +- compiler/types/TypeRep.lhs | 18 ++- docs/users_guide/7.8.1-notes.xml | 19 ++- docs/users_guide/flags.xml | 233 ++++++++++++++++++---------------- docs/users_guide/glasgow_exts.xml | 238 ++++++++++++++++++++--------------- driver/ghc-usage.txt | 3 + includes/rts/Linker.h | 2 + includes/stg/MiscClosures.h | 3 + includes/stg/SMP.h | 27 ++-- libraries/haskeline | 2 +- libraries/time | 2 +- mk/config.mk.in | 1 + mk/install.mk.in | 2 +- mk/validate-settings.mk | 9 ++ packages | 94 +++++++------- rts/Capability.c | 83 ++++++------ rts/Capability.h | 8 +- rts/CheckUnload.c | 13 +- rts/Linker.c | 5 +- rts/PrimOps.cmm | 60 ++++++++- rts/Profiling.c | 2 +- rts/Proftimer.c | 2 +- rts/RetainerProfile.c | 2 +- rts/Schedule.c | 87 ++++++------- rts/Stats.c | 34 ++--- rts/Task.c | 28 ----- rts/Task.h | 5 - rts/Threads.c | 2 +- rts/Timer.c | 2 +- rts/sm/Compact.c | 2 +- rts/sm/GC.c | 52 ++++---- rts/sm/Sanity.c | 14 +-- rts/sm/Storage.c | 10 +- rules/shell-wrapper.mk | 2 +- sync-all | 3 +- utils/hp2ps/Axes.c | 12 +- validate | 50 +++++--- 78 files changed, 1119 insertions(+), 780 deletions(-) _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
