diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-19 20:52:24 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-19 20:52:24 +0300 |
| commit | 1920b3fc5d3a731553e5034eb5b41f1559472d20 (patch) | |
| tree | fa6f5b885efb361a10790ca88b4be2182bc2a60d | |
| parent | 775fde658cf34db65a11538ee9b47124e0a74a17 (diff) | |
| parent | e117bc4ff99b569e413f0b6046afacfc3ff38364 (diff) | |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20151022.1tracking-llct-ll-20151022.0llct-20151019.0
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -651,6 +651,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 @@ -658,6 +659,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. |