Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/a686d1cb6dbaa28b629f6e7aa9a5a6b44d1f3ab1

>---------------------------------------------------------------

commit a686d1cb6dbaa28b629f6e7aa9a5a6b44d1f3ab1
Merge: 5508ada... 71e5ee7...
Author: Simon Peyton Jones <[email protected]>
Date:   Thu Jan 12 15:11:06 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org/ghc

 aclocal.m4                                  |    8 ++-
 compiler/llvmGen/Llvm.hs                    |    6 ++-
 compiler/llvmGen/Llvm/AbsSyn.hs             |   15 ++++
 compiler/llvmGen/Llvm/PpLlvm.hs             |   88 +++++++++++++++++++-----
 compiler/llvmGen/Llvm/Types.hs              |   39 +++++++++++-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs     |   57 ++++++++--------
 compiler/llvmGen/LlvmCodeGen/Ppr.hs         |   16 +++--
 compiler/llvmGen/LlvmCodeGen/Regs.hs        |   45 ++++++++++++-
 distrib/MacOS/GHC.xcodeproj/project.pbxproj |    2 +-
 ghc.mk                                      |    9 +--
 rts/Linker.c                                |   96 ++++++++++++++++++++++----
 11 files changed, 303 insertions(+), 78 deletions(-)



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to