[commit: ghc] master: Merge win:c:/m64/reg8 (9f611cc)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9f611ccc52afc979535a27e7e954caa9e0b9a5e7

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

commit 9f611ccc52afc979535a27e7e954caa9e0b9a5e7
Merge: bfd8633... 3d8dd48...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Apr 26 19:40:52 2012 +0100

    Merge win:c:/m64/reg8

 compiler/main/DynFlags.hs        |    7 +++++--
 compiler/typecheck/TcForeign.lhs |    5 ++++-
 ghc/hschooks.c                   |    5 +++--
 includes/Rts.h                   |   15 ++++++++++++---
 includes/mkDerivedConstants.c    |    3 ++-
 includes/rts/Hooks.h             |    6 +++---
 includes/rts/Types.h             |    4 ++--
 mk/validate-settings.mk          |   12 +++++++-----
 rts/Capability.c                 |    4 ++--
 rts/Disassembler.c               |   18 +++++++++---------
 rts/Linker.c                     |   32 ++++++++++++++++++++++++--------
 rts/Printer.c                    |   24 ++++++++++++------------
 rts/ProfHeap.c                   |    2 +-
 rts/RtsFlags.c                   |    2 +-
 rts/Stats.c                      |   19 ++++++++++---------
 rts/Stats.h                      |    2 +-
 rts/Task.c                       |    4 ++--
 rts/Ticky.c                      |   26 +++++++++++++-------------
 rts/Trace.c                      |   26 +++++++++++++-------------
 rts/hooks/MallocFail.c           |    2 +-
 rts/hooks/OutOfHeap.c            |    2 +-
 rts/hooks/StackOverflow.c        |    2 +-
 rts/sm/Sanity.c                  |   18 +++++++++---------
 rts/sm/Scav.c                    |    4 ++--
 rts/win32/IOManager.c            |    2 +-
 rts/win32/OSMem.c                |    4 ++--
 rules/build-package-data.mk      |    2 +-
 rules/distdir-way-opts.mk        |    8 +++++++-
 utils/ghc-cabal/ghc.mk           |    2 +-
 utils/ghc-pkg/ghc.mk             |    1 +
 30 files changed, 153 insertions(+), 110 deletions(-)