Skip to content

Commit 3a5f103

Browse files
committed
[Threading] Fix a few things following rebase.
After rebasing, a few things broke. Fix them. rdar://90776105
1 parent 901ceae commit 3a5f103

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

stdlib/public/runtime/Bincompat.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
#include "swift/Runtime/Config.h"
1818
#include "swift/Runtime/Bincompat.h"
19-
#include "swift/Runtime/Once.h"
19+
#include "swift/Runtime/Debug.h"
2020
#include "swift/Runtime/EnvironmentVariables.h"
21+
#include "swift/Threading/Once.h"
2122
#include "../SwiftShims/RuntimeShims.h"
2223
#include <stdint.h>
2324

@@ -96,8 +97,8 @@ static void checkBinCompatEnvironmentVariable(void *context) {
9697
extern "C" __swift_bool _swift_stdlib_isExecutableLinkedOnOrAfter(
9798
_SwiftStdlibVersion version
9899
) {
99-
static OnceToken_t getenvToken;
100-
SWIFT_ONCE_F(getenvToken, checkBinCompatEnvironmentVariable, nullptr);
100+
static once_t getenvToken;
101+
swift::once(getenvToken, checkBinCompatEnvironmentVariable, nullptr);
101102

102103
if (binCompatVersionOverride._value > 0) {
103104
return version._value <= binCompatVersionOverride._value;

stdlib/toolchain/Compatibility50/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ add_swift_target_library("${library_name}" STATIC
88

99
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
1010
LINK_FLAGS ${CXX_LINK_FLAGS}
11-
INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
11+
INCORPORATE_OBJECT_LIBRARIES swiftThreading
1212
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1313
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1414
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/Compatibility51/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_swift_target_library("${library_name}" STATIC
99

1010
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
1111
LINK_FLAGS ${CXX_LINK_FLAGS}
12-
INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
12+
INCORPORATE_OBJECT_LIBRARIES swiftThreading
1313
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1414
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1515
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/CompatibilityConcurrency/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
77

88
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
99
LINK_FLAGS ${CXX_LINK_FLAGS}
10-
INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
10+
INCORPORATE_OBJECT_LIBRARIES swiftThreading
1111
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1212
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1313
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

stdlib/toolchain/CompatibilityDynamicReplacements/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
77

88
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
99
LINK_FLAGS ${CXX_LINK_FLAGS}
10-
INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
10+
INCORPORATE_OBJECT_LIBRARIES swiftThreading
1111
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
1212
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
1313
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}

0 commit comments

Comments
 (0)