Commit 6c15b327 authored Feb 25, 2014 by Jan Beulich Committed by Linus Torvalds Feb 25, 2014

Makefile: fix build with make 3.80 again



According to Documentation/Changes, make 3.80 is still being supported
for building the kernel, hence make files must not make (unconditional)
use of features introduced only in newer versions.  Commit 8779657d
("stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG") however
introduced an "else ifdef" construct which make 3.80 doesn't understand.

Also correct a warning message still referencing the old config option
name.

Apart from that I question the use of "ifdef" here (but it was used that
way already prior to said commit): ifeq (,y) would seem more to the
point.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cf015e9f

Makefile

+4 −2

Original line number	Diff line number	Diff line
		@@ -605,10 +605,11 @@ endif
		ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
		stackp-flag := -fstack-protector
		ifeq ($(call cc-option, $(stackp-flag)),)
		$(warning Cannot use CONFIG_CC_STACKPROTECTOR: \
		$(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \
		-fstack-protector not supported by compiler)
		endif
		else ifdef CONFIG_CC_STACKPROTECTOR_STRONG
		else
		ifdef CONFIG_CC_STACKPROTECTOR_STRONG
		stackp-flag := -fstack-protector-strong
		ifeq ($(call cc-option, $(stackp-flag)),)
		$(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \
		@@ -618,6 +619,7 @@ else
		# Force off for distro compilers that enable stack protector by default.
		stackp-flag := $(call cc-option, -fno-stack-protector)
		endif
		endif
		KBUILD_CFLAGS += $(stackp-flag)

		# This warning generated too much noise in a regular build.

Admin message