[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (5c0e032)

[Iavor Diatchki]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/5c0e0323d727c123e1818522b61dc3ede8be0814

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

commit 5c0e0323d727c123e1818522b61dc3ede8be0814
Merge: 463a77c 2bdc4fd
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Mar 3 14:43:25 2013 -0800

    Merge remote-tracking branch 'origin/master' into type-nats

 aclocal.m4                                    |   2 +-
 bindisttest/ghc.mk                            |   2 +-
 boot                                          |   5 +-
 compiler/ghc.mk                               |  66 ++---
 compiler/ghci/Linker.lhs                      |  31 +-
 compiler/hsSyn/HsDecls.lhs                    |  18 +-
 compiler/hsSyn/HsExpr.lhs                     |   4 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs           |   3 +
 compiler/main/CodeOutput.lhs                  |   7 +-
 compiler/main/DriverPipeline.hs               | 265 +++++++++--------
 compiler/main/DynFlags.hs                     |   6 +-
 compiler/main/HscMain.hs                      |  28 +-
 compiler/parser/Lexer.x                       |   7 +-
 compiler/rename/RnSource.lhs                  |   3 +-
 compiler/simplCore/CoreMonad.lhs              |   4 +-
 compiler/stgSyn/StgSyn.lhs                    |   2 +-
 compiler/typecheck/TcDeriv.lhs                |   2 +-
 compiler/utils/Platform.hs                    |  13 +-
 configure.ac                                  |  21 +-
 driver/ghc/ghc.mk                             |   2 +-
 driver/ghci/ghc.mk                            |   6 +-
 driver/haddock/ghc.mk                         |   2 +-
 driver/split/ghc.mk                           |   3 +-
 ghc.mk                                        | 402 ++++++++++++--------------
 ghc/ghc.mk                                    |   6 +-
 includes/Cmm.h                                |   8 +-
 includes/rts/prof/CCS.h                       |   2 +-
 includes/rts/storage/SMPClosureOps.h          |   4 +-
 libraries/bin-package-db/bin-package-db.cabal |   2 +-
 libraries/binary                              |   2 +-
 libraries/random                              |   2 +-
 mk/config.mk.in                               | 112 ++-----
 mk/project.mk.in                              |  13 +-
 mk/tree.mk                                    |  19 --
 mk/validate-settings.mk                       |   8 +-
 rts/ProfHeap.c                                |   2 +-
 rts/StgCRun.c                                 |  10 +-
 rts/Updates.h                                 |   4 +-
 rts/ghc.mk                                    |   8 +-
 rts/posix/OSThreads.c                         |   4 +-
 rules/build-dependencies.mk                   |   2 +-
 rules/build-package-data.mk                   |   6 +-
 rules/build-perl.mk                           |  14 +-
 rules/build-prog.mk                           |  20 +-
 rules/distdir-opts.mk                         |   5 +-
 rules/extra-packages.mk                       |  48 ---
 rules/foreachLibrary.mk                       |  43 +++
 rules/haddock.mk                              |   9 +-
 rules/hs-suffix-rules-srcdir.mk               |   4 +-
 rules/manual-package-config.mk                |   4 +-
 rules/package-config.mk                       |   4 +-
 rules/pretty_commands.mk                      |   2 +-
 utils/genapply/ghc.mk                         |   2 +-
 utils/genprimopcode/ghc.mk                    |   2 +-
 utils/ghc-cabal/ghc.mk                        |  34 ++-
 utils/ghc-pkg/ghc.mk                          |   4 +-
 utils/runghc/ghc.mk                           |   2 +-
 utils/touchy/ghc.mk                           |   2 +-
 utils/unlit/ghc.mk                            |   2 +-
 59 files changed, 598 insertions(+), 721 deletions(-)