diff options
| author | Kees Cook <keescook@chromium.org> | 2016-07-26 23:26:20 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2016-07-26 23:50:59 +0200 |
| commit | 228d96c603cf53e32f672c0e459d2adbc5a4609a (patch) | |
| tree | e6d936927424b32c693ad20f61f1990094765008 /arch/x86 | |
| parent | scripts: Fix size mismatch of kexec_purgatory_size (diff) | |
| download | linux-228d96c603cf53e32f672c0e459d2adbc5a4609a.tar.xz linux-228d96c603cf53e32f672c0e459d2adbc5a4609a.zip | |
kbuild: Abort build on bad stack protector flag
Before, the stack protector flag was sanity checked before .config had
been reprocessed. This meant the build couldn't be aborted early, and
only a warning could be emitted followed later by the compiler blowing
up with an unknown flag. This has caused a lot of confusion over time,
so this splits the flag selection from sanity checking and performs the
sanity checking after the make has been restarted from a reprocessed
.config, so builds can be aborted as early as possible now.
Additionally moves the x86-specific sanity check to the same location,
since it suffered from the same warn-then-wait-for-compiler-failure
problem.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Makefile | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 6fce7f096b88..830ed391e7ef 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -126,14 +126,6 @@ else KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args) endif -# Make sure compiler does not have buggy stack-protector support. -ifdef CONFIG_CC_STACKPROTECTOR - cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh - ifneq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y) - $(warning stack-protector enabled but compiler support broken) - endif -endif - ifdef CONFIG_X86_X32 x32_ld_ok := $(call try-run,\ /bin/echo -e '1: .quad 1b' | \ |