From b0681941956b9940f2ad330500b7beb3d4355b66 Mon Sep 17 00:00:00 2001 From: Alastair Houghton Date: Wed, 22 Feb 2023 08:36:25 +0000 Subject: [PATCH] Don't use tsd_private.h in compatibility libraries for ARM64_32. Apparently this issue also affects ARM64_32. rdar://105768086 --- include/swift/Threading/Impl/Darwin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/swift/Threading/Impl/Darwin.h b/include/swift/Threading/Impl/Darwin.h index 1946aad36aad2..69e6352595ca7 100644 --- a/include/swift/Threading/Impl/Darwin.h +++ b/include/swift/Threading/Impl/Darwin.h @@ -186,7 +186,7 @@ inline void once_impl(once_t &predicate, void (*fn)(void *), void *context) { // On Darwin, we want to use the reserved keys #define SWIFT_THREADING_USE_RESERVED_TLS_KEYS 1 -#if !(SWIFT_THREADING_IS_COMPATIBILITY_LIBRARY && __ARM_ARCH_7K__) && __has_include() +#if !(SWIFT_THREADING_IS_COMPATIBILITY_LIBRARY && (__ARM_ARCH_7K__ || __ARM64_ARCH_8_32__)) && __has_include() } // namespace threading_impl } // namespace swift