[commit: ghc] ghc-generics: Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics (8419203)
Simon Peyton Jones
simonpj at microsoft.com
Thu Apr 14 11:53:44 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/8419203b7eb5aa4bb13f8d1263632de4d10a4048
>---------------------------------------------------------------
commit 8419203b7eb5aa4bb13f8d1263632de4d10a4048
Merge: 83f16ad... a52ff76...
Author: unknown <simonpj at .europe.corp.microsoft.com>
Date: Wed Apr 13 09:18:39 2011 +0100
Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics
.gitignore | 22 +
README | 36 +-
aclocal.m4 | 52 +-
bindisttest/ghc.mk | 5 +-
boot | 13 +-
boot-pkgs | 4 +
compiler/cmm/CLabel.hs | 71 +-
compiler/cmm/CmmCPS.hs | 24 +-
compiler/cmm/CmmLive.hs | 4 +-
compiler/cmm/CmmNode.hs | 2 +
compiler/cmm/CmmOpt.hs | 20 +-
compiler/cmm/CmmSpillReload.hs | 10 +-
compiler/cmm/OptimizationFuel.hs | 17 +-
compiler/cmm/PprC.hs | 26 +-
compiler/codeGen/CgClosure.lhs | 1 -
compiler/codeGen/CgHpc.hs | 49 +-
compiler/codeGen/CgProf.hs | 53 +-
compiler/codeGen/CodeGen.lhs | 166 +--
compiler/codeGen/StgCmm.hs | 115 +-
compiler/codeGen/StgCmmClosure.hs | 8 +-
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 | 18 +-
compiler/ghci/Linker.lhs | 11 +-
compiler/hsSyn/HsUtils.lhs | 83 +-
compiler/main/CodeOutput.lhs | 32 +-
compiler/main/DriverPhases.hs | 22 +-
compiler/main/DriverPipeline.hs | 741 +++++---
compiler/main/DynFlags.hs | 101 +-
compiler/main/Finder.lhs | 224 +--
compiler/main/GHC.hs | 8 +-
compiler/main/GhcMake.hs | 47 +-
compiler/main/HscMain.lhs | 51 +-
compiler/main/HscTypes.lhs | 23 +-
compiler/main/SysTools.lhs | 43 +-
compiler/main/TidyPgm.lhs | 14 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 85 +-
compiler/nativeGen/X86/CodeGen.hs | 22 +-
compiler/prelude/primops.txt.pp | 6 +
compiler/profiling/ProfInit.hs | 45 +
compiler/rename/RnBinds.lhs | 4 +-
compiler/rename/RnExpr.lhs | 4 +-
compiler/simplCore/OccurAnal.lhs | 5 +-
compiler/typecheck/TcRnDriver.lhs | 1 +
compiler/utils/UniqFM.lhs | 4 +-
compiler/utils/Util.lhs | 26 +-
configure.ac | 18 +
darcs-all | 437 -----
docs/users_guide/ffi-chap.xml | 35 +-
docs/users_guide/flags.xml | 21 +-
docs/users_guide/packages.xml | 1 -
docs/users_guide/phases.xml | 11 -
docs/users_guide/separate_compilation.xml | 16 -
docs/users_guide/using.xml | 21 -
docs/users_guide/win32-dlls.xml | 5 -
driver/mangler/Makefile | 15 -
driver/mangler/ghc-asm.lprl | 2061 --------------------
driver/mangler/ghc.mk | 19 -
ghc.mk | 1 -
ghc/InteractiveUI.hs | 5 +-
ghc/Main.hs | 2 +-
ghc/ghc.mk | 6 +-
ghc/hschooks.c | 1 -
includes/RtsFlags.h | 5 -
includes/RtsOpts.h | 8 +-
includes/rts/Flags.h | 7 -
includes/rts/Hpc.h | 12 +-
includes/stg/MiscClosures.h | 1 +
includes/stg/SMP.h | 3 +-
.../Distribution/InstalledPackageInfo/Binary.hs | 2 +
libraries/gen_contents_index | 2 +-
mk/config.mk.in | 29 +-
mk/project.mk.in | 4 +
mk/tree.mk | 1 -
packages | 82 +-
packages.git | 85 -
rts/Capability.c | 46 +-
rts/Capability.h | 6 +-
rts/Hpc.c | 212 ++-
rts/Linker.c | 454 +++--
rts/Main.c | 8 +-
rts/PrimOps.cmm | 19 +
rts/ProfHeap.c | 2 +-
rts/Profiling.c | 68 +-
rts/Profiling.h | 2 +-
rts/RtsFlags.c | 242 ++-
rts/RtsFlags.h | 23 +
rts/RtsMain.c | 16 +-
rts/RtsMain.h | 2 +-
rts/RtsStartup.c | 89 +-
rts/STM.c | 13 +-
rts/STM.h | 2 +-
rts/Schedule.c | 10 +
rts/Schedule.h | 1 +
rts/Stats.c | 458 +++---
rts/Stats.h | 13 +-
rts/Task.c | 17 +-
rts/Task.h | 3 +
rts/ghc.mk | 1 +
rts/hooks/RtsOptsEnabled.c | 2 +-
rts/sm/Compact.c | 2 +
rts/sm/Evac.c | 1 +
rts/sm/GC.c | 98 +-
rts/sm/GCAux.c | 4 +-
rts/sm/GCTDecl.h | 98 +
rts/sm/GCThread.h | 96 +-
rts/sm/GCUtils.c | 1 +
rts/sm/GCUtils.h | 2 +
rts/sm/MarkWeak.c | 1 +
rules/build-package-way.mk | 15 +-
sync-all | 254 ++-
utils/ghc-pkg/ghc.mk | 6 +-
115 files changed, 2718 insertions(+), 4966 deletions(-)
More information about the Cvs-ghc
mailing list