Remove upstreamed 6.2 devel patch from CI and add another one that hasn't been upstreamed yet

Author: finagolfin

.github/workflows/sdks.yml

@@ -125,19 +125,19 @@ jobs:
           ANDROID_ARCH=aarch64 BUILD_SWIFT_PM=1 ${TOOLCHAIN}/bin/swift get-packages-and-swift-source.swift
 
           git apply -C1 swift-android.patch swift-android-ci.patch
-          BUILD_FLAG="--build-swift-tools=0"
           if ${{ matrix.version == 'release' }}; then
             perl -pi -e 's%r26%ndk/27%' swift/stdlib/cmake/modules/AddSwiftStdlib.cmake
+            BUILD_FLAG="--build-swift-tools=0"
             LSP_BUILD="--sourcekit-lsp"
             git apply swift-android-ci-release.patch swift-android-testing-release.patch
           else
             if ${{ matrix.version == 'trunk' }}; then
-              BUILD_FLAG="--cross-compile-build-swift-tools=0"
               git apply swift-android-trunk-libdispatch.patch
             else
               git apply swift-android-devel.patch
             fi
             git apply -C2 swift-android-ci-except-release.patch swift-android-testing-except-release.patch
+            BUILD_FLAG="--cross-compile-build-swift-tools=0"
             SDK_NAME=$(ls | grep swift-${{ matrix.version }}-android-aarch64)
             perl -pi -e 's%33%24%' $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/execinfo.h
           fi

swift-android-devel.patch

@@ -1,40 +1,51 @@
-diff --git a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-index 5769a3317e..916a7accbb 100644
---- a/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-+++ b/swift-corelibs-foundation/Sources/CoreFoundation/CFPlatform.c
-@@ -1948,7 +1948,7 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
- #endif
- }
+diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
+index cfbf761ca62..6e538161f83 100755
+--- a/swift/utils/build-script-impl
++++ b/swift/utils/build-script-impl
+@@ -292,6 +292,7 @@ KNOWN_SETTINGS=(
+     cross-compile-install-prefixes                ""                "semicolon-separated list of install prefixes to use for the cross-compiled hosts. The list expands, so if there are more cross-compile hosts than prefixes, unmatched hosts use the last prefix in the list"
+     cross-compile-deps-path                       ""                "path for CMake to look for cross-compiled library dependencies, such as libXML2"
+     cross-compile-append-host-target-to-destdir   "1"               "turns on appending the host target name of each cross-compiled toolchain to its install-destdir, to keep them separate from the natively-built toolchain"
++    cross-compile-build-swift-tools               "1"               "set to 1 to cross-compile the Swift host tools, like the Swift compiler"
+     skip-merge-lipo-cross-compile-tools           ""                "set to skip running merge-lipo after installing cross-compiled host Swift tools"
+     coverage-db                                   ""                "If set, coverage database to use when prioritizing testing"
+     skip-local-host-install                       ""                "If we are cross-compiling multiple targets, skip an install pass locally if the hosts match"
+@@ -1707,6 +1708,12 @@ for host in "${ALL_HOSTS[@]}"; do
+                         "${cmake_options[@]}"
+                         -DLLVM_TABLEGEN=$(build_directory "${LOCAL_HOST}" llvm)/bin/llvm-tblgen
+                         -DSWIFT_INCLUDE_TEST_BINARIES:BOOL=FALSE
++                        -DSWIFT_INCLUDE_TOOLS:BOOL=$(true_false "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}")
++                    )
++                else
++                    cmake_options=(
++                        "${cmake_options[@]}"
++                        -DSWIFT_INCLUDE_TOOLS:BOOL=$(true_false "${BUILD_SWIFT_TOOLS}")
+                     )
+                 fi
 
--#if TARGET_OS_ANDROID
-+#if TARGET_OS_ANDROID && __ANDROID_API__ < 28
+@@ -1779,7 +1786,6 @@ for host in "${ALL_HOSTS[@]}"; do
+                     -DSWIFT_NATIVE_LLVM_TOOLS_PATH:STRING="${native_llvm_tools_path}"
+                     -DSWIFT_NATIVE_CLANG_TOOLS_PATH:STRING="${native_clang_tools_path}"
+                     -DSWIFT_NATIVE_SWIFT_TOOLS_PATH:STRING="${native_swift_tools_path}"
+-                    -DSWIFT_INCLUDE_TOOLS:BOOL=$(true_false "${BUILD_SWIFT_TOOLS}")
+                     -DSWIFT_BUILD_CLANG_OVERLAYS:BOOL=$(true_false "${BUILD_SWIFT_CLANG_OVERLAYS}")
+                     -DSWIFT_BUILD_REMOTE_MIRROR:BOOL=$(true_false "${BUILD_SWIFT_REMOTE_MIRROR}")
+                     -DSWIFT_STDLIB_SIL_DEBUGGING:BOOL=$(true_false "${BUILD_SIL_DEBUGGING_STDLIB}")
+@@ -2336,7 +2336,7 @@ for host in "${ALL_HOSTS[@]}"; do
+                     continue
+                 fi
 
- #include <dlfcn.h>
- #include <spawn.h>
-@@ -2277,6 +2277,10 @@ CF_EXPORT int _CFPosixSpawnFileActionsAddClose(_CFPosixSpawnFileActionsRef file_
-     return _CFPosixSpawnFileActionsAddCloseImpl(file_actions, filedes);
- }
+-                if [[ "${BUILD_SWIFT_TOOLS}" == "0" ]]; then
++                if [[ "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}" == "0" ]]; then
+                     echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built"
+                     continue
+                 fi
+@@ -2925,7 +2925,7 @@ for host in "${ALL_HOSTS[@]}"; do
+                     continue
+                 fi
 
-+CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_actions, const char *path) {
-+  return ENOSYS;
-+}
-+
- CF_EXPORT int _CFPosixSpawn(pid_t *_CF_RESTRICT pid, const char *_CF_RESTRICT path, _CFPosixSpawnFileActionsRef file_actions, _CFPosixSpawnAttrRef _Nullable _CF_RESTRICT attrp, char *_Nullable const argv[_Nullable _CF_RESTRICT], char *_Nullable const envp[_Nullable _CF_RESTRICT]) {
-     _CFPosixSpawnInitialize();
-     return _CFPosixSpawnImpl(pid, path, file_actions, attrp, argv, envp);
-@@ -2317,12 +2317,13 @@ CF_EXPORT int _CFPosixSpawnFileActionsChdir(_CFPosixSpawnFileActionsRef file_act
-   // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
-   //  - Amazon Linux 2 (EoL mid-2025)
-   return ENOSYS;
--  #elif defined(__OpenBSD__) || defined(__QNX__)
-+  #elif defined(__OpenBSD__) || defined(__QNX__) || (defined(__ANDROID__) && __ANDROID_API__ < 34)
-   // Currently missing as of:
-   //  - OpenBSD 7.5 (April 2024)
-   //  - QNX 8 (December 2023)
-+  //  - Android 13
-   return ENOSYS;
--  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || (defined(__ANDROID__) && __ANDROID_API__ >= 34) || defined(__musl__)
-+  #elif defined(__GLIBC__) || TARGET_OS_DARWIN || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
-   // Pre-standard posix_spawn_file_actions_addchdir_np version available in:
-   //  - Solaris 11.3 (October 2015)
-   //  - Glibc 2.29 (February 2019)
+-                if [[ "${BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
++                if [[ "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
+                     echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built"
+                     continue
+                 fi