Commit 548843c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clang-features-v5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull clang LTO fix from Kees Cook:
 "Clang 13 fixed some IR behavior for LTO, but this broke work-arounds
  used in the kernel.

  Handle changes to needed LTO flags in Clang 13 (Tor Vic)"

* tag 'clang-features-v5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  x86, lto: Pass -stack-alignment only on LLD < 13.0.0
parents e65b7914 2398ce80

arch/x86/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -200,8 +200,9 @@ endif 
KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE)



ifdef CONFIG_LTO_CLANG

KBUILD_LDFLAGS	+= -plugin-opt=-code-model=kernel \

		   -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)

ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)

KBUILD_LDFLAGS	+= -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)

endif

endif



ifdef CONFIG_X86_NEED_RELOCS