Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/bbeaec2dc71a89c3aa0b7407c5bd4e5d81f9cfdc >--------------------------------------------------------------- commit bbeaec2dc71a89c3aa0b7407c5bd4e5d81f9cfdc Merge: e3f8557... 26d690a... Author: Simon Peyton Jones <[email protected]> Date: Fri Apr 27 16:28:31 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 2 +- compiler/main/DriverPipeline.hs | 16 +- compiler/main/DynFlags.hs | 7 +- compiler/nativeGen/AsmCodeGen.lhs | 2 +- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 56 ++-- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 14 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 14 +- compiler/nativeGen/TargetReg.hs | 70 ++-- compiler/prelude/primops.txt.pp | 6 + compiler/rename/RnEnv.lhs | 56 ++- compiler/rename/RnSource.lhs | 4 +- compiler/typecheck/TcForeign.lhs | 5 +- compiler/utils/Platform.hs | 12 +- config.guess | 482 ++++++++++---------- configure.ac | 14 + docs/users_guide/using.xml | 21 +- ghc/InteractiveUI.hs | 44 ++- ghc/hschooks.c | 5 +- includes/Rts.h | 37 +-- includes/mkDerivedConstants.c | 3 +- includes/rts/Hooks.h | 6 +- includes/rts/Messages.h | 15 +- includes/rts/Types.h | 6 +- includes/stg/MiscClosures.h | 1 + includes/stg/Types.h | 29 +- mk/validate-settings.mk | 12 +- rts/Capability.c | 4 +- rts/Disassembler.c | 18 +- rts/Linker.c | 33 +- rts/PrimOps.cmm | 16 +- rts/Printer.c | 24 +- rts/ProfHeap.c | 2 +- rts/RtsFlags.c | 2 +- rts/RtsStartup.c | 9 +- rts/Stats.c | 21 +- rts/Stats.h | 11 +- rts/Task.c | 4 +- rts/Ticky.c | 26 +- rts/Trace.c | 26 +- rts/eventlog/EventLog.c | 5 +- rts/eventlog/EventLog.h | 2 +- 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 + 52 files changed, 664 insertions(+), 525 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
