From fc8423e49d52c1d6c990f75370d9ad3d5b4c996b Mon Sep 17 00:00:00 2001 From: lightningterror Date: Sat, 17 Aug 2019 22:10:41 +0200 Subject: [PATCH] Revert "3rdparty/pthreads4w: Ensure on_process_init early execution. (#3073)" This reverts commit 88a02941f698577ecc45450308269f57e1d066ad. --- 3rdparty/pthreads4w/autostatic.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/3rdparty/pthreads4w/autostatic.c b/3rdparty/pthreads4w/autostatic.c index 0cd913354a..8eaae6f8e7 100644 --- a/3rdparty/pthreads4w/autostatic.c +++ b/3rdparty/pthreads4w/autostatic.c @@ -73,14 +73,9 @@ static void on_process_init(void) attribute_section(".ctors") void *gcc_ctor = on_process_init; attribute_section(".dtors") void *gcc_dtor = on_process_exit; -#if !PCSX2_FIX attribute_section(".CRT$XCU") void *msc_ctor = on_process_init; +#if !PCSX2_FIX attribute_section(".CRT$XPU") void *msc_dtor = on_process_exit; -#else -// MSVC puts all initializers in .CRT$XCU and order of those is not fully deterministic -// Since the entire point of this is to call on_process_init before any other initializer, -// move it to .CRT$XCP so it is guaranteed it initializes early -attribute_section(".CRT$XCP") void *msc_ctor = on_process_init; #endif #endif /* defined(__MINGW64__) || defined(__MINGW32__) || defined(_MSC_VER) */