From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Mar 2024 21:41:00 +0000 (-0700)
Subject: Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: for-linus-6.9~230
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1d35aae78ffe739bf46c2bf9dea7b51a4eebfbe0;p=users%2Fdwmw2%2Flinux.git

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

Pull Kbuild updates from Masahiro Yamada:

 - Generate a list of built DTB files (arch/*/boot/dts/dtbs-list)

 - Use more threads when building Debian packages in parallel

 - Fix warnings shown during the RPM kernel package uninstallation

 - Change OBJECT_FILES_NON_STANDARD_*.o etc. to take a relative path to
   Makefile

 - Support GCC's -fmin-function-alignment flag

 - Fix a null pointer dereference bug in modpost

 - Add the DTB support to the RPM package

 - Various fixes and cleanups in Kconfig

* tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (67 commits)
  kconfig: tests: test dependency after shuffling choices
  kconfig: tests: add a test for randconfig with dependent choices
  kconfig: tests: support KCONFIG_SEED for the randconfig runner
  kbuild: rpm-pkg: add dtb files in kernel rpm
  kconfig: remove unneeded menu_is_visible() call in conf_write_defconfig()
  kconfig: check prompt for choice while parsing
  kconfig: lxdialog: remove unused dialog colors
  kconfig: lxdialog: fix button color for blackbg theme
  modpost: fix null pointer dereference
  kbuild: remove GCC's default -Wpacked-bitfield-compat flag
  kbuild: unexport abs_srctree and abs_objtree
  kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
  kconfig: remove named choice support
  kconfig: use linked list in get_symbol_str() to iterate over menus
  kconfig: link menus to a symbol
  kbuild: fix inconsistent indentation in top Makefile
  kbuild: Use -fmin-function-alignment when available
  alpha: merge two entries for CONFIG_ALPHA_GAMMA
  alpha: merge two entries for CONFIG_ALPHA_EV4
  kbuild: change DTC_FLAGS_<basetarget>.o to take the path relative to $(obj)
  ...
---

1d35aae78ffe739bf46c2bf9dea7b51a4eebfbe0
diff --cc arch/hexagon/Kconfig
index 1414052e7d6b2,89672ef0666fa..e233b5efa2761
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -7,11 -7,9 +7,13 @@@ config HEXAGO
  	select ARCH_32BIT_OFF_T
  	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
  	select ARCH_NO_PREEMPT
+ 	select ARCH_WANT_FRAME_POINTERS
  	select DMA_GLOBAL_POOL
 +	select HAVE_PAGE_SIZE_4KB
 +	select HAVE_PAGE_SIZE_16KB
 +	select HAVE_PAGE_SIZE_64KB
 +	select HAVE_PAGE_SIZE_256KB
+ 	select FRAME_POINTER
  	# Other pending projects/to-do items.
  	# select HAVE_REGS_AND_STACK_ACCESS_API
  	# select HAVE_HW_BREAKPOINT if PERF_EVENTS
diff --cc scripts/Makefile.lib
index 1bd59b8db05f0,56f7fe2b476d5..3179747cbd2cc
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@@ -175,11 -181,8 +181,11 @@@ endi
  
  ifeq ($(CONFIG_UBSAN),y)
  _c_flags += $(if $(patsubst n%,, \
- 		$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
 -		$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)$(CONFIG_UBSAN_SANITIZE_ALL)), \
++		$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \
  		$(CFLAGS_UBSAN))
 +_c_flags += $(if $(patsubst n%,, \
- 		$(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
++		$(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
 +		$(CFLAGS_UBSAN_SIGNED_WRAP))
  endif
  
  ifeq ($(CONFIG_KCOV),y)