From 619c22a14a95e6bff9235641501258bbb599d0a8 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 1 May 2026 23:14:06 +0200
Subject: [PATCH 1/4] map 32bit ZEN to NEHALEM rather than BARCELONA

---
 cmake/system.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/system.cmake b/cmake/system.cmake
index a274d1195a..71bd1142c6 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -68,10 +68,10 @@ endif ()
 if (DEFINED BINARY AND DEFINED TARGET AND BINARY EQUAL 32)
   message(STATUS "Compiling a ${BINARY}-bit binary.")
   set(NO_AVX 1)
-  if (${TARGET} STREQUAL "HASWELL" OR ${TARGET} STREQUAL "SANDYBRIDGE" OR ${TARGET} STREQUAL "SKYLAKEX" OR ${TARGET} STREQUAL "COOPERLAKE" OR ${TARGET} STREQUAL "SAPPHIRERAPIDS")
+  if (${TARGET} STREQUAL "HASWELL" OR ${TARGET} STREQUAL "ZEN" OR ${TARGET} STREQUAL "SANDYBRIDGE" OR ${TARGET} STREQUAL "SKYLAKEX" OR ${TARGET} STREQUAL "COOPERLAKE" OR ${TARGET} STREQUAL "SAPPHIRERAPIDS")
     set(TARGET "NEHALEM")
   endif ()
-  if (${TARGET} STREQUAL "BULLDOZER" OR ${TARGET} STREQUAL "PILEDRIVER" OR ${TARGET} STREQUAL "ZEN")
+  if (${TARGET} STREQUAL "BULLDOZER" OR ${TARGET} STREQUAL "PILEDRIVER")
     set(TARGET "BARCELONA")
   endif ()
   if (${TARGET} STREQUAL "ARMV8" OR ${TARGET} STREQUAL "CORTEXA57" OR ${TARGET} STREQUAL "CORTEXA53" OR ${TARGET} STREQUAL "CORTEXA55")

From 3b23194778580e547ed5650359b50486e8d1e165 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 1 May 2026 23:15:38 +0200
Subject: [PATCH 2/4] Map 32bit ZEN to NEHALEM rather than old BARCELONA

---
 Makefile.system | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.system b/Makefile.system
index e7638755df..4b1535f875 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -194,7 +194,7 @@ ifeq ($(TARGET_CORE), EXCAVATOR)
 GETARCH_FLAGS := -DFORCE_BARCELONA
 endif
 ifeq ($(TARGET_CORE), ZEN)
-GETARCH_FLAGS := -DFORCE_BARCELONA
+GETARCH_FLAGS := -DFORCE_NEHALEM
 endif
 endif
 

From d394815eb22c02114f54774c420efc0947e65bc3 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 2 May 2026 11:54:40 +0200
Subject: [PATCH 3/4] rework msys2 install as mingw i686 has dropped gfortran

---
 .github/workflows/dynamic_arch.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml
index 610c8cc246..22af06b28f 100644
--- a/.github/workflows/dynamic_arch.yml
+++ b/.github/workflows/dynamic_arch.yml
@@ -196,29 +196,29 @@ jobs:
           - msystem: UCRT64
             idx: int32
             target-prefix: mingw-w64-ucrt-x86_64
-            fc-pkg: fc
+            fc-pkg: ${{target-prefix}}-fc
           - msystem: MINGW32
             idx: int32
             target-prefix: mingw-w64-i686
-            fc-pkg: fc
+            fc-pkg: 
           - msystem: CLANG64
             idx: int32
             target-prefix: mingw-w64-clang-x86_64
-            fc-pkg: fc
+            fc-pkg: ${{target-prefix}}-fc
           - msystem: UCRT64
             idx: int64
             idx64-flags: -DBINARY=64 -DINTERFACE64=1
             target-prefix: mingw-w64-ucrt-x86_64
-            fc-pkg: fc
+            fc-pkg: ${{target-prefix}}-fc
           - msystem: CLANG64
             idx: int64
             idx64-flags: -DBINARY=64 -DINTERFACE64=1
             target-prefix: mingw-w64-clang-x86_64
-            fc-pkg: fc
+            fc-pkg: ${{target-prefix}}-fc
           - msystem: UCRT64
             idx: int32
             target-prefix: mingw-w64-ucrt-x86_64
-            fc-pkg: fc
+            fc-pkg: ${{target-prefix}}-fc
             build-type: None
         exclude:
           - msystem: MINGW32
@@ -247,7 +247,7 @@ jobs:
           install: >-
             base-devel
             ${{ matrix.target-prefix }}-cc
-            ${{ matrix.target-prefix }}-${{ matrix.fc-pkg }}
+            ${{ matrix.fc-pkg }}
             ${{ matrix.target-prefix }}-cmake
             ${{ matrix.target-prefix }}-ninja
             ${{ matrix.target-prefix }}-ccache

From f90b0d5bc5caaacb5c23b73e618220af704008e0 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 2 May 2026 13:50:09 +0200
Subject: [PATCH 4/4] expand target-prefix in fc-pkg

---
 .github/workflows/dynamic_arch.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml
index 22af06b28f..5c39a7d407 100644
--- a/.github/workflows/dynamic_arch.yml
+++ b/.github/workflows/dynamic_arch.yml
@@ -196,7 +196,7 @@ jobs:
           - msystem: UCRT64
             idx: int32
             target-prefix: mingw-w64-ucrt-x86_64
-            fc-pkg: ${{target-prefix}}-fc
+            fc-pkg: mingw-w64-ucrt-x86_64-fc
           - msystem: MINGW32
             idx: int32
             target-prefix: mingw-w64-i686
@@ -204,21 +204,21 @@ jobs:
           - msystem: CLANG64
             idx: int32
             target-prefix: mingw-w64-clang-x86_64
-            fc-pkg: ${{target-prefix}}-fc
+            fc-pkg: mingw-w64-clang-x86_64-fc
           - msystem: UCRT64
             idx: int64
             idx64-flags: -DBINARY=64 -DINTERFACE64=1
             target-prefix: mingw-w64-ucrt-x86_64
-            fc-pkg: ${{target-prefix}}-fc
+            fc-pkg: mingw-w64-ucrt-x86_64-fc
           - msystem: CLANG64
             idx: int64
             idx64-flags: -DBINARY=64 -DINTERFACE64=1
             target-prefix: mingw-w64-clang-x86_64
-            fc-pkg: ${{target-prefix}}-fc
+            fc-pkg: mingw-w64-clang-x86_64-fc
           - msystem: UCRT64
             idx: int32
             target-prefix: mingw-w64-ucrt-x86_64
-            fc-pkg: ${{target-prefix}}-fc
+            fc-pkg: mingw-w64-ucrt-x86_64-fc
             build-type: None
         exclude:
           - msystem: MINGW32