From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Nov 2024 21:41:50 +0000 (-0800)
Subject: Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: nvme-6.13-2024-12-31~36
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a34dfa15d6edf7e78b8118d862d2db0889cf669;p=nvme.git

Merge tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada:

 - Add generic support for built-in boot DTB files

 - Enable TAB cycling for dialog buttons in nconfig

 - Fix issues in streamline_config.pl

 - Refactor Kconfig

 - Add support for Clang's AutoFDO (Automatic Feedback-Directed
   Optimization)

 - Add support for Clang's Propeller, a profile-guided optimization.

 - Change the working directory to the external module directory for M=
   builds

 - Support building external modules in a separate output directory

 - Enable objtool for *.mod.o and additional kernel objects

 - Use lz4 instead of deprecated lz4c

 - Work around a performance issue with "git describe"

 - Refactor modpost

* tag 'kbuild-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (85 commits)
  kbuild: rename .tmp_vmlinux.kallsyms0.syms to .tmp_vmlinux0.syms
  gitignore: Don't ignore 'tags' directory
  kbuild: add dependency from vmlinux to resolve_btfids
  modpost: replace tdb_hash() with hash_str()
  kbuild: deb-pkg: add python3:native to build dependency
  genksyms: reduce indentation in export_symbol()
  modpost: improve error messages in device_id_check()
  modpost: rename alias symbol for MODULE_DEVICE_TABLE()
  modpost: rename variables in handle_moddevtable()
  modpost: move strstarts() to modpost.h
  modpost: convert do_usb_table() to a generic handler
  modpost: convert do_of_table() to a generic handler
  modpost: convert do_pnp_device_entry() to a generic handler
  modpost: convert do_pnp_card_entries() to a generic handler
  modpost: call module_alias_printf() from all do_*_entry() functions
  modpost: pass (struct module *) to do_*_entry() functions
  modpost: remove DEF_FIELD_ADDR_VAR() macro
  modpost: deduplicate MODULE_ALIAS() for all drivers
  modpost: introduce module_alias_printf() helper
  modpost: remove unnecessary check in do_acpi_entry()
  ...
---

6a34dfa15d6edf7e78b8118d862d2db0889cf669
diff --cc arch/powerpc/Makefile
index 41489483a602,321b596d2550..f3804103c56c
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -402,11 -402,9 +402,13 @@@ prepare: stack_protector_prepar
  PHONY += stack_protector_prepare
  stack_protector_prepare: prepare0
  ifdef CONFIG_PPC64
 -	$(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' $(objtree)/include/generated/asm-offsets.h))
 +	$(eval KBUILD_CFLAGS += -mstack-protector-guard=tls -mstack-protector-guard-reg=r13 \
- 				-mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' include/generated/asm-offsets.h))
++				-mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' \
++				$(objtree)/include/generated/asm-offsets.h))
  else
 -	$(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' $(objtree)/include/generated/asm-offsets.h))
 +	$(eval KBUILD_CFLAGS += -mstack-protector-guard=tls -mstack-protector-guard-reg=r2 \
- 				-mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h))
++				-mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' \
++				$(objtree)/include/generated/asm-offsets.h))
  endif
  endif
  
diff --cc rust/Makefile
index 01cf8e6ba3b3,742740816c4b..9da9042fd627
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -370,10 -360,10 +370,10 @@@ quiet_cmd_rustc_library = $(if $(skip_c
  
  rust-analyzer:
  	$(Q)$(srctree)/scripts/generate_rust_analyzer.py \
 -		--cfgs='core=$(core-cfgs)' --cfgs='alloc=$(alloc-cfgs)' \
 +		--cfgs='core=$(core-cfgs)' \
  		$(realpath $(srctree)) $(realpath $(objtree)) \
- 		$(rustc_sysroot) $(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \
- 		$(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json
+ 		$(rustc_sysroot) $(RUST_LIB_SRC) $(if $(KBUILD_EXTMOD),$(srcroot)) \
+ 		> rust-project.json
  
  redirect-intrinsics = \
  	__addsf3 __eqsf2 __extendsfdf2 __gesf2 __lesf2 __ltsf2 __mulsf3 __nesf2 __truncdfsf2 __unordsf2 \
diff --cc tools/objtool/check.c
index f7586f82b967,05a0fb4a3d1a..4ce176ad411f
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@@ -4573,7 -4557,8 +4573,9 @@@ static int validate_ibt(struct objtool_
  		    !strcmp(sec->name, "__jump_table")			||
  		    !strcmp(sec->name, "__mcount_loc")			||
  		    !strcmp(sec->name, ".kcfi_traps")			||
+ 		    !strcmp(sec->name, ".llvm.call-graph-profile")	||
+ 		    !strcmp(sec->name, ".llvm_bb_addr_map")		||
 +		    !strcmp(sec->name, "__tracepoints")			||
  		    strstr(sec->name, "__patchable_function_entries"))
  			continue;