aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2020-01-24 14:30:53 +0200
committerJani Välimaa <wally@mageia.org>2020-01-24 14:44:25 +0200
commit759795185210246df225dabad11892d1d54c1843 (patch)
treee43615614cbf6418af48ac65a7505f6fcecb169e
parentd926d955426920862e523b13fae884040225c45d (diff)
downloadrpm-setup-759795185210246df225dabad11892d1d54c1843.tar
rpm-setup-759795185210246df225dabad11892d1d54c1843.tar.gz
rpm-setup-759795185210246df225dabad11892d1d54c1843.tar.bz2
rpm-setup-759795185210246df225dabad11892d1d54c1843.tar.xz
rpm-setup-759795185210246df225dabad11892d1d54c1843.zip
rpmrc: use _ssp_cflags also with arm optflags
$ rpm --eval %_ssp_cflags -fstack-protector --param=ssp-buffer-size=4
-rw-r--r--NEWS1
-rw-r--r--rpmrc.in22
2 files changed, 12 insertions, 11 deletions
diff --git a/NEWS b/NEWS
index 653eee9..bb425e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- rpmrc: use _ssp_cflags also with arm optflags
- build.macros: drop unused macros
- _package_i18n()
diff --git a/rpmrc.in b/rpmrc.in
index 945e99c..f69ad8f 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -50,20 +50,20 @@ optflags: mipsel %{__common_cflags} -march=mips3
optflags: mips32el %{__common_cflags} -march=mips3 -mabi=n32
optflags: mips64el %{__common_cflags} -march=mips3 -mabi=64
-optflags: armv3l %{__common_cflags} -march=armv3
-optflags: armv4b %{__common_cflags} -march=armv4
-optflags: armv4l %{__common_cflags} -march=armv4
-optflags: armv4t %{__common_cflags} -march=armv4t
-optflags: armv4tl %{__common_cflags} -march=armv4t
-optflags: armv5t %{__common_cflags} -march=armv5t
-optflags: armv5tl %{__common_cflags} -march=armv5t
+optflags: armv3l %{__common_cflags_with_ssp} -march=armv3
+optflags: armv4b %{__common_cflags_with_ssp} -march=armv4
+optflags: armv4l %{__common_cflags_with_ssp} -march=armv4
+optflags: armv4t %{__common_cflags_with_ssp} -march=armv4t
+optflags: armv4tl %{__common_cflags_with_ssp} -march=armv4t
+optflags: armv5t %{__common_cflags_with_ssp} -march=armv5t
+optflags: armv5tl %{__common_cflags_with_ssp} -march=armv5t
# Cortex A8
-optflags: armv7 %{__common_cflags} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-optflags: armv7l %{__common_cflags} -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+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} -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
-optflags: armv7hnl %{__common_cflags} -march=armv7-a -mfloat-abi=hard -mfpu=neon
+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} -fasynchronous-unwind-tables