diff options
| author | Tamar Christina <tamar@zhox.com> | 2021-02-18 21:16:25 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-02-22 18:27:14 -0500 |
| commit | 54ba8d8a3e810b77ce3df99903b619de8b840c20 (patch) | |
| tree | db0be35e5776687016103b8a1b38b554f49baac5 | |
| parent | 3aceea907fb7fc4299397e6333e093befcf76cb0 (diff) | |
| download | haskell-54ba8d8a3e810b77ce3df99903b619de8b840c20.tar.gz | |
linker: Fix atexit handlers on PE
| -rw-r--r-- | rts/Linker.c | 3 | ||||
| -rw-r--r-- | rts/linker/PEi386.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 2ca9014379..5bc46b486d 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -504,9 +504,6 @@ initLinker_ (int retain_cafs) void exitLinker( void ) { -#if defined(OBJFORMAT_PEi386) - exitLinker_PEi386(); -#endif #if defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO) if (linker_init_done == 1) { regfree(&re_invalid); diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c index 9f13b4ce3d..32efdec471 100644 --- a/rts/linker/PEi386.c +++ b/rts/linker/PEi386.c @@ -327,6 +327,11 @@ void initLinker_PEi386() HeapSetInformation(code_heap, HeapEnableTerminationOnCorruption, &HeapInformation, sizeof(HeapInformation)); HeapSetInformation(code_heap, HeapOptimizeResources, NULL, 0); + + /* Register the cleanup routine as an exit handler, this gives other exit handlers + a chance to run which may need linker information. Exit handlers are ran in + reverse registration order so this needs to be before the linker loads anything. */ + atexit (exitLinker_PEi386); } void exitLinker_PEi386() |