[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (72bfc81)

[David Terei]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/72bfc815461354e806e5ef4a0a36db480aada28d

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

commit 72bfc815461354e806e5ef4a0a36db480aada28d
Merge: 590988b... 8b48562...
Author: David Terei <davidterei at gmail.com>
Date:   Thu Dec 8 16:15:26 2011 -0800

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

 compiler/codeGen/CgPrimOp.hs    |   29 +++++++++-
 compiler/codeGen/StgCmmPrim.hs  |    9 +++-
 compiler/iface/FlagChecker.hs   |    6 ++-
 compiler/main/DynFlags.hs       |    1 +
 compiler/prelude/PrelNames.lhs  |    6 ++-
 compiler/prelude/TysPrim.lhs    |   34 ++++++++----
 compiler/prelude/primops.txt.pp |  111 ++++++++++++++++++++++++++++++++++++++-
 compiler/simplCore/Simplify.lhs |   35 +++++++++----
 includes/rts/OSThreads.h        |   11 +++--
 includes/stg/MiscClosures.h     |    1 +
 rts/Linker.c                    |    2 +
 rts/PrimOps.cmm                 |   39 ++++++++++++++
 rts/posix/OSThreads.c           |    7 ++-
 rts/win32/OSThreads.c           |    5 ++
 utils/genprimopcode/Main.hs     |   31 ++++++-----
 utils/testremove/checkremove.hs |   46 ++++++++++------
 16 files changed, 306 insertions(+), 67 deletions(-)