diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-11-12 09:35:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-11-12 09:35:54 -0800 |
| commit | df43528e1bb685584394373bc60f71fbc542efd8 (patch) | |
| tree | 3b29e7d9dfa56e6c6fd9ec1b4cff341d65853cb2 | |
| parent | ae7e0f32277099a25a1d7804b8cb2f6dd30ee2f3 (diff) | |
| parent | 1178120c3bed1733aea1c465200a6b42f8a7105d (diff) | |
| download | linux-df43528e1bb685584394373bc60f71fbc542efd8.tar.gz linux-df43528e1bb685584394373bc60f71fbc542efd8.zip | |
Merge tag 'rust-fixes-7.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull Rust fix from Miguel Ojeda:
- Fix build error in the upcoming Rust 1.100 when using an AutoFDO
profile by supporting the stabilized name for 'profile-sample-use'
* tag 'rust-fixes-7.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
kbuild: rust: support stabilized flag `-Cprofile-sample-use` for Rust >= 1.100
| -rw-r--r-- | scripts/Makefile.autofdo | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.autofdo b/scripts/Makefile.autofdo index 57a3aba6ffc2..32c18df237f1 100644 --- a/scripts/Makefile.autofdo +++ b/scripts/Makefile.autofdo @@ -13,7 +13,7 @@ endif ifdef CLANG_AUTOFDO_PROFILE CFLAGS_AUTOFDO_CLANG += -fprofile-sample-use=$(CLANG_AUTOFDO_PROFILE) -ffunction-sections CFLAGS_AUTOFDO_CLANG += -fsplit-machine-functions - RUSTFLAGS_AUTOFDO_CLANG += -Zprofile-sample-use=$(CLANG_AUTOFDO_PROFILE) -Zfunction-sections=y + RUSTFLAGS_AUTOFDO_CLANG += $(if $(call rustc-min-version,110000),-Cprofile-sample-use,-Zprofile-sample-use)=$(CLANG_AUTOFDO_PROFILE) -Zfunction-sections=y RUSTFLAGS_AUTOFDO_CLANG += -Cllvm-args=-split-machine-functions endif |