[rpms/redhat-rpm-config] rawhide: Increase s390x baseline for RHEL 11 (ELN) and Fedora 45

[rpms/redhat-rpm-config] rawhide: Increase s390x baseline for RHEL 11 (ELN) and Fedora 45

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/redhat-rpm-config
            Branch : rawhide
            Commit : b7a088ac61e38cdbe1a0bde2103bfc7fa2a9e6df
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-06-22T14:29:12+00:00
            Stats  : +9/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/redhat-rpm-config/c/b7a088ac61e38cdbe1a0bde2103bfc7fa2a9e6df?branch=rawhide

            Log:
            Increase s390x baseline for RHEL 11 (ELN) and Fedora 45

https://github.com/fedora-eln/eln/issues/520
https://fedoraproject.org/wiki/Changes/GNUToolchainF44

---
diff --git a/macros b/macros
index e0b8573..5214b94 100644
--- a/macros
+++ b/macros
@@ -164,7 +164,15 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end
 %__cflags_arch_x86_64_common -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 %{_frame_pointers_cflags} %{_frame_pointers_cflags_x86_64}
 
 # Also used for s390.
-%__cflags_arch_s390x %[0%{?rhel} >= 9 ? "-march=z14 -mtune=z15" : "-march=z13 -mtune=z14"]
+# Fedora up to 44, and RHEL 8, target z13/z14
+# RHEL 9 targets z14/z15
+# RHEL 10 targets z14/z16
+# Fedora 45 and RHEL 11 target z15/z17
+%__cflags_arch_s390x %{shrink:
+  %[(0%{?fedora} >= 45 || 0%{?rhel} >= 11) ? "-march=z15 -mtune=z17" : ""]
+  %[0%{?rhel} == 10  ? "-march=z14 -mtune=z16" : ""]
+  %[0%{?rhel} == 9  ? "-march=z14 -mtune=z15" : ""]
+  %[!(0%{?fedora} >= 45 || 0%{?rhel} >= 9) ? "-march=z13 -mtune=z14" : ""]}
 
 %__cflags_arch_ppc64le %[0%{?rhel} >= 9 ? "-mcpu=power9 -mtune=power10" : "-mcpu=power8 -mtune=power8" ]