[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (530e081)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/530e081362b2d95bdc073c68ab1caccaac778f78

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

commit 530e081362b2d95bdc073c68ab1caccaac778f78
Merge: 65fc37a... 7a4063e...
Author: Ian Lynagh <igloo at earth.li>
Date:   Mon Jun 27 16:48:34 2011 +0100

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

 compiler/main/DriverPipeline.hs                    |   15 +++++-
 compiler/nativeGen/AsmCodeGen.lhs                  |    2 +
 compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs |    4 ++
 compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs     |    1 +
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |    1 +
 compiler/nativeGen/TargetReg.hs                    |    5 ++
 compiler/nativeGen/X86/CodeGen.hs                  |   15 ++----
 compiler/nativeGen/X86/RegInfo.hs                  |    1 +
 compiler/utils/Platform.hs                         |    4 ++
 rts/StgCRun.c                                      |   54 +++++++++++---------
 utils/fingerprint/fingerprint.py                   |    2 +-
 11 files changed, 67 insertions(+), 37 deletions(-)