Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/69570789166052c90a335dadbfaa8cfc1ad84330 >--------------------------------------------------------------- commit 69570789166052c90a335dadbfaa8cfc1ad84330 Merge: 15ebeea... d7bd9ee... Author: Simon Peyton Jones <[email protected]> Date: Tue Mar 20 09:37:41 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 29 ++++++---- compiler/cmm/PprC.hs | 9 ++- compiler/ghc.mk | 3 +- compiler/typecheck/TcForeign.lhs | 45 ++++++++------- configure.ac | 117 ++++++++++++++++++++++---------------- driver/ghci/ghc.mk | 4 +- driver/utils/cwrapper.c | 6 +- ghc/ghc.mk | 9 +++ includes/Cmm.h | 2 +- includes/HaskellConstants.hs | 6 ++ includes/MachDeps.h | 15 ++--- includes/Rts.h | 7 ++ includes/RtsAPI.h | 2 +- includes/stg/DLL.h | 4 +- mk/config.mk.in | 6 ++ rts/HeapStackCheck.cmm | 10 +++- rts/Interpreter.c | 4 +- rts/Linker.c | 37 +++++++----- rts/PrimOps.cmm | 2 +- rts/RtsMain.c | 4 +- rts/Schedule.c | 2 +- rts/StgCRun.c | 8 +++ rts/StgMiscClosures.cmm | 6 +- rts/ghc.mk | 8 ++- rts/win32/AwaitEvent.c | 4 +- rts/win32/ThrIOManager.c | 2 +- rts/win32/seh_excn.c | 5 +- utils/fingerprint/fingerprint.py | 2 +- 28 files changed, 221 insertions(+), 137 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
