Merge pull request #72769 from kubamracek/embedded-concurrency-none

[embedded] Default Embedded Concurrency to SWIFT_THREADING_PACKAGE=none

Author: kubamracek

stdlib/public/Concurrency/CMakeLists.txt

@@ -199,6 +199,8 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
   set(SWIFT_CONCURRENCY_USES_DISPATCH FALSE)
   set(SWIFT_STDLIB_SINGLE_THREADED_CONCURRENCY TRUE)
   set(SWIFT_STDLIB_CONCURRENCY_TRACING FALSE)
+  set(SWIFT_STDLIB_HAS_ENVIRON FALSE)
+  set(SWIFT_STDLIB_HAS_ASL FALSE)
 
   foreach(entry ${EMBEDDED_STDLIB_TARGET_TRIPLES})
     string(REGEX REPLACE "[ \t]+" ";" list "${entry}")
@@ -220,9 +222,11 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       set(extra_swift_compile_flags -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding)
     endif()
 
+    set(SWIFT_SDK_embedded_THREADING_PACKAGE none)
     set(SWIFT_SDK_embedded_ARCH_${mod}_MODULE "${mod}")
     set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
     set(SWIFT_SDK_embedded_ARCH_${mod}_TRIPLE "${triple}")
+
     add_swift_target_library_single(
       embedded-concurrency-${mod}
       swift_Concurrency

test/embedded/dependencies-concurrency.swift

@@ -9,7 +9,6 @@
 // Fail if there is any entry in actual-dependencies.txt that's not in allowed-dependencies.txt
 // RUN: test -z "`comm -13 %t/allowed-dependencies.txt %t/actual-dependencies.txt`"
 
-// DEP: __ZNSt3__111this_thread9sleep_forERKNS_6chrono8durationIxNS_5ratioILl1ELl1000000000EEEEE
 // DEP: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEPKc
 // DEP: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6appendEPKcm
 // DEP: __ZNSt3__112basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE6insertEmPKc
@@ -20,12 +19,12 @@
 // DEP: __ZdlPv
 // DEP: __Znwm
 // DEP: ___assert_rtn
+// DEP: ___error
 // DEP: ___stack_chk_fail
 // DEP: ___stack_chk_guard
 // DEP: ___stderrp
 // DEP: __availability_version_check
 // DEP: _abort
-// DEP: _asl_log
 // DEP: _dispatch_once_f
 // DEP: _dlsym
 // DEP: _exit
@@ -37,15 +36,9 @@
 // DEP: _fseek
 // DEP: _ftell
 // DEP: _malloc
-// DEP: _memcpy
 // DEP: _memset_s
-// DEP: _os_unfair_lock_lock
-// DEP: _os_unfair_lock_unlock
+// DEP: _nanosleep
 // DEP: _posix_memalign
-// DEP: _pthread_equal
-// DEP: _pthread_getspecific
-// DEP: _pthread_self
-// DEP: _pthread_setspecific
 // DEP: _putchar
 // DEP: _rewind
 // DEP: _sscanf