aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2016-01-05 21:25:31 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2016-01-05 21:25:31 +0300
commit62862d5eec1567de047fe52551d6eb73683a4a9f (patch)
treebe0b134b85b3fe3cd859c7dc72297ed2283d425f
parent564a1412a50551d28ac518637cd7ace0ad2abf96 (diff)
parente117bc4ff99b569e413f0b6046afacfc3ff38364 (diff)
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingllct-20160105.0linux-linaro-core-tracking
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9d94adeceab6..b3b72eebe938 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.