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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/2d4d636af091b8da27466b5cf90011395a9c2f66

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

commit 2d4d636af091b8da27466b5cf90011395a9c2f66
Merge: d872133... 52cba3c...
Author: Jose Pedro Magalhaes <[email protected]>
Date:   Tue May 17 08:51:09 2011 +0200

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

 compiler/basicTypes/BasicTypes.lhs                 |   38 ++-
 compiler/cmm/Cmm.hs                                |    5 +-
 compiler/cmm/CmmCPS.hs                             |   89 ++--
 compiler/cmm/CmmNode.hs                            |   34 +-
 compiler/cmm/CmmSpillReload.hs                     |  562 ++++++++++++++++----
 compiler/cmm/OldCmm.hs                             |    4 +-
 compiler/codeGen/StgCmmUtils.hs                    |   62 +++
 compiler/deSugar/Check.lhs                         |   11 +-
 compiler/deSugar/DsMeta.hs                         |    2 +-
 compiler/deSugar/MatchLit.lhs                      |   25 +-
 compiler/ghci/ObjLink.lhs                          |   20 +-
 compiler/hsSyn/Convert.lhs                         |    9 +-
 compiler/hsSyn/HsBinds.lhs                         |   12 +-
 compiler/hsSyn/HsLit.lhs                           |   19 +-
 compiler/hsSyn/HsUtils.lhs                         |   15 +-
 compiler/main/DynFlags.hs                          |   43 ++-
 compiler/main/ErrUtils.lhs                         |   36 +-
 compiler/main/SysTools.lhs                         |   19 +-
 compiler/nativeGen/AsmCodeGen.lhs                  |    6 +-
 compiler/parser/Lexer.x                            |   17 +-
 compiler/typecheck/TcHsSyn.lhs                     |    2 +-
 compiler/typecheck/TcSplice.lhs                    |    2 +-
 compiler/vectorise/Vectorise/Builtins/Base.hs      |    2 +-
 .../vectorise/Vectorise/Builtins/Initialise.hs     |  105 +++--
 compiler/vectorise/Vectorise/Builtins/Modules.hs   |   88 ++--
 compiler/vectorise/Vectorise/Builtins/Prelude.hs   |   34 +--
 includes/Rts.h                                     |    6 +
 includes/stg/MachRegs.h                            |    5 +
 rts/Linker.c                                       |  165 ++++---
 rts/RtsFlags.c                                     |   58 ++
 utils/ghc-pkg/Main.hs                              |   21 +-
 utils/runghc/runghc.hs                             |   20 +-
 32 files changed, 1093 insertions(+), 443 deletions(-)




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

Reply via email to