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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/28d99e64602856f2cc0a40fc1af219a47cebec9b

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

commit 28d99e64602856f2cc0a40fc1af219a47cebec9b
Merge: 15ccb29... adbd30c...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Feb 12 11:12:28 2013 +0000

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

 aclocal.m4                         |   25 ++-
 compiler/coreSyn/TrieMap.lhs       |   38 +----
 compiler/deSugar/DsMeta.hs         |    6 +-
 compiler/ghc.cabal.in              |    1 +
 compiler/hsSyn/Convert.lhs         |    8 +-
 compiler/hsSyn/HsExpr.lhs-boot     |   19 ++-
 compiler/hsSyn/HsPat.lhs-boot      |    8 +-
 compiler/main/DynFlags.hs          |   15 +-
 compiler/main/PlatformConstants.hs |   12 +
 compiler/nativeGen/PPC/Instr.hs    |  124 ++++++++----
 compiler/nativeGen/X86/Instr.hs    |    6 +-
 compiler/prelude/PrelNames.lhs     |   66 ++++--
 compiler/specialise/Specialise.lhs |  396 ++++++++++++++++++++----------------
 compiler/typecheck/TcDeriv.lhs     |   94 +++++++--
 compiler/typecheck/TcGenDeriv.lhs  |   66 +++++-
 compiler/typecheck/TcInstDcls.lhs  |   39 +++-
 configure.ac                       |   12 +-
 docs/users_guide/flags.xml         |   14 ++
 docs/users_guide/glasgow_exts.xml  |   35 ++--
 docs/users_guide/using.xml         |   18 ++-
 includes/rts/Globals.h             |    2 +
 libraries/random                   |    2 +-
 rts/Globals.c                      |   14 ++
 rts/Linker.c                       |    2 +
 rts/Prelude.h                      |    1 +
 rts/Schedule.c                     |    6 +
 rts/package.conf.in                |    2 +
 sync-all                           |    2 +-
 28 files changed, 676 insertions(+), 357 deletions(-)