WIP: Apply a couple of patches on llvm-project

Author: mstorsjo

.github/workflows/build.yml

@@ -403,6 +403,8 @@ jobs:
         env:
           LLVM_VERSION: ${{needs.prepare.outputs.LLVM_VERSION}}
         run: |
+          git config --global user.name "LLVM MinGW"
+          git config --global user.email root@localhost
           bash -c "CHECKOUT_ONLY=1 ./build-llvm.sh"
       - name: Build and test libcxx
         run: |
@@ -532,6 +534,8 @@ jobs:
           LLVM_VERSION: ${{needs.prepare.outputs.LLVM_VERSION}}
         run: |
           git config --global core.autocrlf false
+          git config --global user.name "LLVM MinGW"
+          git config --global user.email root@localhost
           bash -c "CHECKOUT_ONLY=1 ./build-llvm.sh"
       - name: Build test executables
         run: |

build-llvm.sh

@@ -120,6 +120,7 @@ if [ -n "$SYNC" ] || [ -n "$CHECKOUT" ]; then
             ;;
         esac
     fi
+    git am -3 ../patches/llvm-project/*.patch
     cd ..
 fi
 

patches/llvm-project/0001-compiler-rt-test-Don-t-apply-the-arm-or-armhf-patter.patch

@@ -0,0 +1,27 @@
+From 34c2e60b2d15206a63ed6bb486124d5ea8748484 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]>
+Date: Fri, 23 May 2025 12:35:46 +0300
+Subject: [PATCH 1/2] [compiler-rt] [test] Don't apply the "arm" or "armhf"
+ patterns for targets starting with "arm64"
+
+This fixes finding the builtins library for arm64ec.
+---
+ compiler-rt/test/lit.common.configured.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
+index f673a13be9cb..04d1a4df5a54 100644
+--- a/compiler-rt/test/lit.common.configured.in
++++ b/compiler-rt/test/lit.common.configured.in
+@@ -69,7 +69,7 @@ elif config.android:
+   else:
+     set_default("target_suffix", "-%s-android" % config.target_arch)
+ else:
+-  if config.target_arch.startswith("arm"):
++  if config.target_arch.startswith("arm") and not config.target_arch.startswith("arm64"):
+     if config.target_arch.endswith("hf"):
+       set_default("target_suffix", "-armhf")
+     else:
+-- 
+2.43.0
+

patches/llvm-project/0002-libcxx-test-Extend-mingw-target-checks-to-cover-the-.patch

@@ -0,0 +1,38 @@
+From 2e1e95d0cb01aa75d5ae06af459325afff6c0a78 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]>
+Date: Fri, 23 May 2025 13:38:31 +0300
+Subject: [PATCH 2/2] [libcxx] [test] Extend mingw target checks to cover the
+ arm64ec architecture too
+
+---
+ .../new.delete/new.delete.array/sized_delete_array.pass.cpp      | 1 +
+ .../new.delete/new.delete.single/sized_delete.pass.cpp           | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp
+index dd0b1d60d28d..175cda39abc2 100644
+--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp
++++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array.pass.cpp
+@@ -19,6 +19,7 @@
+ // ADDITIONAL_COMPILE_FLAGS(target=i686-w64-windows-gnu): -fsized-deallocation
+ // ADDITIONAL_COMPILE_FLAGS(target=aarch64-w64-windows-gnu): -fsized-deallocation
+ // ADDITIONAL_COMPILE_FLAGS(target=armv7-w64-windows-gnu): -fsized-deallocation
++// ADDITIONAL_COMPILE_FLAGS(target=arm64ec-w64-windows-gnu): -fsized-deallocation
+ 
+ // Android clang-r536225 identifies as clang-19.0 but it predates the real
+ // LLVM 19.0.0, so it also leaves sized deallocation off by default.
+diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp
+index 9469af1c78f3..29229650cc19 100644
+--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp
++++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete.pass.cpp
+@@ -19,6 +19,7 @@
+ // ADDITIONAL_COMPILE_FLAGS(target=i686-w64-windows-gnu): -fsized-deallocation
+ // ADDITIONAL_COMPILE_FLAGS(target=aarch64-w64-windows-gnu): -fsized-deallocation
+ // ADDITIONAL_COMPILE_FLAGS(target=armv7-w64-windows-gnu): -fsized-deallocation
++// ADDITIONAL_COMPILE_FLAGS(target=arm64ec-w64-windows-gnu): -fsized-deallocation
+ 
+ // Android clang-r536225 identifies as clang-19.0 but it predates the real
+ // LLVM 19.0.0, so it also leaves sized deallocation off by default.
+-- 
+2.43.0
+