Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/fdf98d6255deba9582dd475e6953b1bb49fba660 >--------------------------------------------------------------- commit fdf98d6255deba9582dd475e6953b1bb49fba660 Merge: ee2dad1... 381becf... Author: David Waern <[email protected]> Date: Sat Nov 26 00:02:29 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 5 +- compiler/coreSyn/CoreFVs.lhs | 2 +- compiler/coreSyn/CoreSubst.lhs | 2 +- compiler/coreSyn/CoreSyn.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 3 +- compiler/deSugar/Desugar.lhs | 13 +- compiler/deSugar/DsBinds.lhs | 60 +++- compiler/ghc.mk | 6 - compiler/ghci/ByteCodeItbls.lhs | 13 +- compiler/hsSyn/HsDecls.lhs | 26 +- compiler/iface/FlagChecker.hs | 4 +- compiler/iface/MkIface.lhs | 18 +- compiler/iface/TcIface.lhs | 101 +++--- compiler/main/DriverPipeline.hs | 19 +- compiler/main/DynFlags.hs | 44 ++-- compiler/main/HscTypes.lhs | 3 + compiler/main/StaticFlags.hs | 4 +- compiler/main/SysTools.lhs | 14 +- compiler/nativeGen/PPC/CodeGen.hs | 1 + compiler/parser/Lexer.x | 14 +- compiler/parser/Parser.y.pp | 18 +- compiler/parser/RdrHsSyn.lhs | 3 +- compiler/rename/RnSource.lhs | 6 +- compiler/typecheck/TcBinds.lhs | 12 +- compiler/typecheck/TcCanonical.lhs | 29 +- compiler/typecheck/TcForeign.lhs | 22 +- compiler/typecheck/TcGenGenerics.lhs | 5 +- compiler/typecheck/TcHsSyn.lhs | 10 +- compiler/typecheck/TcHsType.lhs | 121 ++++--- compiler/typecheck/TcMType.lhs | 24 +- compiler/types/Kind.lhs | 12 +- compiler/types/Type.lhs | 8 +- compiler/utils/Platform.hs | 2 + compiler/vectorise/Vectorise.hs | 14 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 3 +- compiler/vectorise/Vectorise/Env.hs | 20 +- compiler/vectorise/Vectorise/Exp.hs | 6 +- .../vectorise/Vectorise/Generic/Description.hs | 64 ++-- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 50 +-- compiler/vectorise/Vectorise/Monad.hs | 20 +- compiler/vectorise/Vectorise/Monad/Global.hs | 6 +- compiler/vectorise/Vectorise/Type/Env.hs | 155 ++++++--- compiler/vectorise/Vectorise/Type/PRepr.hs | 369 -------------------- compiler/vectorise/Vectorise/Utils/Base.hs | 270 ++++++++------- compiler/vectorise/Vectorise/Utils/PADict.hs | 5 +- docs/users_guide/flags.xml | 7 + docs/users_guide/glasgow_exts.xml | 295 +++++++++++++++- docs/users_guide/safe_haskell.xml | 8 +- ghc.mk | 8 +- ghc/ghc.mk | 7 +- ghc/hschooks.c | 4 + includes/Rts.h | 30 ++ includes/rts/Flags.h | 21 +- includes/rts/storage/TSO.h | 6 + mk/config.mk.in | 1 + rts/GetTime.h | 14 +- rts/PrimOps.cmm | 13 +- rts/ProfHeap.c | 3 +- rts/ProfHeap.h | 4 +- rts/Profiling.c | 8 +- rts/Proftimer.c | 6 +- rts/RtsFlags.c | 76 ++-- rts/RtsStartup.c | 2 +- rts/RtsUtils.c | 2 +- rts/Schedule.c | 2 +- rts/Stats.c | 162 +++++----- rts/Stats.h | 6 +- rts/Task.c | 6 +- rts/Task.h | 14 +- rts/Threads.c | 12 +- rts/Ticker.h | 2 +- rts/eventlog/EventLog.c | 2 +- rts/posix/GetTime.c | 38 +-- rts/posix/Itimer.c | 122 +++---- rts/posix/Itimer.h | 2 - rts/posix/Select.c | 39 ++- rts/posix/Select.h | 8 +- rts/sm/GCThread.h | 6 +- rts/win32/GetTime.c | 31 +- rts/win32/Ticker.c | 178 +++------- rules/build-prog.mk | 4 + 81 files changed, 1410 insertions(+), 1347 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
