[commit: ghc] master: Merge branch 'ghc-parmake-gsoc' (#910) (9c18ad7)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9c18ad7475bdc5bd5684a702c2d575ef9dd86fe1/ghc

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

commit 9c18ad7475bdc5bd5684a702c2d575ef9dd86fe1
Merge: c62a0b9 783ca39
Author: Patrick Palka <patrick at parcs.ath.cx>
Date:   Mon Sep 9 16:28:02 2013 -0400

    Merge branch 'ghc-parmake-gsoc' (#910)



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

9c18ad7475bdc5bd5684a702c2d575ef9dd86fe1
 compiler/basicTypes/UniqSupply.lhs |    5 +-
 compiler/cbits/genSym.c            |    8 +
 compiler/ghc.mk                    |    6 +
 compiler/main/DynFlags.hs          |   19 +-
 compiler/main/GhcMake.hs           |  457 +++++++++++++++++++++++++++++++++++-
 compiler/main/SysTools.lhs         |  103 ++++----
 compiler/main/TidyPgm.lhs          |   10 +-
 compiler/typecheck/TcEnv.lhs       |    9 +-
 compiler/typecheck/TcRnMonad.lhs   |    6 +-
 compiler/utils/Binary.hs           |   49 +---
 compiler/utils/FastString.lhs      |  188 ++++++++-------
 ghc/InteractiveUI.hs               |   16 +-
 ghc/Main.hs                        |    4 +-
 rts/PrimOps.cmm                    |    5 +
 14 files changed, 682 insertions(+), 203 deletions(-)