diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 32c68ff..993d520 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: 185 -Release: 3%{?dist} +Version: 186 +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 +* Thu Jul 22 2021 Florian Weimer - 186-1 +- aarch64: Do not build with -mbranch-protection=standard (#1984652) + * Tue May 25 2021 Michal Domonkos - 185-3 - Bump release for a rebuild in a sidetag diff --git a/rpmrc b/rpmrc index d59bc63..337a86f 100644 --- a/rpmrc +++ b/rpmrc @@ -74,7 +74,7 @@ optflags: hades %{__global_compiler_flags} optflags: s390 %{__global_compiler_flags} -m31 %{__cflags_arch_s390x} -fasynchronous-unwind-tables optflags: s390x %{__global_compiler_flags} -m64 %{__cflags_arch_s390x} -fasynchronous-unwind-tables -fstack-clash-protection -optflags: aarch64 %{__global_compiler_flags} -mbranch-protection=standard -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] +optflags: aarch64 %{__global_compiler_flags} -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] optflags: riscv64 %{__global_compiler_flags} -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ]