aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2024-03-31 22:39:41 +0300
committerJani Välimaa <wally@mageia.org>2024-03-31 22:39:41 +0300
commit0ef05e356b243eaf0b42a8b6561357cad26d2950 (patch)
tree8458eecf752c6be85abfa4563b28843490d40189
parentb96cb984e5a7a23afbf133ab06ce38a86cbd9e40 (diff)
downloadrpm-setup-0ef05e356b243eaf0b42a8b6561357cad26d2950.tar
rpm-setup-0ef05e356b243eaf0b42a8b6561357cad26d2950.tar.gz
rpm-setup-0ef05e356b243eaf0b42a8b6561357cad26d2950.tar.bz2
rpm-setup-0ef05e356b243eaf0b42a8b6561357cad26d2950.tar.xz
rpm-setup-0ef05e356b243eaf0b42a8b6561357cad26d2950.zip
rpmrc: don't use -fstack-clash-protection on aarch64 with the clang toolchain
-rw-r--r--NEWS2
-rw-r--r--rpmrc.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 62b72d2..ef8072c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- rpmrc: don't use -fstack-clash-protection on aarch64 with the clang toolchain
+
Version 2.76 - 30 March 2024, by Jani Välimaa
- macros: add support for toolchain selection (GCC/Clang)
diff --git a/rpmrc.in b/rpmrc.in
index 440a643..107c252 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -18,7 +18,7 @@ optflags: armv7l %{__common_cflags_with_ssp} -march=armv7-a -mfpu=neon -mtune=co
optflags: armv7hl %{__common_cflags_with_ssp} -march=armv7-a -mfpu=vfpv3-d16 -mtune=generic-armv7-a -mabi=aapcs-linux -mfloat-abi=hard
optflags: armv7hnl %{__common_cflags_with_ssp} -march=armv7-a -mfpu=neon -mabi=aapcs-linux -mfloat-abi=hard
-optflags: aarch64 %{__common_cflags_with_ssp} -mbranch-protection=standard -fasynchronous-unwind-tables -fstack-clash-protection
+optflags: aarch64 %{__common_cflags_with_ssp} -mbranch-protection=standard -fasynchronous-unwind-tables %[ "%{toolchain}" == "gcc" ? "-fstack-clash-protection" : "" ]
#############################################################
# Canonical arch names and numbers