[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (0ee44de)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0ee44def597152e6b25ac6647041542a6b1ee6b4

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

commit 0ee44def597152e6b25ac6647041542a6b1ee6b4
Merge: 7d847e8... c3b6b3f...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Sep 10 11:29:31 2012 +0100

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

 compiler/cmm/CLabel.hs               |   22 ++++++++-
 compiler/cmm/CmmBuildInfoTables.hs   |    9 ++--
 compiler/codeGen/StgCmm.hs           |    1 -
 compiler/codeGen/StgCmmEnv.hs        |    8 +--
 compiler/codeGen/StgCmmExpr.hs       |    5 ++-
 compiler/codeGen/StgCmmMonad.hs      |   25 +---------
 compiler/codeGen/StgCmmPrim.hs       |   15 ++++--
 compiler/ghc.cabal.in                |    2 +-
 compiler/ghc.mk                      |   12 -----
 compiler/iface/IfaceSyn.lhs          |   22 +++++++++
 compiler/iface/MkIface.lhs           |   17 +------
 compiler/main/HscMain.hs             |    4 +-
 compiler/main/HscTypes.lhs           |   34 ++++++-------
 compiler/nativeGen/PPC/CodeGen.hs    |    4 +-
 compiler/nativeGen/PPC/Ppr.hs        |   37 ++++++++------
 compiler/nativeGen/SPARC/Ppr.hs      |   37 ++++++++------
 compiler/typecheck/TcHsType.lhs      |    6 ++-
 docs/users_guide/glasgow_exts.xml    |    2 +-
 ghc/ghc-bin.cabal.in                 |    2 +-
 ghc/hschooks.c                       |    2 +-
 includes/mkDerivedConstants.c        |    2 +-
 includes/rts/Hooks.h                 |    6 +-
 includes/rts/SpinLock.h              |    2 +-
 includes/rts/Threads.h               |    8 ++--
 includes/rts/Types.h                 |    6 ++-
 includes/rts/storage/Block.h         |    4 +-
 includes/rts/storage/ClosureMacros.h |    8 ++--
 includes/rts/storage/GC.h            |   12 ++--
 includes/rts/storage/MBlock.h        |    6 +-
 includes/stg/Types.h                 |   18 ++-----
 rts/Arena.c                          |    2 +-
 rts/Capability.h                     |    2 +-
 rts/Disassembler.c                   |    2 +-
 rts/FrontPanel.c                     |    2 +-
 rts/FrontPanel.h                     |    2 +-
 rts/Linker.c                         |    8 ++--
 rts/Messages.c                       |   10 ++--
 rts/Printer.c                        |   14 +++---
 rts/ProfHeap.c                       |    2 +-
 rts/Profiling.c                      |    2 +-
 rts/RetainerProfile.c                |    4 +-
 rts/RetainerProfile.h                |    2 +-
 rts/RtsAPI.c                         |    6 +-
 rts/RtsFlags.c                       |    2 +-
 rts/RtsUtils.c                       |    2 +-
 rts/Schedule.c                       |    4 +-
 rts/Stats.c                          |   34 +++++++-------
 rts/Stats.h                          |    4 +-
 rts/Threads.c                        |   16 +++---
 rts/Threads.h                        |    2 +-
 rts/Trace.c                          |   46 +++++++++---------
 rts/Trace.h                          |   44 +++++++++---------
 rts/eventlog/EventLog.c              |   20 ++++----
 rts/eventlog/EventLog.h              |   20 ++++----
 rts/hooks/MallocFail.c               |    2 +-
 rts/hooks/OutOfHeap.c                |    2 +-
 rts/hooks/StackOverflow.c            |    2 +-
 rts/parallel/ParTicky.c              |    4 +-
 rts/posix/OSMem.c                    |   12 ++--
 rts/sm/BlockAlloc.c                  |   80 +++++++++++++++++++-------------
 rts/sm/BlockAlloc.h                  |   12 ++--
 rts/sm/Compact.c                     |   16 +++---
 rts/sm/Evac.h                        |    2 +-
 rts/sm/GC.c                          |   38 ++++++++-------
 rts/sm/GCThread.h                    |   18 ++++----
 rts/sm/GCUtils.c                     |    2 +-
 rts/sm/MBlock.c                      |    6 +-
 rts/sm/OSMem.h                       |    4 +-
 rts/sm/Sanity.c                      |   26 +++++-----
 rts/sm/Scav.c                        |    8 ++--
 rts/sm/Storage.c                     |   86 +++++++++++++++++----------------
 rts/sm/Storage.h                     |   30 ++++++------
 rts/sm/Sweep.c                       |    2 +-
 rts/win32/OSMem.c                    |   30 ++++++------
 utils/ghc-cabal/ghc-cabal.cabal      |    2 +-
 utils/ghc-pkg/ghc-pkg.cabal          |    2 +-
 utils/ghc-pwd/ghc-pwd.cabal          |    2 +-
 utils/hpc/hpc-bin.cabal              |    2 +-
 utils/runghc/runghc.cabal.in         |    2 +-
 79 files changed, 506 insertions(+), 476 deletions(-)