rpmrc: remove -fstack-clash-protection from armv7 default flags

2 files changed, 6 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index f92d0e0..6a8798e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- rpmrc: remove -fstack-clash-protection from armv7 default flags
+
 Version 2.74.1 - 23 February 2024, by Jani Välimaa
 - rpmrc: remove -fcf-protection=full from i586 default flags (needs i686 or newer)
 
diff --git a/rpmrc.in b/rpmrc.in
index f2a39f8..9ade0cd 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -12,11 +12,11 @@ optflags: athlon %{__common_cflags_with_ssp} -fomit-frame-pointer -march=athlon
 optflags: x86_64 %{__common_cflags_with_ssp} -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection=full
   
 # Cortex A8
-optflags: armv7 %{__common_cflags_with_ssp} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fstack-clash-protection
-optflags: armv7l %{__common_cflags_with_ssp} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fstack-clash-protection
+optflags: armv7 %{__common_cflags_with_ssp} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+optflags: armv7l %{__common_cflags_with_ssp} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 
-optflags: armv7hl %{__common_cflags_with_ssp} -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -fstack-clash-protection
-optflags: armv7hnl %{__common_cflags_with_ssp} -march=armv7-a -mfloat-abi=hard -mfpu=neon -fstack-clash-protection
+optflags: armv7hl %{__common_cflags_with_ssp} -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
+optflags: armv7hnl %{__common_cflags_with_ssp} -march=armv7-a -mfloat-abi=hard -mfpu=neon
 
 optflags: aarch64 %{__common_cflags_with_ssp} -mbranch-protection=standard -fasynchronous-unwind-tables -fstack-clash-protection