[PATCH 03/11] x86: Drop stack-alignment plugin opt

From: Nathan Chancellor
Date: Thu Jan 25 2024 - 17:56:32 EST


Now that the minimum supported version of LLVM for building the kernel
has been bumped to 13.0.1, the inner ifeq statement is always false, as
the build will fail during the configuration stage for older LLVM
versions.

This effectively reverts part of commit b33fff07e3e3 ("x86, build: allow
LTO to be selected") and its follow up fix, commit 2398ce80152a ("x86,
lto: Pass -stack-alignment only on LLD < 13.0.0").

Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>
---
Cc: tglx@xxxxxxxxxxxxx
Cc: mingo@xxxxxxxxxx
Cc: bp@xxxxxxxxx
Cc: dave.hansen@xxxxxxxxxxxxxxx
Cc: x86@xxxxxxxxxx
---
arch/x86/Makefile | 6 ------
1 file changed, 6 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 1a068de12a56..de30a8b35c41 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -217,12 +217,6 @@ endif

KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE)

-ifdef CONFIG_LTO_CLANG
-ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)
-KBUILD_LDFLAGS += -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)
-endif
-endif
-
ifdef CONFIG_X86_NEED_RELOCS
LDFLAGS_vmlinux := --emit-relocs --discard-none
else

--
2.43.0