Kbuild: rename HAVE_CC_STACKPROTECTOR config variable

HAVE_CC_STACKPROTECTOR should be selected by architectures with stack canary implementation. It is not about the compiler support. For the consistency with commit 050e9baa9dc9 ("Kbuild: rename CC_STACKPROTECTOR[_STRONG] config variables"), remove 'CC_' from the config symbol. I moved the 'select' lines to keep the alphabetical sorting.

Masahiro Yamada committed 8 years ago

Commit d148eac1 parent a0f8c298 files · +9 −9Browse files

Unified · Split

8 files

Documentation/features/debug/stackprotector/arch-support.txt +1 −1
arch/Kconfig +2 −2
arch/arm/Kconfig +1 −1
arch/arm64/Kconfig +1 −1
arch/mips/Kconfig +1 −1
arch/sh/Kconfig +1 −1
arch/x86/Kconfig +1 −1
arch/xtensa/Kconfig +1 −1

Documentation/features/debug/stackprotector/arch-support.txt+1−1

@@ -1,6 +1,6 @@
1	#	1	#
2	# Feature name: stackprotector	2	# Feature name: stackprotector
3	# Kconfig: HAVE_CC_STACKPROTECTOR	3	# Kconfig: HAVE_STACKPROTECTOR
4	# description: arch supports compiler driven stack overflow protection	4	# description: arch supports compiler driven stack overflow protection
5	#	5	#
6	-----------------------	6	-----------------------

arch/Kconfig+2−2

@@ -549,7 +549,7 @@ config GCC_PLUGIN_RANDSTRUCT_PERFORMANCE · 548 unmodified lines
549	in structures. This reduces the performance hit of RANDSTRUCT	549	in structures. This reduces the performance hit of RANDSTRUCT
550	at the cost of weakened randomization.	550	at the cost of weakened randomization.
551		551
552	config HAVE_CC_STACKPROTECTOR	552	config HAVE_STACKPROTECTOR
553	bool	553	bool
554	help	554	help
555	An arch should select this symbol if:	555	An arch should select this symbol if:
@@ -560,7 +560,7 @@ config CC_HAS_STACKPROTECTOR_NONE · 4 unmodified lines
560		560
561	config STACKPROTECTOR	561	config STACKPROTECTOR
562	bool "Stack Protector buffer overflow detection"	562	bool "Stack Protector buffer overflow detection"
563	depends on HAVE_CC_STACKPROTECTOR	563	depends on HAVE_STACKPROTECTOR
564	depends on $(cc-option,-fstack-protector)	564	depends on $(cc-option,-fstack-protector)
565	default y	565	default y
566	help	566	help

arch/arm/Kconfig+1−1

 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARM_SMCCC if CPU_V7
 	select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32
-	select HAVE_CC_STACKPROTECTOR
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_C_RECORDMCOUNT
 	select HAVE_DEBUG_KMEMLEAK
 	select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_RSEQ
+	select HAVE_STACKPROTECTOR
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_UID16
 	select HAVE_VIRT_CPU_ACCOUNTING_GEN

arch/arm64/Kconfig+1−1

 	select HAVE_ARM_SMCCC
 	select HAVE_EBPF_JIT
 	select HAVE_C_RECORDMCOUNT
-	select HAVE_CC_STACKPROTECTOR
 	select HAVE_CMPXCHG_DOUBLE
 	select HAVE_CMPXCHG_LOCAL
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_PERF_USER_STACK_DUMP
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_RCU_TABLE_FREE
+	select HAVE_STACKPROTECTOR
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES

arch/mips/Kconfig+1−1

 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
 	select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)
 	select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)
-	select HAVE_CC_STACKPROTECTOR
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_COPY_THREAD_TLS
 	select HAVE_C_RECORDMCOUNT
 	select HAVE_OPROFILE
 	select HAVE_PERF_EVENTS
 	select HAVE_REGS_AND_STACK_ACCESS_API
+	select HAVE_STACKPROTECTOR
 	select HAVE_SYSCALL_TRACEPOINTS
 	select HAVE_VIRT_CPU_ACCOUNTING_GEN if 64BIT || !SMP
 	select IRQ_FORCED_THREADING

arch/sh/Kconfig+1−1

@@ -77,7 +77,7 @@ config SUPERH32 · 76 unmodified lines
77	select PERF_EVENTS	77	select PERF_EVENTS
78	select ARCH_HIBERNATION_POSSIBLE if MMU	78	select ARCH_HIBERNATION_POSSIBLE if MMU
79	select SPARSE_IRQ	79	select SPARSE_IRQ
80	select HAVE_CC_STACKPROTECTOR	80	select HAVE_STACKPROTECTOR
81		81
82	config SUPERH64	82	config SUPERH64
83	def_bool "$(ARCH)" = "sh64"	83	def_bool "$(ARCH)" = "sh64"

arch/x86/Kconfig+1−1

 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD if X86_64
 	select HAVE_ARCH_VMAP_STACK		if X86_64
 	select HAVE_ARCH_WITHIN_STACK_FRAMES
-	select HAVE_CC_STACKPROTECTOR		if CC_HAS_SANE_STACKPROTECTOR
 	select HAVE_CMPXCHG_DOUBLE
 	select HAVE_CMPXCHG_LOCAL
 	select HAVE_CONTEXT_TRACKING		if X86_64
 	select HAVE_RCU_TABLE_FREE
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_RELIABLE_STACKTRACE		if X86_64 && UNWINDER_FRAME_POINTER && STACK_VALIDATION
+	select HAVE_STACKPROTECTOR		if CC_HAS_SANE_STACKPROTECTOR
 	select HAVE_STACK_VALIDATION		if X86_64
 	select HAVE_RSEQ
 	select HAVE_SYSCALL_TRACEPOINTS

arch/xtensa/Kconfig+1−1

 	select GENERIC_SCHED_CLOCK
 	select GENERIC_STRNCPY_FROM_USER if KASAN
 	select HAVE_ARCH_KASAN if MMU
-	select HAVE_CC_STACKPROTECTOR
 	select HAVE_DEBUG_KMEMLEAK
 	select HAVE_DMA_CONTIGUOUS
 	select HAVE_EXIT_THREAD
 	select HAVE_MEMBLOCK
 	select HAVE_OPROFILE
 	select HAVE_PERF_EVENTS
+	select HAVE_STACKPROTECTOR
 	select IRQ_DOMAIN
 	select MODULES_USE_ELF_RELA
 	select NO_BOOTMEM