Update Swift compiler to 5.4.3

Author: finagolfin

.github/workflows/sdks.yml

@@ -151,7 +151,7 @@ jobs:
           if [ ! -d ${{ steps.version.outputs.tag }}-ubuntu20.04 ]; then
             tar xf ~/${{ steps.version.outputs.tag }}-ubuntu20.04.tar.gz
           fi
-          sed -i "s%/home/butta/swift-5.4.2-RELEASE%`pwd`/${{ steps.version.outputs.tag }}%" android-${{ matrix.arch }}.json
+          sed -i "s%/home/butta/swift-5.4.3-RELEASE%`pwd`/${{ steps.version.outputs.tag }}%" android-${{ matrix.arch }}.json
 
           tar xf ~/swift-${{ matrix.version }}*-android-${{ matrix.arch }}*-${ANDROID_API_LEVEL}-sdk.tar.xz
           SDK_NAME=$(ls | grep swift-${{ matrix.version }}.*-sdk)

README.md

@@ -3,7 +3,7 @@
 All patches used to build these SDKs are open source and listed below.
 
 To build with a Swift 5.4.2 SDK, first download [the latest Android LTS NDK
-23](https://developer.android.com/ndk/downloads) and [Swift 5.4.2
+23](https://developer.android.com/ndk/downloads) and [Swift 5.4.3
 compiler](https://swift.org/download/#releases) (make sure to install the Swift
 compiler's dependencies listed there). Unpack these archives and the SDK.
 
@@ -27,7 +27,7 @@ path where you unpacked this SDK, such as `/home/yourname/swift-5.4.2-android-aa
 to point to the clang headers next to your swift compiler, eg
 
 ```
-ln -sf /home/yourname/swift-5.4.2-RELEASE-ubuntu20.04/usr/lib/clang/10.0.0
+ln -sf /home/yourname/swift-5.4.3-RELEASE-ubuntu20.04/usr/lib/clang/10.0.0
 swift-5.4.2-android-aarch64-24-sdk/usr/lib/swift/clang
 ```
 The new NDK 23 needs to have a header modified: change the line from this file,
@@ -44,8 +44,8 @@ Finally, modify the cross-compilation JSON file in this repo similarly:
 1. All paths to the NDK should change from `/home/butta/android-ndk-r23`
 to the path to your NDK, `/home/yourname/android-ndk-r23`.
 
-2. The path to the compiler should change from `/home/butta/swift-5.4.2-RELEASE-ubuntu20.04`
-to the path to your Swift compiler, `/home/yourname/swift-5.4.2-RELEASE-centos8`.
+2. The path to the compiler should change from `/home/butta/swift-5.4.3-RELEASE-ubuntu20.04`
+to the path to your Swift compiler, `/home/yourname/swift-5.4.3-RELEASE-centos8`.
 
 3. The path to the Android SDK should change from `/home/butta/swift-5.4.2-android-aarch64-24-sdk`
 to the path where you unpacked the Android SDK, `/home/yourname/swift-5.4.2-android-aarch64-24-sdk`.
@@ -56,7 +56,7 @@ I'll demonstrate with the swift-argument-parser package:
 ```
 git clone --depth 1 https://github.com/apple/swift-argument-parser.git
 cd swift-argument-parser/
-/home/yourname/swift-5.4.2-RELEASE-ubuntu20.04/usr/bin/swift build --build-tests
+/home/yourname/swift-5.4.3-RELEASE-ubuntu20.04/usr/bin/swift build --build-tests
 --enable-test-discovery --destination ~/swift-android-sdk/android-aarch64.json
 -Xlinker -rpath -Xlinker \$ORIGIN/swift-5.4.2-android-aarch64-24-sdk/usr/lib/swift/android
 ```
@@ -109,9 +109,9 @@ mode.
 
 # Building the Android SDKs
 
-Download the Swift 5.4.2 compiler and Android NDK 23 as above. Check out this
+Download the Swift 5.4.3 compiler and Android NDK 23 as above. Check out this
 repo and run
-`SWIFT_TAG=swift-5.4.2-RELEASE ANDROID_ARCH=aarch64 swift get-packages-and-swift-source.swift`
+`SWIFT_TAG=swift-5.4.3-RELEASE ANDROID_ARCH=aarch64 swift get-packages-and-swift-source.swift`
 to get some prebuilt Android libraries and the Swift source to build the SDK. If
 you pass in a different tag like `swift-5.5-DEVELOPMENT-SNAPSHOT-2021-08-28-a`
 for the latest Swift 5.5 snapshot and pass in the path to the corresponding
@@ -124,18 +124,18 @@ substituted instead:
 ```
 ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android
 --android-ndk /home/butta/android-ndk-r23/ --android-arch aarch64 --android-api-level 24
---android-icu-uc /home/butta/swift-5.4.2-android-aarch64-24-sdk/usr/lib/libicuuc.so
---android-icu-uc-include /home/butta/swift-5.4.2-android-aarch64-24-sdk/usr/include/
---android-icu-i18n /home/butta/swift-5.4.2-android-aarch64-24-sdk/usr/lib/libicui18n.so
---android-icu-i18n-include /home/butta/swift-5.4.2-android-aarch64-24-sdk/usr/include/
---android-icu-data /home/butta/swift-5.4.2-android-aarch64-24-sdk/usr/lib/libicudata.so
---build-swift-tools=0 --native-swift-tools-path=/home/butta/swift-5.4.2-RELEASE-ubuntu20.04/usr/bin/
+--android-icu-uc /home/butta/swift-5.4.3-android-aarch64-24-sdk/usr/lib/libicuuc.so
+--android-icu-uc-include /home/butta/swift-5.4.3-android-aarch64-24-sdk/usr/include/
+--android-icu-i18n /home/butta/swift-5.4.3-android-aarch64-24-sdk/usr/lib/libicui18n.so
+--android-icu-i18n-include /home/butta/swift-5.4.3-android-aarch64-24-sdk/usr/include/
+--android-icu-data /home/butta/swift-5.4.3-android-aarch64-24-sdk/usr/lib/libicudata.so
+--build-swift-tools=0 --native-swift-tools-path=/home/butta/swift-5.4.3-RELEASE-ubuntu20.04/usr/bin/
 --native-clang-tools-path=/home/butta/android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/bin
 --host-cc=/usr/bin/clang-11 --host-cxx=/usr/bin/clang++-11
---cross-compile-hosts=android-aarch64 --cross-compile-deps-path=/home/butta/swift-5.4.2-android-aarch64-24-sdk
+--cross-compile-hosts=android-aarch64 --cross-compile-deps-path=/home/butta/swift-5.4.3-android-aarch64-24-sdk
 --skip-local-build --xctest --swift-install-components='clang-resource-dir-symlink;license;stdlib;sdk-overlay'
 --install-swift --install-libdispatch --install-foundation --install-xctest
---install-destdir=/home/butta/swift-5.4.2-android-aarch64-24-sdk
+--install-destdir=/home/butta/swift-5.4.3-android-aarch64-24-sdk
 --common-swift-flags="-Xlinker -rpath -Xlinker \\\$\$ORIGIN/../.."
 --swift-cmake-options=-DCMAKE_SHARED_LINKER_FLAGS='-Wl,-rpath,"\$ORIGIN/../.."' -j9
 ```
@@ -148,8 +148,8 @@ into these two commands to build for those architectures instead.
 Finally, copy `libc++_shared.so` from the NDK and modify the cross-compiled
 `libdispatch.so` to include `$ORIGIN` in its rpath:
 ```
-cp /home/yourname/android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so swift-5.4.2-android-aarch64-24-sdk/usr/lib
-patchelf --set-rpath \$ORIGIN swift-5.4.2-android-aarch64-24-sdk/usr/lib/swift/android/libdispatch.so
+cp /home/yourname/android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so swift-5.4.3-android-aarch64-24-sdk/usr/lib
+patchelf --set-rpath \$ORIGIN swift-5.4.3-android-aarch64-24-sdk/usr/lib/swift/android/libdispatch.so
 ```
 
 Here is a description of what the above Swift script is doing:
@@ -162,18 +162,18 @@ libcurl, and libxml2 packages from the [Termux package
 repository](https://packages.termux.org/apt/termux-main/pool/main/).
 
 Each one is unpacked with `ar x libicu_68.2-1_aarch64.deb; tar xf data.tar.xz` and
-the resulting files moved to a newly-created Swift 5.4.2 SDK directory:
+the resulting files moved to a newly-created Swift 5.4.3 SDK directory:
 ```
-mkdir swift-5.4.2-android-aarch64-24-sdk
-mv data/data/com.termux/files/usr swift-5.4.2-android-aarch64-24-sdk
+mkdir swift-5.4.3-android-aarch64-24-sdk
+mv data/data/com.termux/files/usr swift-5.4.3-android-aarch64-24-sdk
 ```
 It removes two config scripts in `usr/bin`, runs `patchelf` to remove the
 Termux rpath from all Termux shared libraries, and modifies the ICU libraries
 to get rid of the versioning and symlinks (three libicu libraries are removed
 since they're unused by Swift):
 ```
-rm swift-5.4.2-android-aarch64-24-sdk/usr/bin/*-config
-cd swift-5.4.2-android-aarch64-24-sdk/usr/lib
+rm swift-5.4.3-android-aarch64-24-sdk/usr/bin/*-config
+cd swift-5.4.3-android-aarch64-24-sdk/usr/lib
 
 rm libicu{io,test,tu}*
 patchelf --set-rpath \$ORIGIN libandroid-spawn.so libcurl.so libicu*so.68.2 libxml2.so
@@ -203,12 +203,12 @@ instead, so this Swift SDK for Android could be built without using
 any prebuilt Termux packages, if you're willing to put in the effort to
 cross-compile them yourself, for example, against a different Android API.
 
-Next, it gets [the 5.4.2 source](https://github.com/apple/swift/releases/tag/swift-5.4.2-RELEASE)
+Next, it gets [the 5.4.3 source](https://github.com/apple/swift/releases/tag/swift-5.4.3-RELEASE)
 tarballs for five Swift repos and renames them to `llvm-project/`, `swift/`,
 `swift-corelibs-libdispatch`, `swift-corelibs-foundation`, and
 `swift-corelibs-xctest`, as required by the Swift `build-script`. After creating
 an empty directory, `mkdir cmark`, it downloads six patches that have been
-backported to build the Termux package for Swift 5.4.2 (all Termux patches are
+backported to build the Termux package for Swift 5.4.3 (all Termux patches are
 available under the [same license as the Termux package, the Apache license used
 by Swift in this case](https://github.com/termux/termux-packages/blob/master/LICENSE.md#license-for-package-patches))
 and applies each of them:

android-aarch64.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "target": "aarch64-unknown-linux-android",
-    "toolchain-bin-dir": "/home/butta/swift-5.4.2-RELEASE-ubuntu20.04/usr/bin",
+    "toolchain-bin-dir": "/home/butta/swift-5.4.3-RELEASE-ubuntu20.04/usr/bin",
     "sdk": "/home/butta/android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/sysroot",
     "extra-cc-flags": [
         "-fPIC"

android-armv7.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "target": "armv7-unknown-linux-androideabi",
-    "toolchain-bin-dir": "/home/butta/swift-5.4.2-RELEASE-ubuntu20.04/usr/bin",
+    "toolchain-bin-dir": "/home/butta/swift-5.4.3-RELEASE-ubuntu20.04/usr/bin",
     "sdk": "/home/butta/android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/sysroot",
     "extra-cc-flags": [
         "-fPIC"

android-x86_64.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "target": "x86_64-unknown-linux-android",
-    "toolchain-bin-dir": "/home/butta/swift-5.4.2-RELEASE-ubuntu20.04/usr/bin",
+    "toolchain-bin-dir": "/home/butta/swift-5.4.3-RELEASE-ubuntu20.04/usr/bin",
     "sdk": "/home/butta/android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/sysroot",
     "extra-cc-flags": [
         "-fPIC"