Merge pull request swiftlang#63103 from al45tair/eng/PR-103274667-5.8

Don't use tsd_private.h in compatibility libraries for ARMv7k.

Author: al45tair

include/swift/Threading/Impl/Darwin.h

@@ -186,14 +186,16 @@ 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 __has_include(<pthread/tsd_private.h>)
+#if !(SWIFT_THREADING_IS_COMPATIBILITY_LIBRARY && __ARM_ARCH_7K__) && __has_include(<pthread/tsd_private.h>)
 } // namespace threading_impl
 } // namespace swift
 
 extern "C" {
 #include <pthread/tsd_private.h>
 }
 
+#define SWIFT_THREADING_USE_DIRECT_TSD 1
+
 namespace swift {
 namespace threading_impl {
 #else
@@ -208,17 +210,12 @@ namespace threading_impl {
 #define __PTK_FRAMEWORK_SWIFT_KEY8 108
 #define __PTK_FRAMEWORK_SWIFT_KEY9 109
 
+#define SWIFT_THREADING_USE_DIRECT_TSD 0
+
 extern "C" {
 
 extern int pthread_key_init_np(int, void (*)(void *));
 
-inline bool _pthread_has_direct_tsd() { return false; }
-inline void *_pthread_getspecific_direct(pthread_key_t k) {
-  return pthread_getspecific(k);
-}
-inline void _pthread_setspecific_direct(pthread_key_t k, void *v) {
-  pthread_setspecific(k, v);
-}
 }
 #endif
 
@@ -257,18 +254,22 @@ inline bool tls_alloc(tls_key_t &key, tls_dtor_t dtor) {
 }
 
 inline void *tls_get(tls_key_t key) {
+#if SWIFT_THREADING_USE_DIRECT_TSD
   if (_pthread_has_direct_tsd())
     return _pthread_getspecific_direct(key);
   else
+#endif
     return pthread_getspecific(key);
 }
 
 inline void *tls_get(tls_key key) { return tls_get(tls_get_key(key)); }
 
 inline void tls_set(tls_key_t key, void *value) {
+#if SWIFT_THREADING_USE_DIRECT_TSD
   if (_pthread_has_direct_tsd())
     _pthread_setspecific_direct(key, value);
   else
+#endif
     pthread_setspecific(key, value);
 }
 

stdlib/toolchain/Compatibility50/CMakeLists.txt

@@ -10,7 +10,9 @@ add_swift_target_library("${library_name}" STATIC
 
   TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
 
-  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
+  C_COMPILE_FLAGS
+    ${CXX_COMPILE_FLAGS}
+    "-DSWIFT_THREADING_IS_COMPATIBILITY_LIBRARY"
   LINK_FLAGS ${CXX_LINK_FLAGS}
   INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}

stdlib/toolchain/Compatibility51/CMakeLists.txt

@@ -10,7 +10,9 @@ add_swift_target_library("${library_name}" STATIC
 
   TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
 
-  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
+  C_COMPILE_FLAGS
+    ${CXX_COMPILE_FLAGS}
+    "-DSWIFT_THREADING_IS_COMPATIBILITY_LIBRARY"
   LINK_FLAGS ${CXX_LINK_FLAGS}
   INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}

stdlib/toolchain/Compatibility56/CMakeLists.txt

@@ -18,7 +18,10 @@ add_swift_target_library("${library_name}" STATIC
 
   TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
 
-  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS} "-D__STDC_WANT_LIB_EXT1__=1"
+  C_COMPILE_FLAGS
+    ${CXX_COMPILE_FLAGS}
+    "-D__STDC_WANT_LIB_EXT1__=1"
+    "-DSWIFT_THREADING_IS_COMPATIBILITY_LIBRARY"
   LINK_FLAGS ${CXX_LINK_FLAGS}
   INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}

stdlib/toolchain/CompatibilityConcurrency/CMakeLists.txt

@@ -5,7 +5,9 @@ add_swift_target_library("${library_name}" STATIC
 
   TARGET_SDKS ${SWIFT_APPLE_PLATFORMS}
 
-  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
+  C_COMPILE_FLAGS
+    ${CXX_COMPILE_FLAGS}
+    "-DSWIFT_THREADING_IS_COMPATIBILITY_LIBRARY"
   LINK_FLAGS ${CXX_LINK_FLAGS}
   INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}

stdlib/toolchain/CompatibilityDynamicReplacements/CMakeLists.txt

@@ -5,7 +5,9 @@ add_swift_target_library("${library_name}" STATIC
 
   TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
 
-  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
+  C_COMPILE_FLAGS
+    ${CXX_COMPILE_FLAGS}
+    "-DSWIFT_THREADING_IS_COMPATIBILITY_LIBRARY"
   LINK_FLAGS ${CXX_LINK_FLAGS}
   INCORPORATE_OBJECT_LIBRARIES swiftCompatibilityThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}

stdlib/toolchain/CompatibilityThreading/CMakeLists.txt

@@ -8,6 +8,10 @@ add_swift_target_library(swiftCompatibilityThreading OBJECT_LIBRARY
   "${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
   INSTALL_IN_COMPONENT never_install
   TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
+
+  C_COMPILE_FLAGS
+    ${CXX_COMPILE_FLAGS}
+    "-DSWIFT_THREADING_IS_COMPATIBILITY_LIBRARY"
   DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
   DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
   DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}