File tree 5 files changed +8
-7
lines changed
CompatibilityDynamicReplacements
5 files changed +8
-7
lines changed Original file line number Diff line number Diff line change 16
16
17
17
#include " swift/Runtime/Config.h"
18
18
#include " swift/Runtime/Bincompat.h"
19
- #include " swift/Runtime/Once .h"
19
+ #include " swift/Runtime/Debug .h"
20
20
#include " swift/Runtime/EnvironmentVariables.h"
21
+ #include " swift/Threading/Once.h"
21
22
#include " ../SwiftShims/RuntimeShims.h"
22
23
#include < stdint.h>
23
24
@@ -96,8 +97,8 @@ static void checkBinCompatEnvironmentVariable(void *context) {
96
97
extern " C" __swift_bool _swift_stdlib_isExecutableLinkedOnOrAfter (
97
98
_SwiftStdlibVersion version
98
99
) {
99
- static OnceToken_t getenvToken;
100
- SWIFT_ONCE_F (getenvToken, checkBinCompatEnvironmentVariable, nullptr );
100
+ static once_t getenvToken;
101
+ swift::once (getenvToken, checkBinCompatEnvironmentVariable, nullptr );
101
102
102
103
if (binCompatVersionOverride._value > 0 ) {
103
104
return version._value <= binCompatVersionOverride._value ;
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ add_swift_target_library("${library_name}" STATIC
8
8
9
9
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
10
10
LINK_FLAGS ${CXX_LINK_FLAGS}
11
- INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
11
+ INCORPORATE_OBJECT_LIBRARIES swiftThreading
12
12
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
13
13
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
14
14
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ add_swift_target_library("${library_name}" STATIC
9
9
10
10
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
11
11
LINK_FLAGS ${CXX_LINK_FLAGS}
12
- INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
12
+ INCORPORATE_OBJECT_LIBRARIES swiftThreading
13
13
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
14
14
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
15
15
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
7
7
8
8
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
9
9
LINK_FLAGS ${CXX_LINK_FLAGS}
10
- INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
10
+ INCORPORATE_OBJECT_LIBRARIES swiftThreading
11
11
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
12
12
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
13
13
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ add_swift_target_library("${library_name}" STATIC
7
7
8
8
C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
9
9
LINK_FLAGS ${CXX_LINK_FLAGS}
10
- INCORPORATE_OBJECT_LIBRARIES swiftThreadingWithFatal
10
+ INCORPORATE_OBJECT_LIBRARIES swiftThreading
11
11
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
12
12
DEPLOYMENT_VERSION_OSX ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_OSX}
13
13
DEPLOYMENT_VERSION_IOS ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_IOS}
You can’t perform that action at this time.
0 commit comments