1From 7d06cdedf1b296b225c586322ef64183e1a3082c Mon Sep 17 00:00:00 20012From: Ariadne Conill <ariadne@dereferenced.org>3Date: Tue, 18 Feb 2020 21:10:22 +00004Subject: [PATCH 5/5] powerpc: config: defang gcc check for stack-protector5 support67When we rebase kernel configs in Alpine, it is common to do so from8an environment where CARCH does not match CHOST.910Accordingly, we assume that the gcc check will always pass, and11simply remove it in preference for always enabling the12HAVE_STACKPROTECTOR config option.1314Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>15---16 arch/powerpc/Kconfig | 3 +--17 1 file changed, 1 insertion(+), 2 deletions(-)1819diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig20index c7b420d6787c..65450ce803f4 10064421--- a/arch/powerpc/Kconfig22+++ b/arch/powerpc/Kconfig23@@ -275,8 +275,7 @@ config PPC24 select HAVE_RSEQ25 select HAVE_SETUP_PER_CPU_AREA if PPC6426 select HAVE_SOFTIRQ_ON_OWN_STACK27- select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,$(m32-flag) -mstack-protector-guard=tls -mstack-protector-guard-reg=r2 -mstack-protector-guard-offset=0)28- select HAVE_STACKPROTECTOR if PPC64 && $(cc-option,$(m64-flag) -mstack-protector-guard=tls -mstack-protector-guard-reg=r13 -mstack-protector-guard-offset=0)29+ select HAVE_STACKPROTECTOR30 select HAVE_STATIC_CALL if PPC3231 select HAVE_SYSCALL_TRACEPOINTS32 select HAVE_VIRT_CPU_ACCOUNTING33--342.47.135