Subject: [merged] makefile-fix-extra-parenthesis-typo-when-cc_stackprotector_regular-is-enabled.patch removed from -mm tree
To: fathi.boudra@xxxxxxxxxx,keescook@xxxxxxxxxxxx,stable@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 27 Feb 2014 12:23:56 -0800
The patch titled
Subject: Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled
has been removed from the -mm tree. Its filename was
makefile-fix-extra-parenthesis-typo-when-cc_stackprotector_regular-is-enabled.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Fathi Boudra <fathi.boudra@xxxxxxxxxx>
Subject: Makefile: fix extra parenthesis typo when CC_STACKPROTECTOR_REGULAR is enabled
An extra parenthesis typo introduced in 19952a9203 ("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@xxxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN Makefile~makefile-fix-extra-parenthesis-typo-when-cc_stackprotector_regular-is-enabled Makefile
--- a/Makefile~makefile-fix-extra-parenthesis-typo-when-cc_stackprotector_regular-is-enabled
+++ a/Makefile
@@ -606,7 +606,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
_
Patches currently in -mm which might be from fathi.boudra@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html