From f17d1a24c8ce5c7acf109a4121d86ba4c257948d Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Tue, 18 Feb 2020 21:10:22 +0000 Subject: [PATCH 5/5] powerpc: config: defang gcc check for stack-protector support When we rebase kernel configs in Alpine, it is common to do so from an environment where CARCH does not match CHOST. Accordingly, we assume that the gcc check will always pass, and simply remove it in preference for always enabling the HAVE_STACKPROTECTOR config option. Signed-off-by: Ariadne Conill Signed-off-by: Achill Gilgenast --- arch/powerpc/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 9537a61ebae0..4d25e50fe7bf 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -287,8 +287,7 @@ config PPC select HAVE_SAMPLE_FTRACE_DIRECT_MULTI if HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_SETUP_PER_CPU_AREA if PPC64 select HAVE_SOFTIRQ_ON_OWN_STACK - select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,$(m32-flag) -mstack-protector-guard=tls -mstack-protector-guard-reg=r2 -mstack-protector-guard-offset=0) - select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,$(m64-flag) -mstack-protector-guard=tls -mstack-protector-guard-reg=r13 -mstack-protector-guard-offset=0) + select HAVE_STACKPROTECTOR select HAVE_STATIC_CALL if PPC32 select HAVE_STATIC_CALL_INLINE if PPC32 select HAVE_SYSCALL_TRACEPOINTS -- 2.52.0