From 04be20e64b522956b90d40e9973957aa4c190690 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 10 Feb 2022 12:08:15 +0100
Subject: [PATCH] s390x: Switch baseline to z14 on ELN (ELN issue 79)

---
 macros                 | 2 +-
 redhat-rpm-config.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/macros b/macros
index a65697a..9256cbb 100644
--- a/macros
+++ b/macros
@@ -132,7 +132,7 @@ print(result)
 %__cflags_arch_x86_64 %[0%{?rhel} >= 9 ? "-march=x86-64-v2" : ""]
 
 # Also used for s390.
-%__cflags_arch_s390x %[0%{?rhel} >= 8 ? "-march=z13 -mtune=z14" : "-march=zEC12 -mtune=z13"]
+%__cflags_arch_s390x %[0%{?rhel} >= 9 ? "-march=z14 -mtune=z15" : "-march=zEC12 -mtune=z13"]
 
 #==============================================================================
 # ---- configure and makeinstall.
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 5842683..0f9a2ff 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 212
+Version: 213
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -191,6 +191,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Thu Feb 10 2022 Florian Weimer <fweimer@redhat.com> - 213-1
+- s390x: Switch baseline to z14 on ELN (ELN issue 79)
+
 * Sun Jan 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 212-1
 - Add package note generation to %%check preamble
 - Fix: rhbz#2043977