WIP: Test out a patch for LLVM

mstorsjo · Feb 22, 2024 · c929389 · c929389
1 parent 908f88f
commit c929389
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/.github/workflows/test-llvm.yml b/.github/workflows/test-llvm.yml
@@ -68,6 +68,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"
       # Not passing -DPython3_EXECUTABLE="$Env:PYTHON_EXE" here. The bundled Python doesn't normally have
       # zlib enabled, which some tests require.

diff --git a/build-llvm.sh b/build-llvm.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-: ${LLVM_VERSION:=llvmorg-18.1.0-rc3}
+: ${LLVM_VERSION:=e2f08268304dc972440391c43bf1d47e28fad93e}
 ASSERTS=OFF
 unset HOST
 BUILDDIR="build"
@@ -117,6 +117,7 @@ if [ -n "$SYNC" ] || [ -n "$CHECKOUT" ]; then
             ;;
         esac
     fi
+    git am -3 ../patches/llvm-project/*.patch
     cd ..
 fi
 

diff --git a/patches/llvm-project/0001-llvm-jitlink-test-Add-an-XFAIL-for-a-JITLink-test-on.patch b/patches/llvm-project/0001-llvm-jitlink-test-Add-an-XFAIL-for-a-JITLink-test-on.patch
@@ -0,0 +1,32 @@
+From 9600a7709045d796b48a49b5e6477d97a44849e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]>
+Date: Fri, 23 Feb 2024 00:45:32 +0200
+Subject: [PATCH] [llvm-jitlink] [test] Add an XFAIL for a JITLink test on
+ MinGW
+
+This testcase fails on MinGW targets, because when compiling the
+main() function, it gets an implicit call to __main(), which is
+missing in this context.
+---
+ llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test b/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test
+index ec71011d545e..50585a2d02e9 100644
+--- a/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test
++++ b/llvm/test/ExecutionEngine/JITLink/Generic/sectcreate.test
+@@ -8,4 +8,9 @@
+ # Jitlink does not support ARM64 COFF files.
+ # UNSUPPORTED: target=aarch64-pc-windows-{{.*}}
+
+-# jitlink-check: *{4}foo = 0x2a2a5a5a
+\ No newline at end of file
++# On MinGW targets, when compiling the main() function, it gets
++# an implicitly generated call to __main(), which is missing in
++# this context.
++# XFAIL: target={{.*}}-windows-gnu
++
++# jitlink-check: *{4}foo = 0x2a2a5a5a
+-- 
+2.25.1
+