Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/464ce12091c8fb86d87faa83b9aab031c91c3a1f >--------------------------------------------------------------- commit 464ce12091c8fb86d87faa83b9aab031c91c3a1f Merge: 70128bd... 1edad87... Author: Thijs Alkemade <[email protected]> Date: Wed Aug 8 11:56:46 2012 +0200 Merge https://github.com/ghc/ghc aclocal.m4 | 16 +- compiler/basicTypes/Literal.lhs | 9 +- compiler/basicTypes/MkId.lhs | 4 +- compiler/basicTypes/Module.lhs | 4 +- compiler/basicTypes/Name.lhs | 2 +- compiler/basicTypes/OccName.lhs | 2 +- compiler/basicTypes/Unique.lhs | 163 ++--- compiler/cmm/BlockId.hs | 1 + compiler/cmm/Cmm.hs | 20 +- compiler/cmm/CmmBuildInfoTables.hs | 103 ++-- compiler/cmm/CmmCallConv.hs | 52 +- compiler/cmm/CmmContFlowOpt.hs | 82 ++- compiler/cmm/CmmCvt.hs | 2 +- compiler/cmm/CmmExpr.hs | 2 + compiler/cmm/CmmInfo.hs | 139 ++-- compiler/cmm/CmmLayoutStack.hs | 171 +++-- compiler/cmm/CmmLint.hs | 9 +- compiler/cmm/CmmMachOp.hs | 8 +- compiler/cmm/CmmNode.hs | 42 +- compiler/cmm/CmmOpt.hs | 22 +- compiler/cmm/CmmParse.y | 85 ++- compiler/cmm/CmmPipeline.hs | 130 +++- compiler/cmm/CmmProcPoint.hs | 29 +- compiler/cmm/CmmRewriteAssignments.hs | 29 +- compiler/cmm/CmmSink.hs | 580 ++++++++++----- compiler/cmm/CmmUtils.hs | 5 - compiler/cmm/Hoopl.hs | 3 - compiler/cmm/Hoopl/Dataflow.hs | 7 - compiler/cmm/MkGraph.hs | 125 ++-- compiler/cmm/OldCmm.hs | 20 +- compiler/cmm/OldPprCmm.hs | 1 + compiler/cmm/PprC.hs | 283 ++++---- compiler/cmm/PprCmm.hs | 3 +- compiler/cmm/PprCmmDecl.hs | 3 +- compiler/cmm/PprCmmExpr.hs | 1 + compiler/cmm/SMRep.lhs | 119 ++-- compiler/codeGen/CallerSaves.hs | 51 ++ compiler/codeGen/CgCallConv.hs | 87 ++- compiler/codeGen/CgCase.lhs | 16 +- compiler/codeGen/CgClosure.lhs | 49 +- compiler/codeGen/CgCon.lhs | 65 +- compiler/codeGen/CgExpr.lhs | 23 +- compiler/codeGen/CgExtCode.hs | 5 + compiler/codeGen/CgForeignCall.hs | 53 +- compiler/codeGen/CgHeapery.lhs | 501 +++++++------ compiler/codeGen/CgInfoTbls.hs | 123 ++-- compiler/codeGen/CgMonad.lhs | 13 +- compiler/codeGen/CgPrimOp.hs | 98 ++- compiler/codeGen/CgProf.hs | 55 +- compiler/codeGen/CgStackery.lhs | 12 +- compiler/codeGen/CgTailCall.lhs | 29 +- compiler/codeGen/CgTicky.hs | 2 +- compiler/codeGen/CgUtils.hs | 103 +--- compiler/codeGen/ClosureInfo.lhs | 84 ++- compiler/codeGen/CodeGen.lhs | 12 +- compiler/codeGen/StgCmm.hs | 16 +- compiler/codeGen/StgCmmBind.hs | 161 +++-- compiler/codeGen/StgCmmClosure.hs | 102 ++-- compiler/codeGen/StgCmmCon.hs | 41 +- compiler/codeGen/StgCmmEnv.hs | 21 +- compiler/codeGen/StgCmmExpr.hs | 202 +++--- compiler/codeGen/StgCmmForeign.hs | 100 ++- compiler/codeGen/StgCmmHeap.hs | 209 ++++-- compiler/codeGen/StgCmmLayout.hs | 178 +++-- compiler/codeGen/StgCmmMonad.hs | 148 +++- compiler/codeGen/StgCmmPrim.hs | 96 ++- compiler/codeGen/StgCmmProf.hs | 124 ++-- compiler/codeGen/StgCmmTicky.hs | 2 +- compiler/codeGen/StgCmmUtils.hs | 117 +--- compiler/coreSyn/CoreLint.lhs | 2 - compiler/coreSyn/CoreUnfold.lhs | 83 ++- compiler/coreSyn/CoreUtils.lhs | 20 +- compiler/coreSyn/ExternalCore.lhs | 4 +- compiler/coreSyn/MkCore.lhs | 4 +- compiler/coreSyn/MkExternalCore.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 1 + compiler/coreSyn/PprExternalCore.lhs | 5 +- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/Coverage.lhs | 23 +- compiler/deSugar/Desugar.lhs | 30 +- compiler/deSugar/DsBinds.lhs | 2 +- compiler/deSugar/DsForeign.lhs | 5 +- compiler/deSugar/MatchLit.lhs | 10 +- compiler/ghc.cabal.in | 4 +- compiler/ghc.mk | 14 - compiler/ghci/ByteCodeAsm.lhs | 2 +- compiler/ghci/ByteCodeGen.lhs | 33 +- compiler/ghci/ByteCodeItbls.lhs | 27 +- compiler/ghci/ByteCodeLink.lhs | 8 +- compiler/ghci/DebuggerUtils.hs | 13 +- compiler/hsSyn/Convert.lhs | 2 +- compiler/hsSyn/HsDecls.lhs | 2 +- compiler/hsSyn/HsExpr.lhs | 6 +- compiler/hsSyn/HsLit.lhs | 4 +- compiler/hsSyn/HsSyn.lhs | 76 +-- compiler/iface/BinIface.hs | 6 +- compiler/iface/FlagChecker.hs | 7 +- compiler/iface/IfaceType.lhs | 7 +- compiler/iface/LoadIface.lhs | 1 + compiler/iface/MkIface.lhs | 8 +- compiler/llvmGen/LlvmCodeGen.hs | 6 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 21 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 24 +- compiler/main/DriverPipeline.hs | 38 +- compiler/main/DynFlags.hs | 148 +++- compiler/main/ErrUtils.lhs | 15 +- compiler/main/HscMain.hs | 7 +- compiler/main/InteractiveEval.hs | 4 - compiler/main/StaticFlagParser.hs | 39 +- compiler/main/StaticFlags.hs | 29 - compiler/main/SysTools.lhs | 319 ++++---- compiler/nativeGen/AsmCodeGen.lhs | 104 ++-- compiler/nativeGen/Instruction.hs | 4 +- compiler/nativeGen/PIC.hs | 64 +- compiler/nativeGen/PPC/CodeGen.hs | 19 +- compiler/nativeGen/PPC/Ppr.hs | 486 ++++++------ compiler/nativeGen/PPC/Regs.hs | 2 +- compiler/nativeGen/PprBase.hs | 5 - compiler/nativeGen/PprInstruction.hs | 2 - compiler/nativeGen/RegAlloc/Graph/Main.hs | 1 - compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 8 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 14 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 85 ++- compiler/nativeGen/RegAlloc/Linear/State.hs | 1 + compiler/nativeGen/RegAlloc/Liveness.hs | 4 +- compiler/nativeGen/SPARC/CodeGen.hs | 17 +- compiler/nativeGen/SPARC/Ppr.hs | 783 ++++++++++---------- compiler/nativeGen/SPARC/RegPlate.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 24 +- compiler/nativeGen/X86/Ppr.hs | 791 ++++++++++---------- compiler/nativeGen/X86/Regs.hs | 2 +- compiler/parser/Lexer.x | 15 +- compiler/parser/Parser.y.pp | 9 +- compiler/parser/ParserCore.y | 2 +- compiler/prelude/PrelRules.lhs | 683 ++++++++++------- compiler/profiling/CostCentre.lhs | 2 +- compiler/profiling/ProfInit.hs | 9 +- compiler/rename/RnBinds.lhs | 22 +- compiler/rename/RnEnv.lhs | 647 ++++++++-------- compiler/rename/RnExpr.lhs | 2 +- compiler/simplCore/FloatIn.lhs | 24 +- compiler/simplCore/FloatOut.lhs | 3 +- compiler/simplCore/SimplCore.lhs | 2 +- compiler/simplCore/Simplify.lhs | 393 +++++----- compiler/specialise/Rules.lhs | 2 +- compiler/stgSyn/StgSyn.lhs | 14 +- compiler/typecheck/TcCanonical.lhs | 36 +- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcEnv.lhs | 1 + compiler/typecheck/TcErrors.lhs | 53 ++- compiler/typecheck/TcHsSyn.lhs | 50 +- compiler/typecheck/TcInstDcls.lhs | 2 +- compiler/typecheck/TcInteract.lhs | 192 ++--- compiler/typecheck/TcRnMonad.lhs | 1 + compiler/typecheck/TcRnTypes.lhs | 42 +- compiler/typecheck/TcSMonad.lhs | 295 ++++---- compiler/typecheck/TcSimplify.lhs | 220 +++--- compiler/typecheck/TcSplice.lhs | 1 + compiler/typecheck/TcTyClsDecls.lhs | 8 +- compiler/types/Type.lhs | 3 +- compiler/utils/Binary.hs | 35 +- compiler/utils/BufWrite.hs | 11 +- compiler/utils/FastString.lhs | 322 +++++---- compiler/utils/Fingerprint.hsc | 73 -- compiler/utils/Outputable.lhs | 65 +- compiler/utils/Panic.lhs | 6 - compiler/utils/Platform.hs | 3 + compiler/utils/Pretty.lhs | 15 +- compiler/utils/StringBuffer.lhs | 6 +- compiler/utils/UniqFM.lhs | 175 ++--- compiler/utils/md5.c | 241 ------ compiler/vectorise/Vectorise/Generic/PADict.hs | 6 +- configure.ac | 39 +- distrib/configure.ac.in | 9 + docs/users_guide/flags.xml | 2 +- docs/users_guide/intro.xml | 14 +- ghc.mk | 12 +- ghc/Main.hs | 24 +- ghc/ghc-cross.wrapper | 1 + includes/CallerSaves.part.hs | 81 ++ includes/Cmm.h | 7 +- includes/HaskellConstants.hs | 3 +- includes/Rts.h | 2 + includes/Stg.h | 2 +- includes/ghc.mk | 2 +- includes/mkDerivedConstants.c | 25 + includes/mkDerivedConstants.cross.awk | 350 +++++++++ includes/mkSizeMacros.cross.awk | 82 ++ includes/rts/EventLogFormat.h | 13 +- includes/rts/OSThreads.h | 27 +- includes/rts/prof/CCS.h | 4 +- includes/stg/HaskellMachRegs.h | 47 ++ includes/stg/MachRegs.h | 64 +- includes/stg/Regs.h | 10 +- includes/stg/RtsMachRegs.h | 47 ++ libraries/bin-package-db/bin-package-db.cabal | 2 +- libraries/tarballs/time-1.4.0.1.tar.gz | Bin 0 -> 87466 bytes libraries/tarballs/time-1.4.tar.gz | Bin 87054 -> 0 bytes mk/build.mk.sample | 27 - mk/config.mk.in | 20 +- mk/validate-settings.mk | 14 +- packages | 1 - rts/Capability.c | 4 +- rts/Linker.c | 2 + rts/RtsAPI.c | 15 + rts/RtsProbes.d | 20 +- rts/Schedule.c | 48 +- rts/Task.c | 31 +- rts/Task.h | 43 +- rts/Trace.c | 46 ++ rts/Trace.h | 89 ++- rts/eventlog/EventLog.c | 84 ++- rts/eventlog/EventLog.h | 10 + rts/parallel/Pack.c | 4 +- rts/posix/OSThreads.c | 30 + rts/posix/Select.c | 15 +- rts/win32/OSThreads.c | 8 +- rules/build-package-way.mk | 2 +- rules/{all-target.mk => cross-compiling.mk} | 18 +- rules/distdir-way-opts.mk | 2 +- settings.in | 5 + utils/genapply/GenApply.hs | 8 +- utils/ghc-cabal/ghc-cabal.cabal | 2 +- utils/ghc-pkg/Main.hs | 2 + utils/hpc/hpc-bin.cabal | 6 +- 225 files changed, 7660 insertions(+), 6113 deletions(-) Diff suppressed because of size. To see it, use: git show 464ce12091c8fb86d87faa83b9aab031c91c3a1f _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
