[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (8202a57)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8202a5738d6dba1083ae4f07965e92877cd2be2d

>---------------------------------------------------------------

commit 8202a5738d6dba1083ae4f07965e92877cd2be2d
Merge: 5c0f947... 14d5e04...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jul 20 08:44:14 2011 +0100

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/hsSyn/Convert.lhs           |    1 -
 compiler/llvmGen/LlvmMangler.hs      |  121 ++++---
 compiler/nativeGen/X86/CodeGen.hs    |  678 +++++++++++++++++-----------------
 docs/users_guide/runtime_control.xml |   61 +++-
 ghc.mk                               |    2 +-
 includes/rts/EventLogFormat.h        |   21 +-
 includes/rts/Flags.h                 |    4 +-
 rts/Capability.c                     |   76 ++++-
 rts/Capability.h                     |   10 +-
 rts/RtsFlags.c                       |   60 +++-
 rts/RtsProbes.d                      |   14 +-
 rts/Schedule.c                       |   24 +-
 rts/Sparks.c                         |   75 ++---
 rts/Sparks.h                         |   42 ++-
 rts/Stats.c                          |   23 +-
 rts/StgCRun.c                        |   12 +
 rts/StgRun.h                         |    4 +
 rts/Trace.c                          |  174 +++++++--
 rts/Trace.h                          |  194 +++++++---
 rts/eventlog/EventLog.c              |  111 +++++-
 rts/eventlog/EventLog.h              |   12 +
 21 files changed, 1134 insertions(+), 585 deletions(-)