| From: Nathan Chancellor <nathan@kernel.org> |
| Subject: x86: drop stack-alignment plugin opt |
| Date: Thu, 25 Jan 2024 15:55:09 -0700 |
| |
| 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"). |
| |
| Link: https://lkml.kernel.org/r/20240125-bump-min-llvm-ver-to-13-0-1-v1-3-f5ff9bda41c5@kernel.org |
| Signed-off-by: Nathan Chancellor <nathan@kernel.org> |
| Reviewed-by: Kees 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: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| arch/x86/Makefile | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| --- a/arch/x86/Makefile~x86-drop-stack-alignment-plugin-opt |
| +++ a/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 |
| _ |
