aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-08-03 17:10:51 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-08-03 17:10:51 +0300
commitf8e0cf86d00e96920eb7d67b40269c00554384b4 (patch)
tree18e9c37f2f22d58dfc2a57e8774c36f63626e5e5
parentb150d09e6158185f1ce7d22303c2c329761d98bf (diff)
parente117bc4ff99b569e413f0b6046afacfc3ff38364 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20150804.0llct-20150803.0
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e79448d90f19..0de16311c263 100644
--- a/Makefile
+++ b/Makefile
@@ -646,6 +646,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
@@ -653,6 +654,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.