Skip to contentSkip to conversation

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

PATCH Mark Brown 2 participants 2 messages Nov 11

Subsystems (3)
Kbuild Linux-next tree Autofdo build
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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.

scripts/Makefile.autofdo +0 -0
diff --cc scripts/Makefile.autofdo
index 55fda66ad960c,32c18df237f1b..0000000000000
@@@ -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
#1 lore raw
Quoted 2 lines · Mark Brown

I fixed it up (see below) and can carry the fix as necessary. This

Looks fine of course, thanks!

Cheers,
Miguel