[commit: ghc] local-gc: Merge commit '67e48af966056fa8d1533f1cb8ea65fba9f2fcf5' into local-gc (c937dc7)

[Simon Marlow]

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

On branch  : local-gc

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

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

commit c937dc7dd62b5efc2e88982b7f0701af7963a4ae
Merge: 303a265... 67e48af...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sun Jun 5 13:58:23 2011 +0100

    Merge commit '67e48af966056fa8d1533f1cb8ea65fba9f2fcf5' into local-gc

 .gitignore                                         |   22 +
 README                                             |   36 +-
 aclocal.m4                                         |   27 -
 bindisttest/ghc.mk                                 |    5 +-
 boot                                               |   13 +-
 boot-pkgs                                          |    4 +
 compiler/cmm/CmmCPS.hs                             |   24 +-
 compiler/cmm/CmmOpt.hs                             |   20 +-
 compiler/cmm/OptimizationFuel.hs                   |   17 +-
 compiler/cmm/PprC.hs                               |   13 +-
 compiler/codeGen/StgCmmClosure.hs                  |    8 +-
 compiler/ghc.mk                                    |    4 -
 compiler/ghci/Linker.lhs                           |   11 +-
 compiler/hsSyn/HsUtils.lhs                         |   83 +-
 compiler/main/CodeOutput.lhs                       |   32 +-
 compiler/main/DriverPhases.hs                      |   22 +-
 compiler/main/DriverPipeline.hs                    |  715 ++++---
 compiler/main/DynFlags.hs                          |   97 +-
 compiler/main/Finder.lhs                           |   20 +-
 compiler/main/GhcMake.hs                           |   47 +-
 compiler/main/HscMain.lhs                          |   32 +-
 compiler/main/HscTypes.lhs                         |   11 +-
 compiler/main/SysTools.lhs                         |   41 +-
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |   85 +-
 compiler/nativeGen/X86/CodeGen.hs                  |   22 +-
 compiler/rename/RnBinds.lhs                        |    4 +-
 compiler/rename/RnExpr.lhs                         |    4 +-
 compiler/simplCore/OccurAnal.lhs                   |    5 +-
 compiler/typecheck/TcRnDriver.lhs                  |    1 +
 compiler/utils/Util.lhs                            |   26 +-
 configure.ac                                       |   17 +
 darcs-all                                          |  437 -----
 docs/users_guide/flags.xml                         |   21 +-
 docs/users_guide/phases.xml                        |   11 -
 docs/users_guide/separate_compilation.xml          |   16 -
 docs/users_guide/using.xml                         |   21 -
 driver/mangler/Makefile                            |   15 -
 driver/mangler/ghc-asm.lprl                        | 2061 --------------------
 driver/mangler/ghc.mk                              |   19 -
 ghc.mk                                             |    1 -
 ghc/InteractiveUI.hs                               |    5 +-
 ghc/Main.hs                                        |    2 +-
 ghc/ghc.mk                                         |    6 +-
 .../Distribution/InstalledPackageInfo/Binary.hs    |    2 +
 libraries/gen_contents_index                       |    2 +-
 mk/config.mk.in                                    |   15 +-
 mk/project.mk.in                                   |    4 +
 mk/tree.mk                                         |    1 -
 packages                                           |   82 +-
 packages.git                                       |   85 -
 rts/Linker.c                                       |  453 +++--
 rules/build-package-way.mk                         |   15 +-
 sync-all                                           |  250 ++-
 53 files changed, 1449 insertions(+), 3543 deletions(-)