Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ca7c3a0e1aba18379548b76775181bf464214ae3 >--------------------------------------------------------------- commit ca7c3a0e1aba18379548b76775181bf464214ae3 Merge: 27e3bd8... ee8bf69... Author: Simon Peyton Jones <[email protected]> Date: Thu Mar 22 21:01:39 2012 +0000 Merge branch 'master' of http://darcs.haskell.org//ghc aclocal.m4 | 29 ++- compiler/cmm/PprC.hs | 9 +- compiler/coreSyn/CoreLint.lhs | 17 +- compiler/coreSyn/CoreSyn.lhs | 4 +- compiler/coreSyn/CoreUtils.lhs | 90 ++++++- compiler/deSugar/DsMeta.hs | 110 ++++---- compiler/deSugar/DsMonad.lhs | 5 +- compiler/ghc.mk | 3 +- compiler/ghci/Linker.lhs | 563 ++++++++++++++++++------------------- compiler/ghci/ObjLink.lhs | 39 +-- compiler/nativeGen/X86/CodeGen.hs | 78 +++++- compiler/nativeGen/X86/Regs.hs | 38 ++- compiler/simplCore/SetLevels.lhs | 3 +- compiler/simplCore/SimplUtils.lhs | 100 +------ compiler/simplCore/Simplify.lhs | 2 + 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 | 25 ++ includes/RtsAPI.h | 2 +- includes/mkDerivedConstants.c | 20 +- includes/stg/DLL.h | 4 +- mk/config.mk.in | 6 + rts/Adjustor.c | 441 +++++++++++++++++++---------- 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 | 40 ++- rts/StgMiscClosures.cmm | 6 +- rts/Trace.c | 2 + rts/ghc.mk | 7 +- rts/win32/AwaitEvent.c | 4 +- rts/win32/ThrIOManager.c | 2 +- rts/win32/seh_excn.c | 5 +- utils/fingerprint/fingerprint.py | 2 +- utils/hp2ps/Key.c | 22 ++- 44 files changed, 1123 insertions(+), 818 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
