Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/97ce7b595418d629a57654b5af07133e6418b45e >--------------------------------------------------------------- commit 97ce7b595418d629a57654b5af07133e6418b45e Merge: 5188e4e... 80f5e70... Author: Simon Peyton Jones <[email protected]> Date: Thu May 26 14:33:00 2011 +0100 Merge remote branch 'origin/master' into ghc-generics compiler/coreSyn/CoreUnfold.lhs | 113 ++++++++----- compiler/coreSyn/CoreUtils.lhs | 8 +- compiler/ghc.cabal.in | 1 - compiler/ghc.mk | 6 +- compiler/ghci/ByteCodeFFI.lhs | 28 ---- compiler/ghci/ByteCodeInstr.lhs | 2 +- compiler/main/DynFlags.hs | 13 +- compiler/main/Packages.lhs | 73 ++++++--- compiler/main/StaticFlags.hs | 10 +- compiler/main/SysTools.lhs | 8 +- compiler/prelude/ForeignCall.lhs | 5 +- compiler/prelude/PrimOp.lhs | 35 ++--- compiler/prelude/primops.txt.pp | 112 +++++++++----- docs/users_guide/flags.xml | 8 +- docs/users_guide/glasgow_exts.xml | 2 +- docs/users_guide/using.xml | 12 -- includes/Rts.h | 3 - includes/rts/EventLogFormat.h | 39 +----- includes/rts/Flags.h | 4 +- includes/rts/storage/GC.h | 26 ++- rts/Capability.c | 4 - rts/RtsFlags.c | 150 ++++++++++++----- rts/RtsFlags.h | 1 + rts/RtsProbes.d | 6 - rts/RtsStartup.c | 9 +- rts/Schedule.c | 16 +- rts/Stats.c | 2 +- rts/Trace.c | 67 -------- rts/Trace.h | 69 -------- rts/eventlog/EventLog.c | 149 +----------------- rts/eventlog/EventLog.h | 29 ---- rts/ghc.mk | 1 - rts/sm/GC.c | 12 +-- utils/fingerprint/fingerprint.py | 248 ++++++++++++++++++++++++++++ utils/genprimopcode/Lexer.x | 1 + utils/genprimopcode/Main.hs | 13 +- utils/genprimopcode/Parser.y | 2 + utils/genprimopcode/ParserM.hs | 1 + utils/genprimopcode/Syntax.hs | 2 + utils/ghc-cabal/Main.hs | 2 +- utils/ghc-pkg/Main.hs | 322 ++++++++++++++++++++++++++----------- validate | 15 ++ 42 files changed, 878 insertions(+), 751 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
