From 35672072b4091d6f0031417bc160c568f22d0469 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Mon, 26 Aug 2013 15:23:15 -0700 Subject: 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 Test Plan: validate Reviewers: simonmar, austin Subscribers: simonmar, ezyang, carter, thomie Differential Revision: https://phabricator.haskell.org/D267 GHC Trac Issues: #8199 --- driver/utils/dynwrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'driver') diff --git a/driver/utils/dynwrapper.c b/driver/utils/dynwrapper.c index a9250f58ba..84888e1c4d 100644 --- a/driver/utils/dynwrapper.c +++ b/driver/utils/dynwrapper.c @@ -188,7 +188,7 @@ int main(int argc, char *argv[]) { hRtsDll = GetNonNullModuleHandle(rtsDll); hs_main_p = GetNonNullProcAddress(hRtsDll, "hs_main"); - main_p = GetNonNullProcAddress(hProgDll, "ZCMain_main_closure"); + main_p = GetNonNullProcAddress(hProgDll, "ZCMain_main_static_closure"); rts_config.rts_opts_enabled = rtsOpts; rts_config.rts_opts = NULL; -- cgit v1.2.1