Skip to content

Commit f3e0dd7

Browse files
authored
Merge pull request #63828 from al45tair/eng/PR-105768086-5.8
Don't use tsd_private.h in compatibility libraries for ARM64_32.
2 parents b7b428b + 038a9ea commit f3e0dd7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/swift/Threading/Impl/Darwin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ inline void once_impl(once_t &predicate, void (*fn)(void *), void *context) {
186186
// On Darwin, we want to use the reserved keys
187187
#define SWIFT_THREADING_USE_RESERVED_TLS_KEYS 1
188188

189-
#if !(SWIFT_THREADING_IS_COMPATIBILITY_LIBRARY && __ARM_ARCH_7K__) && __has_include(<pthread/tsd_private.h>)
189+
#if !(SWIFT_THREADING_IS_COMPATIBILITY_LIBRARY && (__ARM_ARCH_7K__ || __ARM64_ARCH_8_32__)) && __has_include(<pthread/tsd_private.h>)
190190
} // namespace threading_impl
191191
} // namespace swift
192192

0 commit comments

Comments
 (0)