diff --git a/macros b/macros index d9e283d..9bf2a0e 100644 --- a/macros +++ b/macros @@ -138,7 +138,9 @@ print(result) # Architecture-specific support. Internal. Do not use directly. -%__cflags_arch_x86_64 %[0%{?rhel} >= 9 ? "-march=x86-64-v2" : ""] +%__cflags_arch_x86_64_v2 %[0%{?rhel} == 9 ? "-march=x86-64-v2" : ""] +%__cflags_arch_x86_64_v3 %[0%{?rhel} > 9 ? "-march=x86-64-v3" : ""] +%__cflags_arch_x86_64 %{__cflags_arch_x86_64_v2} %{__cflags_arch_x86_64_v3} # Also used for s390. %__cflags_arch_s390x %[0%{?rhel} >= 9 ? "-march=z14 -mtune=z15" : "-march=z13 -mtune=z14"] diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index ab4192f..3724908 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 253 +%global baserelease 254 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -253,6 +253,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Thu Mar 9 2023 Florian Weimer - 254-1 +- Switch ELN to x86-64-v3 + * Tue Feb 28 2023 Maxwell G - 253-1 - Include RUSTFLAGS in %%set_build_flags - Fixes: rhbz#2167183