Rename _closure to _static_closure, apply naming consistently.

Summary:
In preparation for indirecting all references to closures,
we rename _closure to _static_closure to ensure any old code
will get an undefined symbol error.  In order to reference
a closure foobar_closure (which is now undefined), you should instead
use STATIC_CLOSURE(foobar).  For convenience, a number of these
old identifiers are macro'd.

Across C-- and C (Windows and otherwise), there were differing
conventions on whether or not foobar_closure or &foobar_closure
was the address of the closure.  Now, all foobar_closure references
are addresses, and no & is necessary.

CHARLIKE/INTLIKE were not changed, simply alpha-renamed.

Part of remove HEAP_ALLOCED patch set (#8199)

Depends on D265

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

Test Plan: validate

Reviewers: simonmar, austin

Subscribers: simonmar, ezyang, carter, thomie

Differential Revision: https://phabricator.haskell.org/D267

GHC Trac Issues: #8199

1 files changed, 36 insertions, 36 deletions

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 82d2870cde..75697326ea 100644
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -91,24 +91,24 @@ ld-options:
          , "-Wl,-u,_base_GHCziPtr_Ptr_con_info"
          , "-Wl,-u,_base_GHCziPtr_FunPtr_con_info"
          , "-Wl,-u,_base_GHCziStable_StablePtr_con_info"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_False_closure"
-         , "-Wl,-u,_ghczmprim_GHCziTypes_True_closure"
-         , "-Wl,-u,_base_GHCziPack_unpackCString_closure"
-         , "-Wl,-u,_base_GHCziIOziException_stackOverflow_closure"
-         , "-Wl,-u,_base_GHCziIOziException_heapOverflow_closure"
-         , "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_closure"
-         , "-Wl,-u,_base_GHCziIOziException_blockedIndefinitelyOnMVar_closure"
-         , "-Wl,-u,_base_GHCziIOziException_blockedIndefinitelyOnSTM_closure"
-         , "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_closure"
-         , "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_closure"
-         , "-Wl,-u,_base_GHCziWeak_runFinalizzerBatch_closure"
-         , "-Wl,-u,_base_GHCziTopHandler_flushStdHandles_closure"
-         , "-Wl,-u,_base_GHCziTopHandler_runIO_closure"
-         , "-Wl,-u,_base_GHCziTopHandler_runNonIO_closure"
-         , "-Wl,-u,_base_GHCziConcziIO_ensureIOManagerIsRunning_closure"
-         , "-Wl,-u,_base_GHCziConcziIO_ioManagerCapabilitiesChanged_closure"
-         , "-Wl,-u,_base_GHCziConcziSync_runSparks_closure"
-         , "-Wl,-u,_base_GHCziConcziSignal_runHandlers_closure"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_False_static_closure"
+         , "-Wl,-u,_ghczmprim_GHCziTypes_True_static_closure"
+         , "-Wl,-u,_base_GHCziPack_unpackCString_static_closure"
+         , "-Wl,-u,_base_GHCziIOziException_stackOverflow_static_closure"
+         , "-Wl,-u,_base_GHCziIOziException_heapOverflow_static_closure"
+         , "-Wl,-u,_base_ControlziExceptionziBase_nonTermination_static_closure"
+         , "-Wl,-u,_base_GHCziIOziException_blockedIndefinitelyOnMVar_static_closure"
+         , "-Wl,-u,_base_GHCziIOziException_blockedIndefinitelyOnSTM_static_closure"
+         , "-Wl,-u,_base_ControlziExceptionziBase_nestedAtomically_static_closure"
+         , "-Wl,-u,_base_GHCziEventziThread_blockedOnBadFD_static_closure"
+         , "-Wl,-u,_base_GHCziWeak_runFinalizzerBatch_static_closure"
+         , "-Wl,-u,_base_GHCziTopHandler_flushStdHandles_static_closure"
+         , "-Wl,-u,_base_GHCziTopHandler_runIO_static_closure"
+         , "-Wl,-u,_base_GHCziTopHandler_runNonIO_static_closure"
+         , "-Wl,-u,_base_GHCziConcziIO_ensureIOManagerIsRunning_static_closure"
+         , "-Wl,-u,_base_GHCziConcziIO_ioManagerCapabilitiesChanged_static_closure"
+         , "-Wl,-u,_base_GHCziConcziSync_runSparks_static_closure"
+         , "-Wl,-u,_base_GHCziConcziSignal_runHandlers_static_closure"
 #else
            "-Wl,-u,ghczmprim_GHCziTypes_Izh_static_info"
          , "-Wl,-u,ghczmprim_GHCziTypes_Czh_static_info"
@@ -132,24 +132,24 @@ ld-options:
          , "-Wl,-u,base_GHCziPtr_Ptr_con_info"
          , "-Wl,-u,base_GHCziPtr_FunPtr_con_info"
          , "-Wl,-u,base_GHCziStable_StablePtr_con_info"
-         , "-Wl,-u,ghczmprim_GHCziTypes_False_closure"
-         , "-Wl,-u,ghczmprim_GHCziTypes_True_closure"
-         , "-Wl,-u,base_GHCziPack_unpackCString_closure"
-         , "-Wl,-u,base_GHCziIOziException_stackOverflow_closure"
-         , "-Wl,-u,base_GHCziIOziException_heapOverflow_closure"
-         , "-Wl,-u,base_ControlziExceptionziBase_nonTermination_closure"
-         , "-Wl,-u,base_GHCziIOziException_blockedIndefinitelyOnMVar_closure"
-         , "-Wl,-u,base_GHCziIOziException_blockedIndefinitelyOnSTM_closure"
-         , "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_closure"
-         , "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_closure"
-         , "-Wl,-u,base_GHCziWeak_runFinalizzerBatch_closure"
-         , "-Wl,-u,base_GHCziTopHandler_flushStdHandles_closure"
-         , "-Wl,-u,base_GHCziTopHandler_runIO_closure"
-         , "-Wl,-u,base_GHCziTopHandler_runNonIO_closure"
-         , "-Wl,-u,base_GHCziConcziIO_ensureIOManagerIsRunning_closure"
-         , "-Wl,-u,base_GHCziConcziIO_ioManagerCapabilitiesChanged_closure"
-         , "-Wl,-u,base_GHCziConcziSync_runSparks_closure"
-         , "-Wl,-u,base_GHCziConcziSignal_runHandlers_closure"
+         , "-Wl,-u,ghczmprim_GHCziTypes_False_static_closure"
+         , "-Wl,-u,ghczmprim_GHCziTypes_True_static_closure"
+         , "-Wl,-u,base_GHCziPack_unpackCString_static_closure"
+         , "-Wl,-u,base_GHCziIOziException_stackOverflow_static_closure"
+         , "-Wl,-u,base_GHCziIOziException_heapOverflow_static_closure"
+         , "-Wl,-u,base_ControlziExceptionziBase_nonTermination_static_closure"
+         , "-Wl,-u,base_GHCziIOziException_blockedIndefinitelyOnMVar_static_closure"
+         , "-Wl,-u,base_GHCziIOziException_blockedIndefinitelyOnSTM_static_closure"
+         , "-Wl,-u,base_ControlziExceptionziBase_nestedAtomically_static_closure"
+         , "-Wl,-u,base_GHCziEventziThread_blockedOnBadFD_static_closure"
+         , "-Wl,-u,base_GHCziWeak_runFinalizzerBatch_static_closure"
+         , "-Wl,-u,base_GHCziTopHandler_flushStdHandles_static_closure"
+         , "-Wl,-u,base_GHCziTopHandler_runIO_static_closure"
+         , "-Wl,-u,base_GHCziTopHandler_runNonIO_static_closure"
+         , "-Wl,-u,base_GHCziConcziIO_ensureIOManagerIsRunning_static_closure"
+         , "-Wl,-u,base_GHCziConcziIO_ioManagerCapabilitiesChanged_static_closure"
+         , "-Wl,-u,base_GHCziConcziSync_runSparks_static_closure"
+         , "-Wl,-u,base_GHCziConcziSignal_runHandlers_static_closure"
 #endif
 
 /*  Pick up static libraries in preference over dynamic if in earlier search