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

[dimitris at microsoft.com]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/42e3b5bd3ee9c555adaaf1e5a12f7ddd71423c0c

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

commit 42e3b5bd3ee9c555adaaf1e5a12f7ddd71423c0c
Merge: e4d87e1... 1f7433b...
Author: Dimitrios Vytiniotis <dimitris at microsoft.com>
Date:   Tue Nov 29 19:20:33 2011 +0000

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

 compiler/cmm/CmmCvt.hs                  |    2 +-
 compiler/cmm/CmmExpr.hs                 |    6 +-
 compiler/cmm/CmmLex.x                   |    5 +-
 compiler/cmm/CmmLint.hs                 |    2 +-
 compiler/cmm/CmmOpt.hs                  |    6 +-
 compiler/cmm/CmmParse.y                 |    8 +-
 compiler/cmm/OldCmm.hs                  |    3 +-
 compiler/cmm/OldPprCmm.hs               |    7 +-
 compiler/cmm/PprC.hs                    |   20 +++---
 compiler/cmm/PprCmmExpr.hs              |    1 +
 compiler/codeGen/CgCase.lhs             |    2 +-
 compiler/codeGen/CgClosure.lhs          |   11 ++-
 compiler/codeGen/CgForeignCall.hs       |   12 ++--
 compiler/codeGen/CgPrimOp.hs            |    2 +
 compiler/codeGen/CgProf.hs              |   23 +++---
 compiler/codeGen/CgUtils.hs             |   33 ++++----
 compiler/codeGen/StgCmmForeign.hs       |    4 +-
 compiler/codeGen/StgCmmPrim.hs          |    3 +
 compiler/codeGen/StgCmmProf.hs          |   15 ++--
 compiler/codeGen/StgCmmUtils.hs         |    8 ++-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |    2 +-
 compiler/nativeGen/AsmCodeGen.lhs       |    4 +-
 compiler/nativeGen/PPC/CodeGen.hs       |    2 +-
 compiler/nativeGen/SPARC/CodeGen.hs     |    2 +-
 compiler/nativeGen/X86/CodeGen.hs       |    4 +-
 compiler/prelude/primops.txt.pp         |    3 +
 docs/users_guide/profiling.xml          |   44 +++++++++--
 includes/Cmm.h                          |    2 +-
 includes/RtsAPI.h                       |    9 ++
 includes/mkDerivedConstants.c           |    1 +
 includes/rts/prof/CCS.h                 |    7 +-
 includes/stg/MiscClosures.h             |    1 -
 includes/stg/Regs.h                     |    1 +
 rts/Apply.cmm                           |    2 +-
 rts/AutoApply.h                         |   12 ++--
 rts/Capability.c                        |   24 +++++-
 rts/Exception.cmm                       |    4 +-
 rts/HeapStackCheck.cmm                  |   13 +++-
 rts/Interpreter.c                       |    4 +-
 rts/PrimOps.cmm                         |   40 +++++-----
 rts/Profiling.c                         |  134 +++++++++++++++++++++----------
 rts/Proftimer.c                         |    6 +-
 rts/RetainerProfile.h                   |    3 +
 rts/RtsFlags.c                          |    6 --
 rts/Schedule.c                          |    4 +-
 rts/StgMiscClosures.cmm                 |    2 +-
 rts/StgStdThunks.cmm                    |    4 +-
 rts/sm/GC.c                             |   18 +++--
 rts/sm/Storage.c                        |    4 +-
 utils/genapply/GenApply.hs              |    2 +-
 50 files changed, 334 insertions(+), 203 deletions(-)