Skip to content

Commit 9193634

Browse files
authored
Merge pull request swiftlang#70601 from apple/dev/rokhinip-task-to-thread-preset
Add support for task-to-thread model as a build-preset
2 parents c845332 + 6dbf4d2 commit 9193634

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

stdlib/cmake/modules/StdlibOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ set(SWIFT_STDLIB_REFLECTION_METADATA "enabled" CACHE STRING
200200

201201
option(SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
202202
"Should concurrency use the task-to-thread model."
203-
"${SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY_default}")
203+
FALSE)
204204

205205
option(SWIFT_STDLIB_HAS_STDIN
206206
"Build stdlib assuming the platform supports stdin and getline API."

utils/build-script-impl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ KNOWN_SETTINGS=(
218218
swift-runtime-static-image-inspection "0" "whether to build stdlib assuming the runtime environment only supports a single runtime image with Swift code"
219219
swift-threading-package "" "override the threading package for the host build; this is either a single package or a semicolon-separated list of sdk:package pairs. Valid packages are empty string (no override), 'pthreads', 'darwin', 'linux', 'win32', 'c11', 'none'"
220220
swift-stdlib-single-threaded-concurrency "0" "build Swift concurrency in single-threaded mode"
221+
swift-stdlib-task-to-thread-model-concurrency "0" "build Swift concurrency with task-to-thread mode"
221222
swift-stdlib-tracing "" "whether to enable tracing signposts for the stdlib; default is 1 on Darwin platforms, 0 otherwise"
222223
swift-stdlib-concurrency-tracing "" "whether to enable tracing signposts for concurrency; default is 1 on Darwin platforms, 0 otherwise"
223224
swift-stdlib-use-relative-protocol-witness-tables "0" "whether to use relative protocol witness table"
@@ -1836,6 +1837,7 @@ for host in "${ALL_HOSTS[@]}"; do
18361837
-DSWIFT_IMPLICIT_CONCURRENCY_IMPORT:BOOL=$(true_false "${SWIFT_IMPLICIT_CONCURRENCY_IMPORT}")
18371838
-DSWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT:BOOL=$(true_false "${SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT}")
18381839
-DSWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY:BOOL=$(true_false "${SWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY}")
1840+
-DSWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY:BOOL=$(true_false "${SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY}")
18391841
-DSWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS:BOOL=$(true_false "${SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS}")
18401842
-DSWIFT_STDLIB_HAS_DLADDR:BOOL=$(true_false "${SWIFT_STDLIB_HAS_DLADDR}")
18411843
-DSWIFT_STDLIB_HAS_DLSYM:BOOL=$(true_false "${SWIFT_STDLIB_HAS_DLSYM}")

0 commit comments

Comments
 (0)