Repository : ssh://[email protected]/ghc On branch : type-nats-simple Link : http://ghc.haskell.org/trac/ghc/changeset/85cb4d00d7cf2f5c25aa13d54338ecbebec3ecdb/ghc
>--------------------------------------------------------------- commit 85cb4d00d7cf2f5c25aa13d54338ecbebec3ecdb Merge: 2a025e0 2cec084 Author: Iavor S. Diatchki <[email protected]> Date: Sun Sep 8 22:52:20 2013 -0700 Merge remote-tracking branch 'origin/master' into type-nats-simple >--------------------------------------------------------------- 85cb4d00d7cf2f5c25aa13d54338ecbebec3ecdb aclocal.m4 | 14 +++- compiler/basicTypes/DataCon.lhs | 40 +++++++++ compiler/basicTypes/Demand.lhs | 58 ++++++++++++- compiler/basicTypes/Id.lhs | 4 +- compiler/basicTypes/MkId.lhs | 33 +++++--- compiler/cmm/CmmNode.hs | 81 ++++++++++++++++-- compiler/cmm/CmmSink.hs | 62 ++++++++------ compiler/cmm/PprC.hs | 1 + compiler/coreSyn/CoreLint.lhs | 23 ++++-- compiler/coreSyn/CorePrep.lhs | 2 +- compiler/deSugar/Desugar.lhs | 29 +++---- compiler/deSugar/DsCCall.lhs | 41 --------- compiler/ghc.mk | 17 +++- compiler/iface/TcIface.lhs | 17 ++-- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 1 + compiler/main/DriverPipeline.hs | 15 +++- compiler/main/DynFlags.hs | 25 +++++- compiler/main/HscMain.hs | 48 +++++------ compiler/main/StaticFlags.hs | 8 -- compiler/main/SysTools.lhs | 3 + compiler/main/TidyPgm.lhs | 2 +- compiler/nativeGen/AsmCodeGen.lhs | 1 + compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 4 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 1 + compiler/nativeGen/RegAlloc/Linear/Main.hs | 1 + compiler/nativeGen/TargetReg.hs | 6 ++ compiler/parser/Lexer.x | 2 + compiler/parser/Parser.y.pp | 21 +---- compiler/parser/RdrHsSyn.lhs | 5 +- compiler/prelude/ForeignCall.lhs | 10 ++- compiler/rename/RnExpr.lhs | 6 +- compiler/rename/RnPat.lhs | 5 +- compiler/rename/RnTypes.lhs | 4 +- compiler/simplCore/CoreMonad.lhs | 84 +++++++++++++++---- compiler/simplCore/SimplCore.lhs | 15 ++-- compiler/stranal/DmdAnal.lhs | 47 +++++++++-- compiler/stranal/WwLib.lhs | 7 +- compiler/typecheck/TcForeign.lhs | 5 ++ compiler/typecheck/TcInstDcls.lhs | 4 +- compiler/typecheck/TcSMonad.lhs | 1 + compiler/typecheck/TcTyClsDecls.lhs | 16 ++-- compiler/typecheck/TcTyDecls.lhs | 22 ++++- compiler/typecheck/TcValidity.lhs | 23 +++--- compiler/types/Coercion.lhs | 5 +- compiler/types/Type.lhs | 20 +---- compiler/utils/Platform.hs | 1 + configure.ac | 6 ++ docs/users_guide/7.8.1-notes.xml | 11 +++ docs/users_guide/external_core.xml | 2 +- docs/users_guide/flags.xml | 28 ++++--- docs/users_guide/using.xml | 25 ++++-- driver/ghc-usage.txt | 5 +- includes/rts/Linker.h | 2 + libraries/Cabal | 2 +- libraries/containers | 2 +- libraries/haskeline | 2 +- mk/config.mk.in | 3 + mk/install.mk.in | 2 +- mk/validate-settings.mk | 9 ++ rts/AutoApply.h | 2 + rts/Capability.c | 83 ++++++++++--------- rts/Capability.h | 8 +- rts/CheckUnload.c | 13 +-- rts/Linker.c | 10 ++- rts/PrimOps.cmm | 16 ++-- 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/sm/Compact.c | 2 +- rts/sm/GC.c | 50 +++++------ rts/sm/Sanity.c | 14 ++-- rts/sm/Storage.c | 10 +-- utils/ghc-pkg/Main.hs | 17 ++-- utils/hp2ps/Axes.c | 12 ++- validate | 13 ++- 80 files changed, 848 insertions(+), 503 deletions(-) _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
