diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-16 08:57:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-16 08:57:44 -0700 |
| commit | cc9aaa2b07b948b036c8a3c48bd73fd700b5a139 (patch) | |
| tree | a7b04a4127ef5fb6614a5b2bf408b30a11f5d0bf | |
| parent | 94f0b2d4a1d0c52035aef425da5e022bd2cb1c71 (diff) | |
| parent | 0236526d76b87c1dc2cbe3eb31ae29be5b0ca151 (diff) | |
| download | linux-cc9aaa2b07b948b036c8a3c48bd73fd700b5a139.tar.gz | |
Merge tag 'clang-features-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull clang LTO fix from Kees Cook:
"It seems Clang has been scrubbing through the missing LTO IR flags for
Clang 13, and the last of these 'only with LTO' flags is fixed now.
I've asked that they please consider making these changes in a less
'break all the Clang kernel builds' kind of way in the future. :P
Summary:
- The '-warn-stack-size' option under LTO has moved in Clang 13 (Tor
Vic)"
* tag 'clang-features-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
Makefile: lto: Pass -warn-stack-size only on LLD < 13.0.0
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile index ed669b2d705dc..2d7a8df84e2bd 100644 --- a/Makefile +++ b/Makefile @@ -929,11 +929,14 @@ CC_FLAGS_LTO += -fvisibility=hidden # Limit inlining across translation units to reduce binary size KBUILD_LDFLAGS += -mllvm -import-instr-limit=5 -# Check for frame size exceeding threshold during prolog/epilog insertion. +# Check for frame size exceeding threshold during prolog/epilog insertion +# when using lld < 13.0.0. ifneq ($(CONFIG_FRAME_WARN),0) +ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0) KBUILD_LDFLAGS += -plugin-opt=-warn-stack-size=$(CONFIG_FRAME_WARN) endif endif +endif ifdef CONFIG_LTO KBUILD_CFLAGS += -fno-lto $(CC_FLAGS_LTO) |