Merge pull request #60764 from al45tair/eng/PR-99125585

[Threading] Move swiftCompatibilityThreading to toolchain.

Author: al45tair

CMakeLists.txt

@@ -1163,9 +1163,6 @@ endif()
 if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stdlib)
 else()
-  # Some of the things below depend on the threading library
-  add_subdirectory(stdlib/public/Threading)
-
   if(SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT)
     add_subdirectory(stdlib/toolchain)
   endif()

lib/Threading/CMakeLists.txt

@@ -1,9 +1,9 @@
 # If you update this, you also need to update the CMakeLists.txt file in
-# stdlib/public/Threading
+# stdlib/public/Threading AND the one in stdlib/toolchain/CompatibilityThreading
 
 # Note that it is *not* an error that Errors.cpp is only listed here.
-# It shouldn't be in stdlib/public/Threading because that is an OBJECT_LIBRARY
-# and things that use that should be defining their own fatal error handler.
+# It shouldn't be in the other places because those are OBJECT_LIBRARYs
+# and things that use them should be defining their own fatal error handler.
 
 add_swift_host_library(swiftThreading STATIC
   C11.cpp

stdlib/public/Threading/CMakeLists.txt

@@ -10,19 +10,3 @@ add_swift_target_library(swiftThreading OBJECT_LIBRARY
   "${SWIFT_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
   "${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
   INSTALL_IN_COMPONENT never_install)
-
-if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
-  # This is only used by the compatibility libraries
-  add_swift_target_library(swiftCompatibilityThreading OBJECT_LIBRARY
-    "${SWIFT_SOURCE_DIR}/lib/Threading/C11.cpp"
-    "${SWIFT_SOURCE_DIR}/lib/Threading/Linux.cpp"
-    "${SWIFT_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
-    "${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
-    INSTALL_IN_COMPONENT never_install
-    TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
-    DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
-    DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
-    DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}
-    DEPLOYMENT_VERSION_WATCHOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS}
-  )
-endif()

stdlib/toolchain/CMakeLists.txt

@@ -52,4 +52,5 @@ if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
   add_subdirectory(Compatibility51)
   add_subdirectory(CompatibilityDynamicReplacements)
   add_subdirectory(CompatibilityConcurrency)
+  add_subdirectory(CompatibilityThreading)
 endif()

stdlib/toolchain/CompatibilityThreading/CMakeLists.txt

@@ -0,0 +1,14 @@
+# This is the counterpart to lib/Threading/CMakeLists.txt.  Any updates
+# need to be reflected in both places.
+
+add_swift_target_library(swiftCompatibilityThreading OBJECT_LIBRARY
+  "${SWIFT_SOURCE_DIR}/lib/Threading/C11.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Threading/Linux.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Threading/Pthreads.cpp"
+  "${SWIFT_SOURCE_DIR}/lib/Threading/Win32.cpp"
+  INSTALL_IN_COMPONENT never_install
+  TARGET_SDKS ${SWIFT_DARWIN_PLATFORMS}
+  DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
+  DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
+  DEPLOYMENT_VERSION_TVOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_TVOS}
+  DEPLOYMENT_VERSION_WATCHOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_WATCHOS})