[commit: ghc] ghc-lwc: merging master (0c56b44)

[Sivaramakrishnan Krishnamoorthy Chandrasekaran]

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

On branch  : ghc-lwc

http://hackage.haskell.org/trac/ghc/changeset/0c56b44adfe3b87139850e2d09a677bee4c886e3

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

commit 0c56b44adfe3b87139850e2d09a677bee4c886e3
Merge: 8b3cc00... 09addd3...
Author: kc <chandras at cs.purdue.edu>
Date:   Sun May 13 21:54:35 2012 -0400

    merging master

 .gitignore                          |    1 +
 compiler/coreSyn/CoreSyn.lhs        |   12 +-
 compiler/coreSyn/CoreUnfold.lhs     |  178 +++-----
 compiler/coreSyn/CoreUtils.lhs      |   74 +++-
 compiler/coreSyn/PprCore.lhs        |    4 +-
 compiler/deSugar/DsBinds.lhs        |  108 +++--
 compiler/deSugar/DsMeta.hs          |   43 +-
 compiler/ghci/ByteCodeGen.lhs       |    3 +
 compiler/hsSyn/Convert.lhs          |   22 +-
 compiler/hsSyn/HsDecls.lhs          |   32 +-
 compiler/hsSyn/HsPat.lhs            |    4 +-
 compiler/hsSyn/HsTypes.lhs          |  124 +++---
 compiler/hsSyn/HsUtils.lhs          |    5 +-
 compiler/parser/Parser.y.pp         |    8 +-
 compiler/parser/ParserCore.y        |   10 +-
 compiler/parser/RdrHsSyn.lhs        |   25 +-
 compiler/rename/RnBinds.lhs         |    2 +-
 compiler/rename/RnEnv.lhs           |   17 +-
 compiler/rename/RnPat.lhs           |    4 +-
 compiler/rename/RnSource.lhs        |   81 ++--
 compiler/rename/RnTypes.lhs         |  264 ++++++++-----
 compiler/simplCore/SimplUtils.lhs   |  130 +++---
 compiler/simplCore/Simplify.lhs     |   83 ++--
 compiler/typecheck/Inst.lhs         |   72 ++--
 compiler/typecheck/TcBinds.lhs      |   59 ++-
 compiler/typecheck/TcCanonical.lhs  |  252 ++++++------
 compiler/typecheck/TcErrors.lhs     |   48 +--
 compiler/typecheck/TcEvidence.lhs   |   99 ++++--
 compiler/typecheck/TcHsSyn.lhs      |   29 +-
 compiler/typecheck/TcHsType.lhs     |   41 +-
 compiler/typecheck/TcInstDcls.lhs   |    4 +-
 compiler/typecheck/TcInteract.lhs   |  367 ++++++++---------
 compiler/typecheck/TcMType.lhs      |   29 +-
 compiler/typecheck/TcRnDriver.lhs   |    9 +-
 compiler/typecheck/TcRnTypes.lhs    |  173 ++++-----
 compiler/typecheck/TcSMonad.lhs     |  670 +++++++++++++++++-------------
 compiler/typecheck/TcSimplify.lhs   |   50 ++-
 compiler/typecheck/TcTyClsDecls.lhs |   31 +-
 compiler/typecheck/TcUnify.lhs      |    4 +-
 compiler/types/Coercion.lhs         |   14 +-
 compiler/types/TyCon.lhs            |    6 -
 compiler/types/Type.lhs             |   17 +-
 compiler/vectorise/Vectorise.hs     |    6 +-
 compiler/vectorise/Vectorise/Exp.hs |  779 +++++++++++++++--------------------
 ghc.mk                              |    4 +-
 ghc/InteractiveUI.hs                |    3 +-
 includes/RtsAPI.h                   |    2 +-
 includes/rts/FileLock.h             |    6 +-
 includes/stg/DLL.h                  |   25 +-
 mk/config.mk.in                     |    4 +
 mk/validate-settings.mk             |    6 +
 packages                            |    1 +
 rts/{posix => }/FileLock.c          |   11 +-
 rts/{posix => }/FileLock.h          |    0 
 rts/GetTime.h                       |    3 +
 rts/Linker.c                        |   39 ++-
 rts/RetainerProfile.c               |    4 +-
 rts/RtsDllMain.c                    |    4 +-
 rts/RtsDllMain.h                    |    2 +-
 rts/RtsStartup.c                    |    9 +-
 rts/StgMiscClosures.cmm             |    6 +-
 rts/ghc.mk                          |    6 +
 rts/posix/GetTime.c                 |   36 ++-
 rts/sm/Evac.c                       |    2 +-
 rts/sm/Scav.c                       |    2 +-
 rts/win32/GetTime.c                 |   74 +++--
 rts/win32/ThrIOManager.c            |    6 +-
 sync-all                            |   36 ++
 utils/ghc-cabal/Main.hs             |   44 +--
 utils/ghctags/Main.hs               |   12 +-
 70 files changed, 2285 insertions(+), 2055 deletions(-)

diff --cc rts/RetainerProfile.c
index c73dd1c,4bbc338..8a23806
--- a/rts/RetainerProfile.c
+++ b/rts/RetainerProfile.c
@@@ -1235,9 -1235,9 +1235,9 @@@ retainSRT (StgClosure **srt, nat srt_bi
  
    while (bitmap != 0) {
        if ((bitmap & 1) != 0) {
- #if defined(__PIC__) && defined(mingw32_HOST_OS)
+ #if defined(COMPILING_WINDOWS_DLL)
  	  if ( (unsigned long)(*srt) & 0x1 ) {
 -	      retainClosure(* (StgClosure**) ((unsigned long) (*srt) & ~0x1), 
 +	      retainClosure(* (StgClosure**) ((unsigned long) (*srt) & ~0x1),
  			    c, c_child_r);
  	  } else {
  	      retainClosure(*srt,c,c_child_r);
diff --cc rts/sm/Evac.c
index 0a837fd,20a5b09..1267add
--- a/rts/sm/Evac.c
+++ b/rts/sm/Evac.c
@@@ -554,8 -554,8 +554,8 @@@ loop
    //	data references very well.
    //
    case CONSTR_0_1:
 -  {   
 +  {
- #if defined(__PIC__) && defined(mingw32_HOST_OS)
+ #if defined(COMPILING_WINDOWS_DLL)
        copy_tag_nolock(p,info,q,sizeofW(StgHeader)+1,gen_no,tag);
  #else
        StgWord w = (StgWord)q->payload[0];