From 75f13b0ffdca2e0ad14d0a3f8c6f027de50c137a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 5 Oct 2023 17:53:18 +0200 Subject: [PATCH] Disable -fstack-clash-protection on riscv64 (#2242327) --- redhat-rpm-config.spec | 5 ++++- rpmrc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index a4c0f8a..5764e68 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 269 +%global baserelease 270 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -255,6 +255,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog +* Thu Oct 5 2023 Florian Weimer - 270-1 +- Disable -fstack-clash-protection on riscv64 (#2242327) + * Thu Oct 5 2023 Nikita Popov - 269-1 - Use correct format specifier in brp-llvm-compile-lto-elf diff --git a/rpmrc b/rpmrc index 6d74f22..a407129 100644 --- a/rpmrc +++ b/rpmrc @@ -16,7 +16,7 @@ optflags: s390x %{__global_compiler_flags} -m64 %{__cflags_arch_s390x} -fasynchr optflags: aarch64 %{__global_compiler_flags} -mbranch-protection=standard -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] %{_frame_pointers_cflags} %{_frame_pointers_cflags_aarch64} -optflags: riscv64 %{__global_compiler_flags} -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ] %{_frame_pointers_cflags} +optflags: riscv64 %{__global_compiler_flags} -fasynchronous-unwind-tables %{_frame_pointers_cflags} # set build arch to fedora buildarches on hardware capable of running it # saves having to do rpmbuild --target=