[Threading] Fix a few things following rebase.

After rebasing, a few things broke.  Fix them.

rdar://90776105

Author: al45tair

stdlib/public/runtime/Bincompat.cpp

@@ -16,8 +16,9 @@
 
 #include "swift/Runtime/Config.h"
 #include "swift/Runtime/Bincompat.h"
-#include "swift/Runtime/Once.h"
+#include "swift/Runtime/Debug.h"
 #include "swift/Runtime/EnvironmentVariables.h"
+#include "swift/Threading/Once.h"
 #include "../SwiftShims/RuntimeShims.h"
 #include <stdint.h>
 
@@ -96,8 +97,8 @@ static void checkBinCompatEnvironmentVariable(void *context) {
 extern "C" __swift_bool _swift_stdlib_isExecutableLinkedOnOrAfter(
   _SwiftStdlibVersion version
 ) {
-  static OnceToken_t getenvToken;
-  SWIFT_ONCE_F(getenvToken, checkBinCompatEnvironmentVariable, nullptr);
+  static once_t getenvToken;
+  swift::once(getenvToken, checkBinCompatEnvironmentVariable, nullptr);
 
   if (binCompatVersionOverride._value > 0) {
     return version._value <= binCompatVersionOverride._value;

stdlib/toolchain/Compatibility50/CMakeLists.txt

@@ -8,7 +8,7 @@ add_swift_target_library("${library_name}" STATIC
 
   C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
   LINK_FLAGS ${CXX_LINK_FLAGS}
-  INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
+  INCORPORATE_OBJECT_LIBRARIES swiftThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
   DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/Compatibility51/CMakeLists.txt

@@ -9,7 +9,7 @@ add_swift_target_library("${library_name}" STATIC
 
   C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
   LINK_FLAGS ${CXX_LINK_FLAGS}
-  INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
+  INCORPORATE_OBJECT_LIBRARIES swiftThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
   DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/CompatibilityConcurrency/CMakeLists.txt

@@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
 
   C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
   LINK_FLAGS ${CXX_LINK_FLAGS}
-  INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
+  INCORPORATE_OBJECT_LIBRARIES swiftThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
   DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/CompatibilityDynamicReplacements/CMakeLists.txt

@@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
 
   C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
   LINK_FLAGS ${CXX_LINK_FLAGS}
-  INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
+  INCORPORATE_OBJECT_LIBRARIES swiftThreading
   SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
   DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
   DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}