[commit: ghc] master: Revert "Rename _closure to _static_closure, apply naming consistently." (89a8d81)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/89a8d817f0c2951ec305c286a526205d06bf9221/ghc

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

commit 89a8d817f0c2951ec305c286a526205d06bf9221
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Oct 20 15:57:13 2014 -0700

    Revert "Rename _closure to _static_closure, apply naming consistently."
    
    This reverts commit 35672072b4091d6f0031417bc160c568f22d0469.
    
    Conflicts:
    	compiler/main/DriverPipeline.hs


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

89a8d817f0c2951ec305c286a526205d06bf9221
 compiler/cmm/CLabel.hs                       |  4 +-
 compiler/deSugar/DsForeign.lhs               |  6 +-
 compiler/ghci/ByteCodeLink.lhs               |  4 +-
 compiler/main/DriverPipeline.hs              |  4 +-
 driver/utils/dynwrapper.c                    |  2 +-
 ghc/GhciMonad.hs                             |  6 +-
 includes/Cmm.h                               |  1 -
 includes/Rts.h                               |  1 -
 includes/RtsAPI.h                            | 12 ++--
 includes/rts/StaticClosures.h                | 34 -----------
 includes/rts/storage/ClosureMacros.h         |  5 +-
 includes/rts/storage/TSO.h                   |  2 +-
 includes/stg/MiscClosures.h                  | 30 +++++-----
 libraries/integer-gmp/cbits/gmp-wrappers.cmm |  4 +-
 rts/Exception.cmm                            |  6 +-
 rts/Interpreter.c                            |  2 +-
 rts/Linker.c                                 |  4 +-
 rts/Prelude.h                                | 86 +++++++++++++---------------
 rts/PrimOps.cmm                              |  8 +--
 rts/RaiseAsync.c                             |  4 +-
 rts/RetainerProfile.c                        |  2 +-
 rts/STM.c                                    |  4 +-
 rts/STM.h                                    |  8 +--
 rts/StgMiscClosures.cmm                      |  4 +-
 rts/Weak.c                                   |  6 +-
 rts/package.conf.in                          | 72 +++++++++++------------
 rts/posix/Signals.c                          |  4 +-
 rts/sm/Storage.c                             |  4 +-
 rts/win32/libHSbase.def                      | 34 +++++------
 testsuite/tests/rts/rdynamic.hs              |  2 +-
 30 files changed, 162 insertions(+), 203 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 89a8d817f0c2951ec305c286a526205d06bf9221