linux-next: manual merge of the rust-fixes tree with the kbuild-current tree

linux-next: manual merge of the rust-fixes tree with the kbuild-current tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]

Hi all,

Today's linux-next merge of the rust-fixes tree got a conflict in:

  scripts/Makefile.autofdo

between commit:

  3df238d7a9f5a ("kbuild: AutoFDO: Disable Profi (-fno-sample-profile-use-profi)")

from the kbuild-current tree and commit:

  1178120c3bed1 ("kbuild: rust: support stabilized flag `-Cprofile-sample-use` for Rust >= 1.100")

from the rust-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc scripts/Makefile.autofdo
index 55fda66ad960c,32c18df237f1b..0000000000000
--- a/scripts/Makefile.autofdo
+++ b/scripts/Makefile.autofdo
@@@ -13,10 -13,8 +13,10 @@@ endi
  ifdef CLANG_AUTOFDO_PROFILE
    CFLAGS_AUTOFDO_CLANG += -fprofile-sample-use=$(CLANG_AUTOFDO_PROFILE) -ffunction-sections
    CFLAGS_AUTOFDO_CLANG += -fsplit-machine-functions
 +  CFLAGS_AUTOFDO_CLANG += $(if $(call clang-min-version,210000),-fno-sample-profile-use-profi)
-   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
 +  RUSTFLAGS_AUTOFDO_CLANG += -Cllvm-args=-sample-profile-use-profi=false
  endif
  
  ifdef CONFIG_LTO_CLANG_THIN

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]