Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-demand-to-merge
http://hackage.haskell.org/trac/ghc/changeset/26284ea13daffdec3a2035b9cd994ccaa09509d6 >--------------------------------------------------------------- commit 26284ea13daffdec3a2035b9cd994ccaa09509d6 Merge: afcff01... 1b02de8... Author: Ilya Sergey <ilya.ser...@cs.kuleuven.be> Date: Tue Oct 30 13:06:27 2012 +0100 Merge branch 'master' into new-demand-to-merge Conflicts: compiler/basicTypes/MkId.lhs compiler/coreSyn/CorePrep.lhs compiler/main/DynFlags.hs compiler/main/TidyPgm.lhs compiler/simplCore/SimplCore.lhs compiler/simplCore/SimplUtils.lhs compiler/stranal/DmdAnal.lhs .gitignore | 43 - aclocal.m4 | 7 +- compiler/basicTypes/BasicTypes.lhs | 26 + compiler/basicTypes/DataCon.lhs | 75 +- compiler/basicTypes/DataCon.lhs-boot | 2 + compiler/basicTypes/IdInfo.lhs | 2 +- compiler/basicTypes/Literal.lhs | 52 +- compiler/basicTypes/MkId.lhs | 23 +- compiler/basicTypes/Name.lhs | 31 +- compiler/basicTypes/OccName.lhs | 63 +- compiler/basicTypes/RdrName.lhs | 21 +- compiler/basicTypes/Var.lhs | 4 +- compiler/basicTypes/VarEnv.lhs | 3 + compiler/cmm/Bitmap.hs | 53 +- compiler/cmm/CLabel.hs | 46 +- compiler/cmm/Cmm.hs | 7 +- compiler/cmm/CmmBuildInfoTables.hs | 77 +- compiler/cmm/CmmCallConv.hs | 146 +- compiler/cmm/CmmContFlowOpt.hs | 12 +- compiler/cmm/CmmCvt.hs | 31 +- compiler/cmm/CmmExpr.hs | 174 +-- compiler/cmm/CmmInfo.hs | 86 +- compiler/cmm/CmmLayoutStack.hs | 182 ++-- compiler/cmm/CmmLex.x | 16 +- compiler/cmm/CmmLint.hs | 76 +- compiler/cmm/CmmMachOp.hs | 162 ++- compiler/cmm/CmmNode.hs | 55 +- compiler/cmm/CmmOpt.hs | 387 +---- compiler/cmm/CmmParse.y | 1610 +++++++++++--------- compiler/cmm/CmmPipeline.hs | 71 +- compiler/cmm/CmmProcPoint.hs | 73 +- compiler/cmm/CmmRewriteAssignments.hs | 49 +- compiler/cmm/CmmSink.hs | 210 ++- compiler/cmm/CmmType.hs | 112 +- compiler/cmm/CmmUtils.hs | 345 +++-- compiler/cmm/MkGraph.hs | 180 ++- compiler/cmm/OldCmm.hs | 14 +- compiler/cmm/OldCmmLint.hs | 117 +- compiler/cmm/OldCmmUtils.hs | 17 +- compiler/cmm/OldPprCmm.hs | 15 +- compiler/cmm/PprC.hs | 214 ++-- compiler/cmm/PprCmm.hs | 20 +- compiler/cmm/PprCmmDecl.hs | 11 +- compiler/cmm/PprCmmExpr.hs | 10 +- compiler/cmm/SMRep.lhs | 193 ++- compiler/codeGen/CgBindery.lhs | 557 ------- compiler/codeGen/CgBindery.lhs-boot | 11 - compiler/codeGen/CgCallConv.hs | 407 ----- compiler/codeGen/CgCase.lhs | 670 -------- compiler/codeGen/CgClosure.lhs | 640 -------- compiler/codeGen/CgCon.lhs | 490 ------ compiler/codeGen/CgExpr.lhs | 494 ------ compiler/codeGen/CgExpr.lhs-boot | 7 - compiler/codeGen/CgExtCode.hs | 241 --- compiler/codeGen/CgForeignCall.hs | 319 ---- compiler/codeGen/CgHeapery.lhs | 640 -------- compiler/codeGen/CgHpc.hs | 39 - compiler/codeGen/CgInfoTbls.hs | 372 ----- compiler/codeGen/CgLetNoEscape.lhs | 214 --- compiler/codeGen/CgMonad.lhs | 849 ----------- compiler/codeGen/CgParallel.hs | 102 -- compiler/codeGen/CgPrimOp.hs | 1155 -------------- compiler/codeGen/CgProf.hs | 328 ---- compiler/codeGen/CgStackery.lhs | 365 ----- compiler/codeGen/CgTailCall.lhs | 508 ------ compiler/codeGen/CgTicky.hs | 398 ----- compiler/codeGen/CgUtils.hs | 899 +---------- compiler/codeGen/ClosureInfo.lhs | 1120 -------------- compiler/codeGen/ClosureInfo.lhs-boot | 6 - compiler/codeGen/CodeGen.lhs | 235 --- compiler/codeGen/CodeGen/Platform.hs | 46 +- compiler/codeGen/CodeGen/Platform/ARM.hs | 2 - compiler/codeGen/CodeGen/Platform/NoRegs.hs | 2 - compiler/codeGen/CodeGen/Platform/PPC.hs | 2 - compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs | 2 - compiler/codeGen/CodeGen/Platform/SPARC.hs | 2 - compiler/codeGen/CodeGen/Platform/X86.hs | 2 - compiler/codeGen/CodeGen/Platform/X86_64.hs | 2 - compiler/codeGen/StgCmm.hs | 22 +- compiler/codeGen/StgCmmBind.hs | 91 +- compiler/codeGen/StgCmmClosure.hs | 60 +- compiler/codeGen/StgCmmCon.hs | 58 +- compiler/codeGen/StgCmmEnv.hs | 63 +- compiler/codeGen/StgCmmExpr.hs | 78 +- compiler/codeGen/StgCmmExtCode.hs | 224 +++ compiler/codeGen/StgCmmForeign.hs | 160 +- compiler/codeGen/StgCmmGran.hs | 8 +- compiler/codeGen/StgCmmHeap.hs | 259 ++-- compiler/codeGen/StgCmmHpc.hs | 23 +- compiler/codeGen/StgCmmLayout.hs | 158 +-- compiler/codeGen/StgCmmMonad.hs | 174 ++- compiler/codeGen/StgCmmPrim.hs | 890 ++++++------ compiler/codeGen/StgCmmProf.hs | 216 ++-- compiler/codeGen/StgCmmTicky.hs | 63 +- compiler/codeGen/StgCmmUtils.hs | 198 ++-- compiler/coreSyn/CoreArity.lhs | 6 +- compiler/coreSyn/CoreLint.lhs | 16 +- compiler/coreSyn/CorePrep.lhs | 62 +- compiler/coreSyn/CoreSubst.lhs | 2 +- compiler/coreSyn/CoreSyn.lhs | 27 +- compiler/coreSyn/CoreUnfold.lhs | 120 +- compiler/coreSyn/CoreUtils.lhs | 57 +- compiler/coreSyn/ExternalCore.lhs | 3 + compiler/coreSyn/MkCore.lhs | 17 +- compiler/coreSyn/MkExternalCore.lhs | 10 +- compiler/coreSyn/PprCore.lhs | 59 +- compiler/coreSyn/PprExternalCore.lhs | 4 + compiler/coreSyn/TrieMap.lhs | 131 ++- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/Coverage.lhs | 102 +- compiler/deSugar/Desugar.lhs | 9 +- compiler/deSugar/DsArrows.lhs | 120 +- compiler/deSugar/DsBinds.lhs | 49 +- compiler/deSugar/DsCCall.lhs | 29 +- compiler/deSugar/DsExpr.lhs | 25 +- compiler/deSugar/DsForeign.lhs | 44 +- compiler/deSugar/DsGRHSs.lhs | 22 +- compiler/deSugar/DsListComp.lhs | 42 +- compiler/deSugar/DsMeta.hs | 195 ++-- compiler/deSugar/DsMonad.lhs | 4 +- compiler/deSugar/DsUtils.lhs | 42 +- compiler/deSugar/Match.lhs | 40 +- compiler/deSugar/Match.lhs-boot | 4 +- compiler/deSugar/MatchCon.lhs | 6 +- compiler/deSugar/MatchLit.lhs | 45 +- compiler/ghc.cabal.in | 30 +- compiler/ghc.mk | 140 +- compiler/ghci/ByteCodeAsm.lhs | 107 +- compiler/ghci/ByteCodeGen.lhs | 247 ++-- compiler/ghci/ByteCodeInstr.lhs | 8 +- compiler/ghci/ByteCodeItbls.lhs | 64 +- compiler/ghci/ByteCodeLink.lhs | 39 +- compiler/ghci/Debugger.hs | 8 +- compiler/ghci/DebuggerUtils.hs | 19 +- compiler/ghci/LibFFI.hsc | 21 +- compiler/ghci/Linker.lhs | 236 ++-- compiler/ghci/RtClosureInspect.hs | 27 +- compiler/hsSyn/Convert.lhs | 18 +- compiler/hsSyn/HsBinds.lhs | 20 +- compiler/hsSyn/HsDecls.lhs | 5 +- compiler/hsSyn/HsExpr.lhs | 555 ++++--- compiler/hsSyn/HsExpr.lhs-boot | 28 +- compiler/hsSyn/HsUtils.lhs | 76 +- compiler/iface/BinIface.hs | 30 +- compiler/iface/BuildTyCl.lhs | 12 +- compiler/iface/FlagChecker.hs | 2 +- compiler/iface/IfaceSyn.lhs | 37 +- compiler/iface/IfaceType.lhs | 5 +- compiler/iface/LoadIface.lhs | 2 +- compiler/iface/MkIface.lhs | 46 +- compiler/iface/TcIface.lhs | 45 +- compiler/llvmGen/Llvm/Types.hs | 34 +- compiler/llvmGen/LlvmCodeGen.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 53 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 168 ++- compiler/llvmGen/LlvmCodeGen/Data.hs | 22 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 68 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 17 +- compiler/main/BreakArray.hs | 46 +- compiler/main/CmdLineParser.hs | 10 + compiler/main/CodeOutput.lhs | 4 +- compiler/main/Constants.lhs | 27 +- compiler/main/DriverPhases.hs | 41 +- compiler/main/DriverPipeline.hs | 288 +--- compiler/main/DynFlags.hs | 897 ++++++++---- compiler/main/DynFlags.hs-boot | 2 - compiler/main/ErrUtils.lhs | 67 +- compiler/main/Finder.lhs | 2 +- compiler/main/GHC.hs | 14 +- compiler/main/GhcMake.hs | 12 +- compiler/main/HeaderInfo.hs | 2 +- compiler/main/HscMain.hs | 104 +- compiler/main/HscTypes.lhs | 58 +- compiler/main/InteractiveEval.hs | 11 +- compiler/main/Packages.lhs | 25 +- compiler/main/PprTyThing.hs | 14 +- compiler/main/StaticFlagParser.hs | 78 +- compiler/main/StaticFlags.hs | 400 +----- compiler/main/SysTools.lhs | 189 +++- compiler/main/TidyPgm.lhs | 87 +- compiler/nativeGen/AsmCodeGen.lhs | 124 +- compiler/nativeGen/Instruction.hs | 18 +- compiler/nativeGen/PIC.hs | 523 ++++--- compiler/nativeGen/PPC/CodeGen.hs | 106 +- compiler/nativeGen/PPC/Instr.hs | 54 +- compiler/nativeGen/PPC/Ppr.hs | 40 +- compiler/nativeGen/PPC/Regs.hs | 516 ++----- compiler/nativeGen/RegAlloc/Graph/Main.hs | 8 +- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 386 +++--- compiler/nativeGen/RegAlloc/Linear/Base.hs | 10 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 44 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 434 +++--- compiler/nativeGen/RegAlloc/Linear/Main.hs | 247 ++-- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 5 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 25 +- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 43 +- compiler/nativeGen/RegAlloc/Linear/State.hs | 121 +- compiler/nativeGen/RegAlloc/Linear/X86/FreeRegs.hs | 27 +- .../RegAlloc/Linear/{X86 => X86_64}/FreeRegs.hs | 30 +- compiler/nativeGen/RegAlloc/Liveness.hs | 22 +- compiler/nativeGen/SPARC/Base.hs | 6 +- compiler/nativeGen/SPARC/CodeGen.hs | 43 +- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 20 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 5 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 15 +- compiler/nativeGen/SPARC/Imm.hs | 4 +- compiler/nativeGen/SPARC/Instr.hs | 34 +- compiler/nativeGen/SPARC/Ppr.hs | 40 +- compiler/nativeGen/SPARC/RegPlate.hs | 318 ---- compiler/nativeGen/SPARC/Regs.hs | 130 +-- compiler/nativeGen/SPARC/Stack.hs | 15 +- compiler/nativeGen/X86/CodeGen.hs | 390 +++--- compiler/nativeGen/X86/Cond.hs | 69 +- compiler/nativeGen/X86/Instr.hs | 174 ++- compiler/nativeGen/X86/Ppr.hs | 10 +- compiler/nativeGen/X86/Regs.hs | 310 +---- compiler/parser/Lexer.x | 20 +- compiler/parser/Parser.y.pp | 84 +- compiler/parser/RdrHsSyn.lhs | 99 ++- compiler/prelude/ForeignCall.lhs | 11 +- compiler/prelude/PrelNames.lhs | 13 + compiler/prelude/PrelNames.lhs-boot | 9 + compiler/prelude/PrelRules.lhs | 527 ++++--- compiler/prelude/TysPrim.lhs | 19 +- compiler/prelude/TysWiredIn.lhs | 6 +- compiler/prelude/primops.txt.pp | 19 +- compiler/profiling/ProfInit.hs | 2 +- compiler/profiling/SCCfinal.lhs | 4 +- compiler/rename/RnBinds.lhs | 120 +- compiler/rename/RnEnv.lhs | 94 +- compiler/rename/RnExpr.lhs | 412 +++--- compiler/rename/RnExpr.lhs-boot | 16 +- compiler/rename/RnNames.lhs | 206 ++- compiler/rename/RnPat.lhs | 6 +- compiler/rename/RnSource.lhs | 479 +++--- compiler/rename/RnTypes.lhs | 12 +- compiler/simplCore/CoreMonad.lhs | 30 +- compiler/simplCore/FloatIn.lhs | 105 +- compiler/simplCore/FloatOut.lhs | 2 +- compiler/simplCore/LiberateCase.lhs | 13 +- compiler/simplCore/OccurAnal.lhs | 335 ++--- compiler/simplCore/SimplCore.lhs | 28 +- compiler/simplCore/SimplEnv.lhs | 418 +++--- compiler/simplCore/SimplMonad.lhs | 83 +- compiler/simplCore/SimplUtils.lhs | 962 ++++++------ compiler/simplCore/Simplify.lhs | 85 +- compiler/simplStg/SRT.lhs | 165 -- compiler/simplStg/SimplStg.lhs | 116 +- compiler/simplStg/UnariseStg.lhs | 152 ++- compiler/specialise/Rules.lhs | 36 +- compiler/specialise/SpecConstr.lhs | 8 +- compiler/specialise/Specialise.lhs | 45 +- compiler/stgSyn/CoreToStg.lhs | 13 +- compiler/stgSyn/StgSyn.lhs | 18 +- compiler/stranal/DmdAnal.lhs | 194 ++- compiler/stranal/WorkWrap.lhs | 10 +- compiler/typecheck/FamInst.lhs | 5 +- compiler/typecheck/Inst.lhs | 223 ++-- compiler/typecheck/TcArrows.lhs | 105 +- compiler/typecheck/TcBinds.lhs | 160 ++- compiler/typecheck/TcCanonical.lhs | 945 +++++------- compiler/typecheck/TcClassDcl.lhs | 27 +- compiler/typecheck/TcDeriv.lhs | 1038 +++++++------- compiler/typecheck/TcEnv.lhs | 24 +- compiler/typecheck/TcErrors.lhs | 966 +++++++------ compiler/typecheck/TcEvidence.lhs | 102 +- compiler/typecheck/TcExpr.lhs | 45 +- compiler/typecheck/TcForeign.lhs | 1 - compiler/typecheck/TcGenDeriv.lhs | 1139 +++++++------- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/typecheck/TcHsSyn.lhs | 273 ++-- compiler/typecheck/TcHsType.lhs | 297 +++-- compiler/typecheck/TcInstDcls.lhs | 74 +- compiler/typecheck/TcInteract.lhs | 899 ++++++------ compiler/typecheck/TcMType.lhs | 292 +++- compiler/typecheck/TcMatches.lhs | 141 +- compiler/typecheck/TcMatches.lhs-boot | 11 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 116 +- compiler/typecheck/TcRnMonad.lhs | 139 +- compiler/typecheck/TcRnTypes.lhs | 403 +++--- compiler/typecheck/TcRules.lhs | 42 +- compiler/typecheck/TcSMonad.lhs | 1271 ++++++++-------- compiler/typecheck/TcSimplify.lhs | 1247 ++++++---------- compiler/typecheck/TcSplice.lhs | 43 +- compiler/typecheck/TcSplice.lhs-boot | 2 +- compiler/typecheck/TcTyClsDecls.lhs | 104 +- compiler/typecheck/TcTyDecls.lhs | 16 +- compiler/typecheck/TcType.lhs | 302 +++- compiler/typecheck/TcUnify.lhs | 434 +++--- compiler/typecheck/TcUnify.lhs-boot | 3 +- compiler/types/Coercion.lhs | 46 +- compiler/types/FamInstEnv.lhs | 209 ++-- compiler/types/InstEnv.lhs | 5 + compiler/types/Kind.lhs | 2 +- compiler/types/OptCoercion.lhs | 79 +- compiler/types/TyCon.lhs | 117 +- compiler/types/Type.lhs | 50 +- compiler/types/TypeRep.lhs | 15 +- compiler/utils/Bag.lhs | 1 + compiler/utils/Outputable.lhs | 8 +- compiler/utils/Platform.hs | 4 + compiler/utils/Serialized.hs | 10 + compiler/utils/UniqFM.lhs | 5 +- compiler/utils/Util.lhs | 29 +- compiler/vectorise/Vectorise/Exp.hs | 12 +- compiler/vectorise/Vectorise/Monad/Base.hs | 2 +- compiler/vectorise/Vectorise/Type/Env.hs | 6 +- compiler/vectorise/Vectorise/Utils/Base.hs | 5 +- distrib/MacFrameworks/Makefile | 31 - distrib/MacFrameworks/README | 13 - distrib/MacFrameworks/build-framework-gmp.sh | 48 - distrib/MacFrameworks/build-framework-readline.sh | 63 - distrib/MacOS/English.lproj/InfoPlist.strings | Bin 136 -> 0 bytes .../MacOS/GHC-relocatable.pmdoc/01ghc-contents.xml | 1 - distrib/MacOS/GHC-relocatable.pmdoc/01ghc.xml | 1 - distrib/MacOS/GHC-relocatable.pmdoc/index.xml | 21 - distrib/MacOS/GHC-system.pmdoc/01ghc.xml | 1 - distrib/MacOS/GHC-system.pmdoc/index.xml.in | 31 - distrib/MacOS/GHC.xcodeproj/project.pbxproj | 310 ---- distrib/MacOS/Info.plist | 28 - distrib/MacOS/installer-docs/lambda-logo.png | Bin 10511 -> 0 bytes distrib/MacOS/installer-docs/license.html | 244 --- distrib/MacOS/installer-scripts/Uninstaller.in | 91 -- distrib/MacOS/installer-scripts/create-links.in | 38 - distrib/MacOS/installer-scripts/relocate | 14 - distrib/MacOS/mkinstaller | 105 -- distrib/configure.ac.in | 2 +- distrib/cvs-build | 137 -- distrib/fake-happy | 20 - distrib/prep-bin-dist-mingw | 203 --- distrib/prep-bin-dist-mingw-alex | 32 - distrib/prep-bin-dist-mingw-args | 33 - distrib/prep-bin-dist-mingw-greencard | 33 - distrib/prep-bin-dist-mingw-haddock | 32 - distrib/prep-bin-dist-mingw-happy | 32 - distrib/prep-bin-dist-mingw-hdirect | 36 - docs/users_guide/ffi-chap.xml | 2 +- docs/users_guide/flags.xml | 40 +- docs/users_guide/ghci.xml | 29 +- docs/users_guide/glasgow_exts.xml | 44 +- docs/users_guide/using.xml | 35 +- driver/ghci/ghc.mk | 1 + ghc.mk | 140 ++- ghc/InteractiveUI.hs | 96 +- ghc/Main.hs | 28 +- ghc/ghc-bin.cabal.in | 2 +- ghc/ghc.mk | 22 +- ghc/hschooks.c | 2 +- includes/Cmm.h | 300 +++- includes/CodeGen.Platform.hs | 585 +++++++- includes/HaskellConstants.hs | 207 --- includes/Rts.h | 1 - includes/ghc.mk | 69 +- includes/mkDerivedConstants.c | 873 ++++++++---- includes/rts/Constants.h | 24 - includes/rts/EventLogFormat.h | 6 +- includes/rts/Flags.h | 1 + includes/rts/Hooks.h | 6 +- includes/rts/SpinLock.h | 2 +- includes/rts/Threads.h | 8 +- includes/rts/Types.h | 6 +- includes/rts/storage/Block.h | 4 +- includes/rts/storage/ClosureMacros.h | 111 +- includes/rts/storage/ClosureTypes.h | 55 +- includes/rts/storage/Closures.h | 56 +- includes/rts/storage/GC.h | 13 +- includes/rts/storage/Liveness.h | 34 - includes/rts/storage/MBlock.h | 6 +- includes/rts/storage/SMPClosureOps.h | 2 +- includes/stg/MiscClosures.h | 64 +- includes/stg/Regs.h | 331 +---- includes/stg/RtsMachRegs.h | 6 + includes/stg/Types.h | 18 +- mk/build.mk.sample | 6 +- mk/config.mk.in | 22 +- mk/validate-settings.mk | 13 +- mk/ways.mk | 45 +- rts/Apply.cmm | 72 +- rts/Arena.c | 2 +- rts/AutoApply.h | 8 +- rts/Capability.c | 2 +- rts/Capability.h | 2 +- rts/ClosureFlags.c | 5 +- rts/Disassembler.c | 2 +- rts/Exception.cmm | 238 ++-- rts/FrontPanel.c | 2 +- rts/FrontPanel.h | 2 +- rts/GetTime.h | 2 +- rts/HeapStackCheck.cmm | 510 +++---- rts/Interpreter.c | 64 +- rts/LdvProfile.c | 1 - rts/Linker.c | 660 +++++---- rts/Messages.c | 10 +- rts/PrimOps.cmm | 1188 +++++++-------- rts/Printer.c | 70 +- rts/ProfHeap.c | 2 +- rts/Profiling.c | 8 +- rts/RaiseAsync.c | 4 +- rts/RetainerProfile.c | 33 +- rts/RetainerProfile.h | 2 +- rts/RtsAPI.c | 6 +- rts/RtsFlags.c | 17 +- rts/RtsProbes.d | 1 + rts/RtsUtils.c | 2 +- rts/Schedule.c | 51 +- rts/Schedule.h | 28 +- rts/Stats.c | 44 +- rts/Stats.h | 4 +- rts/StgMiscClosures.cmm | 126 +- rts/StgStartup.cmm | 56 +- rts/StgStdThunks.cmm | 305 ++-- rts/Threads.c | 16 +- rts/Threads.h | 2 +- rts/Timer.c | 27 +- rts/Trace.c | 95 +- rts/Trace.h | 54 +- rts/Updates.cmm | 97 +- rts/Updates.h | 17 +- rts/eventlog/EventLog.c | 43 +- rts/eventlog/EventLog.h | 22 +- rts/ghc.mk | 17 +- rts/hooks/MallocFail.c | 4 +- rts/hooks/OutOfHeap.c | 4 +- rts/hooks/StackOverflow.c | 4 +- rts/package.conf.in | 4 +- rts/parallel/ParTicky.c | 4 +- rts/posix/GetTime.c | 2 +- rts/posix/Itimer.c | 3 + rts/posix/OSMem.c | 16 +- rts/posix/OSThreads.c | 6 +- rts/posix/Select.c | 15 +- rts/sm/BlockAlloc.c | 86 +- rts/sm/BlockAlloc.h | 12 +- rts/sm/Compact.c | 54 +- rts/sm/Evac.c | 21 +- rts/sm/Evac.h | 2 +- rts/sm/GC.c | 59 +- rts/sm/GCAux.c | 2 +- rts/sm/GCThread.h | 18 +- rts/sm/GCUtils.c | 2 +- rts/sm/MBlock.c | 6 +- rts/sm/MarkWeak.c | 4 +- rts/sm/OSMem.h | 4 +- rts/sm/Sanity.c | 63 +- rts/sm/Scav.c | 34 +- rts/sm/Storage.c | 98 +- rts/sm/Storage.h | 30 +- rts/sm/Sweep.c | 2 +- rts/win32/GetTime.c | 2 +- rts/win32/OSMem.c | 30 +- rules/build-dependencies.mk | 4 +- rules/build-package-data.mk | 15 +- rules/build-package-way.mk | 20 +- rules/build-package.mk | 11 + rules/build-prog.mk | 108 +- rules/haddock.mk | 6 +- rules/hs-suffix-rules-srcdir.mk | 6 + rules/{trace.mk => library-path.mk} | 16 +- rules/shell-wrapper.mk | 76 +- sync-all | 7 +- utils/compare_sizes/ghc.mk | 1 + utils/genapply/GenApply.hs | 14 +- utils/genapply/ghc.mk | 1 + utils/genprimopcode/ghc.mk | 1 + utils/ghc-cabal/Main.hs | 155 ++- utils/ghc-cabal/ghc-cabal.cabal | 3 +- utils/ghc-cabal/ghc.mk | 1 + utils/ghc-pkg/Main.hs | 47 +- utils/ghc-pkg/ghc-pkg.cabal | 2 +- utils/ghc-pkg/ghc.mk | 6 +- utils/ghc-pwd/ghc-pwd.cabal | 2 +- utils/ghc-pwd/ghc.mk | 2 + utils/ghctags/Main.hs | 2 +- utils/ghctags/ghc.mk | 9 +- utils/ghctags/ghctags.cabal | 22 + utils/hp2ps/ghc.mk | 15 +- utils/hpc/ghc.mk | 11 +- utils/hpc/hpc-bin.cabal | 13 +- utils/mkUserGuidePart/ghc.mk | 9 +- .../mkUserGuidePart.cabal} | 8 +- utils/runghc/ghc.mk | 3 +- utils/runghc/runghc.cabal.in | 2 +- utils/unlit/ghc.mk | 1 + validate | 23 +- 486 files changed, 22400 insertions(+), 33347 deletions(-) Diff suppressed because of size. To see it, use: git show 26284ea13daffdec3a2035b9cd994ccaa09509d6 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
