Commit 634e4ff9 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Andrew Morton
Browse files

arm64: Kconfig: clean up tautological LLVM version checks 

Now that the minimum supported version of LLVM for building the kernel has
been bumped to 13.0.1, several conditions become tautologies, as they will
always be true because the build will fail during the configuration stage
for older LLVM versions.  Drop them, as they are unnecessary.

Link: https://lkml.kernel.org/r/20240125-bump-min-llvm-ver-to-13-0-1-v1-5-f5ff9bda41c5@kernel.org


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: "Aneesh Kumar K.V (IBM)" <aneesh.kumar@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Conor Dooley <conor@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Nicolas Schier <nicolas@fjasle.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 19336376

arch/arm64/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ config BUILTIN_RETURN_ADDRESS_STRIPS_PAC 
	bool

	# Clang's __builtin_return_adddress() strips the PAC since 12.0.0

	# https://github.com/llvm/llvm-project/commit/2a96f47c5ffca84cd774ad402cacd137f4bf45e2

	default y if CC_IS_CLANG && (CLANG_VERSION >= 120000)

	default y if CC_IS_CLANG

	# GCC's __builtin_return_address() strips the PAC since 11.1.0,

	# and this was backported to 10.2.0, 9.4.0, 8.5.0, but not earlier

	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94891
@@ -1387,7 +1387,6 @@ choice 


config CPU_BIG_ENDIAN

	bool "Build big-endian kernel"

	depends on !LD_IS_LLD || LLD_VERSION >= 130000

	# https://github.com/llvm/llvm-project/commit/1379b150991f70a5782e9a143c2ba5308da1161c

	depends on AS_IS_GNU || AS_VERSION >= 150000

	help
@@ -2018,8 +2017,6 @@ config ARM64_BTI_KERNEL 
	depends on !CC_IS_GCC || GCC_VERSION >= 100100

	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106671

	depends on !CC_IS_GCC

	# https://github.com/llvm/llvm-project/commit/a88c722e687e6780dcd6a58718350dc76fcc4cc9

	depends on !CC_IS_CLANG || CLANG_VERSION >= 120000

	depends on (!FUNCTION_GRAPH_TRACER || DYNAMIC_FTRACE_WITH_ARGS)

	help

	  Build the kernel with Branch Target Identification annotations