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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit b4797136887e9c1d3dbb2dcb045b60030f7726b4
Merge: 65e4195... c23faf3...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 24 13:19:31 2013 +0000

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

 aclocal.m4                              |    6 +
 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/CodeGen.hs |  141 +++++++++++++++++++---------
 compiler/main/DriverPipeline.hs         |   18 ++--
 compiler/main/SysTools.lhs              |   13 ++-
 compiler/utils/Platform.hs              |    2 +
 docs/users_guide/intro.xml              |   57 +----------
 docs/users_guide/ug-book.xml.in         |    2 +-
 ghc.mk                                  |    1 -
 rts/Linker.c                            |    1 +
 rts/posix/Itimer.c                      |   18 ++++
 18 files changed, 308 insertions(+), 236 deletions(-)