Skip to content

Base: correct TLS handling on Windows x86 #4698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Base: correct TLS handling on Windows x86 #4698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CoreFoundation/Base.subproj/CFPlatform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,9 @@ typedef struct __CFTSDTable {
tsdDestructor destructors[CF_TSD_MAX_SLOTS];
} __CFTSDTable;

#if TARGET_OS_WIN32
__stdcall
#endif
static void __CFTSDFinalize(void *arg);

#if TARGET_OS_WIN32
Expand Down Expand Up @@ -792,6 +795,9 @@ static void *__CFTSDGetSpecific() {

_Atomic(bool) __CFMainThreadHasExited = false;

#if TARGET_OS_WIN32
__stdcall
#endif
static void __CFTSDFinalize(void *arg) {
#if TARGET_OS_WASI
__CFMainThreadHasExited = true;
Expand Down Expand Up @@ -1574,6 +1580,9 @@ typedef struct _CFThreadSpecificData {
} _CFThreadSpecificData;
#endif

#if TARGET_OS_WIN32
__stdcall
#endif
static void _CFThreadSpecificDestructor(void *ctx) {
#if TARGET_OS_WIN32
_CFThreadSpecificData *data = (_CFThreadSpecificData *)ctx;
Expand Down