From 8cd66834d25917ea3b3635ac3b3ee4c7ae8a1817 Mon Sep 17 00:00:00 2001
From: Ludovic Henry <git@ludovic.dev>
Date: Wed, 1 Apr 2026 19:22:37 +0200
Subject: [PATCH 1/2] Also test lapack and arpack on Windows

---
 .github/workflows/build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 875c8ebb..eaa25b50 100755
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -223,7 +223,7 @@ jobs:
         java-version: ${{ matrix.jdk }}
         distribution: temurin
     - name: Test
-      run: mvn --batch-mode --no-transfer-progress --projects test-utils,blas test --fail-at-end "-Dmaven.main.skip=true" "-Dmaven.antrun.skip=true"
+      run: mvn --batch-mode --no-transfer-progress --projects test-utils,blas,lapack,arpack test --fail-at-end "-Dmaven.main.skip=true" "-Dmaven.antrun.skip=true"
 
   release:
     name: Release

From 7dcf1cd6cf758bc83dca5670bddac2b88d72ac72 Mon Sep 17 00:00:00 2001
From: Ludovic Henry <git@ludovic.dev>
Date: Wed, 1 Apr 2026 19:29:48 +0200
Subject: [PATCH 2/2] Add cross-compilation to windows-arm64

I can't add it to CI (no hosted Github runners), so it's not tested
---
 .github/workflows/build-and-test.yml |  6 ++++--
 pom.xml                              | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index eaa25b50..bce7bd80 100755
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -61,6 +61,7 @@ jobs:
         install: >-
           mingw-w64-ucrt-x86_64-gcc
           mingw-w64-ucrt-x86_64-dlfcn
+          mingw-w64-cross-mingwarm64-gcc
           make
     - name: Add MSYS2 UCRT64 to PATH
       shell: msys2 {0}
@@ -190,12 +191,13 @@ jobs:
       run: mvn --batch-mode --no-transfer-progress --projects test-utils,blas,lapack,arpack test --fail-at-end -Dmaven.main.skip=true -Dmaven.antrun.skip=true
 
   test-windows:
-    name: "Test: runs-on: windows-latest, jdk: ${{ matrix.jdk }}"
-    runs-on: windows-latest
+    name: "Test: runs-on: ${{ matrix.runs-on }}, jdk: ${{ matrix.jdk }}"
+    runs-on: ${{ matrix.runs-on }}
     needs: [build-jar]
     strategy:
       matrix:
         jdk: [11, 17, 21, 25]
+        runs-on: [windows-latest]
     steps:
     - uses: actions/checkout@v4
     - name: Cache M2 local repository
diff --git a/pom.xml b/pom.xml
index d3c66cce..50d70835 100755
--- a/pom.xml
+++ b/pom.xml
@@ -217,9 +217,19 @@ information or have any questions.
                         <arg line="INPUTS='jni.c'"/>
                         <arg line="OUTPUT='${project.build.directory}/native/windows-amd64/libnetlib${project.artifactId}jni.dll'"/>
                         <arg line="OBJDIR='${project.build.directory}/objs/windows-amd64'"/>
-                        <arg line="CC='gcc'"/>
+                        <arg line="CC='x86_64-w64-mingw32-gcc'"/>
                         <arg line="CCFLAGS='-c -Werror -Wall -Wextra -Wno-unused-label -O2 -I${project.build.directory}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32'"/>
-                        <arg line="LD='gcc'"/>
+                        <arg line="LD='x86_64-w64-mingw32-gcc'"/>
+                        <arg line="LDFLAGS='-shared -Wl,-Bstatic,-ldl,-Bdynamic'"/>
+                        <arg line="all"/>
+                      </exec>
+                      <exec executable="make" dir="${project.basedir}/src/main/native" failonerror="true">
+                        <arg line="INPUTS='jni.c'"/>
+                        <arg line="OUTPUT='${project.build.directory}/native/windows-arm64/libnetlib${project.artifactId}jni.dll'"/>
+                        <arg line="OBJDIR='${project.build.directory}/objs/windows-arm64'"/>
+                        <arg line="CC='aarch64-w64-mingw32-gcc'"/>
+                        <arg line="CCFLAGS='-c -Werror -Wall -Wextra -Wno-unused-label -O2 -I${project.build.directory}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32'"/>
+                        <arg line="LD='aarch64-w64-mingw32-gcc'"/>
                         <arg line="LDFLAGS='-shared -Wl,-Bstatic,-ldl,-Bdynamic'"/>
                         <arg line="all"/>
                       </exec>