[commit: ghc] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics (7fd7192)

[José Pedro Magalhães]

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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/7fd719237b68a356f80269ff083c073acec6f8f0

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

commit 7fd719237b68a356f80269ff083c073acec6f8f0
Merge: 6ad311b... 9c23f06...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Fri May 20 20:15:23 2011 +0200

    Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
    
    Fixed conflicts:
    	compiler/typecheck/TcSMonad.lhs

 compiler/cmm/CmmExpr.hs            |    5 +-
 compiler/codeGen/CgPrimOp.hs       |  212 ++++++++++++++++++++++++++++++++++
 compiler/codeGen/CgUtils.hs        |   19 +++-
 compiler/prelude/primops.txt.pp    |   43 +++++++
 compiler/typecheck/Inst.lhs        |    6 +-
 compiler/typecheck/TcCanonical.lhs |  113 ++++++++++---------
 compiler/typecheck/TcErrors.lhs    |   76 ++++++++++---
 compiler/typecheck/TcInstDcls.lhs  |    5 +-
 compiler/typecheck/TcInteract.lhs  |  223 +++++++++++++++++++++++++++++-------
 compiler/typecheck/TcMType.lhs     |    4 +-
 compiler/typecheck/TcRnTypes.lhs   |   48 ++++----
 compiler/typecheck/TcSMonad.lhs    |  143 +++++++++++++++++++----
 compiler/typecheck/TcSimplify.lhs  |   69 +++++++++--
 docs/users_guide/shared_libs.xml   |   61 ++++++----
 docs/users_guide/win32-dlls.xml    |   36 +++++--
 includes/Cmm.h                     |    6 +-
 includes/rts/EventLogFormat.h      |   39 ++++++-
 rts/Capability.c                   |    4 +
 rts/PrimOps.cmm                    |    1 +
 rts/RtsProbes.d                    |    6 +
 rts/RtsStartup.c                   |    4 +
 rts/Schedule.c                     |   16 ++--
 rts/Trace.c                        |   67 +++++++++++
 rts/Trace.h                        |   69 +++++++++++
 rts/eventlog/EventLog.c            |  149 ++++++++++++++++++++++++-
 rts/eventlog/EventLog.h            |   29 +++++
 rts/ghc.mk                         |    1 +
 sync-all                           |    4 +
 28 files changed, 1229 insertions(+), 229 deletions(-)