Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : local-gc
http://hackage.haskell.org/trac/ghc/changeset/0295e399b7408f3d7ba905d109e353472b8a2d05 >--------------------------------------------------------------- commit 0295e399b7408f3d7ba905d109e353472b8a2d05 Merge: 2385841... a52ff76... Author: Simon Marlow <[email protected]> Date: Sun Jun 5 14:34:30 2011 +0100 Merge commit 'a52ff7619e8b7d74a9d933d922eeea49f580bca8' into local-gc aclocal.m4 | 25 +++++ compiler/cmm/CLabel.hs | 71 +------------ compiler/cmm/PprC.hs | 13 ++- compiler/codeGen/CgHpc.hs | 49 +--------- compiler/codeGen/CgProf.hs | 53 +---------- compiler/codeGen/CodeGen.lhs | 166 ++++--------------------------- compiler/codeGen/StgCmm.hs | 115 ++++----------------- compiler/codeGen/StgCmmHpc.hs | 41 +------- compiler/codeGen/StgCmmProf.hs | 58 +---------- compiler/deSugar/Coverage.lhs | 57 ++++++++++- compiler/deSugar/Desugar.lhs | 6 +- compiler/ghc.cabal.in | 1 + compiler/ghc.mk | 2 + compiler/main/DriverPipeline.hs | 38 ++++++- compiler/main/GHC.hs | 8 +- compiler/main/HscMain.lhs | 19 ++-- compiler/main/HscTypes.lhs | 12 +- compiler/main/TidyPgm.lhs | 14 +-- compiler/profiling/ProfInit.hs | 45 ++++++++ configure.ac | 1 + docs/users_guide/ffi-chap.xml | 35 +------ docs/users_guide/packages.xml | 1 - docs/users_guide/win32-dlls.xml | 5 - includes/rts/Hpc.h | 12 +- mk/config.mk.in | 4 + rts/Hpc.c | 212 +++++++++++++++++++++++---------------- rts/Main.c | 8 +-- rts/ProfHeap.c | 2 +- rts/Profiling.c | 68 +++++-------- rts/Profiling.h | 2 +- rts/RtsMain.c | 16 +-- rts/RtsMain.h | 2 +- rts/RtsStartup.c | 85 +++------------- 33 files changed, 448 insertions(+), 798 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
