[PATCH Trusty SRU] Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled

Tim Gardner tim.gardner at canonical.com
Thu Oct 27 18:56:13 UTC 2016


From: Fathi Boudra <fathi.boudra at linaro.org>

BugLink: http://bugs.launchpad.net/bugs/1636625

An extra parenthesis typo introduced in 19952a92037e ("stackprotector:
Unify the HAVE_CC_STACKPROTECTOR logic between architectures") is
causing the following error when CONFIG_CC_STACKPROTECTOR_REGULAR is
enabled:

  Makefile:608: Cannot use CONFIG_CC_STACKPROTECTOR: -fstack-protector not supported by compiler
  Makefile:608: *** missing separator.  Stop.

Signed-off-by: Fathi Boudra <fathi.boudra at linaro.org>
Acked-by: Kees Cook <keescook at chromium.org>
Cc: <stable at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
(cherry picked from commit 27b2a49a1493f5199a4c2f84abc6aebf81184e2b)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8c850a9..915c8b7 100644
--- a/Makefile
+++ b/Makefile
@@ -612,7 +612,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
   stackp-flag := -fstack-protector
   ifeq ($(call cc-option, $(stackp-flag)),)
     $(warning Cannot use CONFIG_CC_STACKPROTECTOR: \
-	      -fstack-protector not supported by compiler))
+             -fstack-protector not supported by compiler)
   endif
 else ifdef CONFIG_CC_STACKPROTECTOR_STRONG
   stackp-flag := -fstack-protector-strong
-- 
2.7.4





More information about the kernel-team mailing list