mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-06 04:34:20 +02:00
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 7d06cdedf1b296b225c586322ef64183e1a3082c Mon Sep 17 00:00:00 2001
|
|
From: Ariadne Conill <ariadne@dereferenced.org>
|
|
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 <ariadne@dereferenced.org>
|
|
---
|
|
arch/powerpc/Kconfig | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
|
|
index c7b420d6787c..65450ce803f4 100644
|
|
--- a/arch/powerpc/Kconfig
|
|
+++ b/arch/powerpc/Kconfig
|
|
@@ -275,8 +275,7 @@ config PPC
|
|
select HAVE_RSEQ
|
|
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_SYSCALL_TRACEPOINTS
|
|
select HAVE_VIRT_CPU_ACCOUNTING
|
|
--
|
|
2.47.1
|
|
|