aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-12-01 00:06:19 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-12-01 00:06:19 +0300
commit2c23202bbd3e117ece4de4433a1f92f2b9f2b8c8 (patch)
tree435ee661bbfd61b9c23b7c515248bf9e1428da3c
parent3cdc1cc5fba3f53ee5bf9d48a1b763f5426b6021 (diff)
parente117bc4ff99b569e413f0b6046afacfc3ff38364 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingllct-20151201.0
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 904a1d65df30..f30a325c1bde 100644
--- a/Makefile
+++ b/Makefile
@@ -652,6 +652,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
ifeq ($(call cc-option, $(stackp-flag)),)
$(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \
-fstack-protector not supported by compiler)
+ stackp-flag :=
endif
else
ifdef CONFIG_CC_STACKPROTECTOR_STRONG
@@ -659,6 +660,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_STRONG
ifeq ($(call cc-option, $(stackp-flag)),)
$(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \
-fstack-protector-strong not supported by compiler)
+ stackp-flag :=
endif
else
# Force off for distro compilers that enable stack protector by default.