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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ff5bea74963dd058a210ecda0ca852c1505ca8e1

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

commit ff5bea74963dd058a210ecda0ca852c1505ca8e1
Merge: 182fe6f... b479713...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 24 15:46:20 2013 +0000

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

 aclocal.m4                              |    6 +
 compiler/basicTypes/DataCon.lhs         |    1 +
 compiler/cmm/CmmInfo.hs                 |  155 +++++++++++++++++++++++++-
 compiler/cmm/CmmLayoutStack.hs          |    2 +-
 compiler/cmm/CmmParse.y                 |    1 +
 compiler/codeGen/StgCmmBind.hs          |    1 +
 compiler/codeGen/StgCmmExpr.hs          |    1 +
 compiler/codeGen/StgCmmLayout.hs        |  122 +--------------------
 compiler/codeGen/StgCmmPrim.hs          |    1 +
 compiler/ghci/DebuggerUtils.hs          |    2 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs    |    2 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |  141 ++++++++++++++++--------
 compiler/main/CmdLineParser.hs          |   10 ++
 compiler/main/DriverPipeline.hs         |   25 +++--
 compiler/main/DynFlags.hs               |   47 ++++----
 compiler/main/HscMain.hs                |    2 +
 compiler/main/HscStats.lhs              |  187 -------------------------------
 compiler/main/InteractiveEval.hs        |    1 +
 compiler/main/PprTyThing.hs             |    7 +-
 compiler/main/SysTools.lhs              |   13 ++-
 compiler/main/TidyPgm.lhs               |   29 +++++
 compiler/simplCore/SetLevels.lhs        |    7 +-
 compiler/typecheck/TcRnDriver.lhs       |    1 +
 compiler/types/Coercion.lhs             |   20 ++--
 compiler/utils/Platform.hs              |    2 +
 docs/users_guide/glasgow_exts.xml       |    6 +
 docs/users_guide/intro.xml              |   57 +---------
 docs/users_guide/ug-book.xml.in         |    2 +-
 ghc.mk                                  |    1 -
 ghc/InteractiveUI.hs                    |    4 +-
 includes/Rts.h                          |    1 +
 includes/rts/{Timer.h => GetTime.h}     |   12 +-
 includes/rts/Utils.h                    |    3 +
 libraries/primitive                     |    1 +
 libraries/vector                        |    1 +
 rts/GetTime.h                           |    1 -
 rts/Linker.c                            |    1 +
 rts/RtsUtils.c                          |    2 +-
 rts/RtsUtils.h                          |    3 -
 rts/Task.c                              |    9 --
 rts/Task.h                              |    6 -
 rts/posix/Itimer.c                      |   18 +++
 rts/sm/GCTDecl.h                        |    2 +-
 rts/sm/GCThread.h                       |    4 +
 rts/sm/Storage.c                        |    7 +
 45 files changed, 437 insertions(+), 490 deletions(-)