From 422e4af8668cfa41fdfeb93bbf3ea97194fa0443 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 24 Aug 2021 16:31:48 +0200
Subject: [PATCH] redhat-rpm-config: Enable x86-64-v2 baseline for Clang/LLVM
 (#1890170)

Resolves: #1890170
---
 macros                 | 2 +-
 redhat-rpm-config.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/macros b/macros
index 33035d5..7a1b333 100644
--- a/macros
+++ b/macros
@@ -133,7 +133,7 @@ print(result)
 
 # Architecture-specific support.  Internal.  Do not use directly.
 
-%__cflags_arch_x86_64 %[0%{?rhel} >= 9 && "%{toolchain}" == "gcc" ? "-march=x86-64-v2" : ""]
+%__cflags_arch_x86_64 %[0%{?rhel} >= 9 ? "-march=x86-64-v2" : ""]
 
 # Also used for s390.
 %__cflags_arch_s390x %[0%{?rhel} >= 9 ? "-march=z14 -mtune=z15" : "-march=zEC12 -mtune=z13"]
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 8a97048..6246479 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,8 +6,8 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 187
-Release: 2%{?dist}
+Version: 188
+Release: 1%{?dist}
 # No version specified.
 License: GPL+
 URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
@@ -189,6 +189,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Tue Aug 24 2021 Florian Weimer <fweimer@redhat.com> - 188-1
+- redhat-rpm-config: Enable x86-64-v2 baseline for Clang/LLVM (#1890170)
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 187-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688