Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : cross-compiler-alienless
http://hackage.haskell.org/trac/ghc/changeset/6741921a56669537ecb47f21dc572f2b9663f85a >--------------------------------------------------------------- commit 6741921a56669537ecb47f21dc572f2b9663f85a Merge: 92cc0ab... bcef1e28... Author: Gabor Greif <[email protected]> Date: Thu Aug 30 13:12:16 2012 +0200 Merge branch 'master' of https://github.com/ghc/ghc into cross-compiler-alienless compiler/cmm/CmmParse.y | 1058 ++++++++++---------- 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/coreSyn/CorePrep.lhs | 46 +- compiler/coreSyn/CoreSyn.lhs | 8 + compiler/coreSyn/CoreUtils.lhs | 10 +- compiler/deSugar/DsBinds.lhs | 11 +- compiler/ghc.cabal.in | 1 - compiler/ghci/Linker.lhs | 67 +- compiler/hsSyn/HsDecls.lhs | 5 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 59 +- compiler/main/DriverPhases.hs | 41 +- compiler/main/TidyPgm.lhs | 23 +- compiler/nativeGen/AsmCodeGen.lhs | 8 +- compiler/nativeGen/PPC/CodeGen.hs | 38 +- compiler/nativeGen/PPC/Instr.hs | 23 +- compiler/nativeGen/PPC/Regs.hs | 328 +------ compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 16 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 2 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 33 +- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 5 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 25 +- compiler/nativeGen/SPARC/CodeGen.hs | 10 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 11 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 7 +- compiler/nativeGen/SPARC/Imm.hs | 4 +- compiler/nativeGen/SPARC/Instr.hs | 15 +- compiler/nativeGen/SPARC/RegPlate.hs | 318 ------ compiler/nativeGen/SPARC/Regs.hs | 130 +--- compiler/nativeGen/X86/CodeGen.hs | 157 ++-- compiler/nativeGen/X86/Instr.hs | 24 +- compiler/nativeGen/X86/Regs.hs | 216 +---- compiler/prelude/primops.txt.pp | 2 +- compiler/rename/RnEnv.lhs | 16 +- compiler/typecheck/TcEvidence.lhs | 21 +- compiler/typecheck/TcTyClsDecls.lhs | 7 +- compiler/utils/Util.lhs | 17 +- includes/CodeGen.Platform.hs | 585 +++++++++++- includes/rts/storage/ClosureMacros.h | 2 +- mk/config.mk.in | 10 - 46 files changed, 1567 insertions(+), 1852 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
