From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 May 2024 19:39:20 +0000 (-0700)
Subject: Merge tag 'kbuild-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ff9a79307f89563da6d841da8b7cc4a0afceb0e2;p=linux.git

Merge tag 'kbuild-v6.10' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada:

 - Avoid 'constexpr', which is a keyword in C23

 - Allow 'dtbs_check' and 'dt_compatible_check' run independently of
   'dt_binding_check'

 - Fix weak references to avoid GOT entries in position-independent code
   generation

 - Convert the last use of 'optional' property in arch/sh/Kconfig

 - Remove support for the 'optional' property in Kconfig

 - Remove support for Clang's ThinLTO caching, which does not work with
   the .incbin directive

 - Change the semantics of $(src) so it always points to the source
   directory, which fixes Makefile inconsistencies between upstream and
   downstream

 - Fix 'make tar-pkg' for RISC-V to produce a consistent package

 - Provide reasonable default coverage for objtool, sanitizers, and
   profilers

 - Remove redundant OBJECT_FILES_NON_STANDARD, KASAN_SANITIZE, etc.

 - Remove the last use of tristate choice in drivers/rapidio/Kconfig

 - Various cleanups and fixes in Kconfig

* tag 'kbuild-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (46 commits)
  kconfig: use sym_get_choice_menu() in sym_check_prop()
  rapidio: remove choice for enumeration
  kconfig: lxdialog: remove initialization with A_NORMAL
  kconfig: m/nconf: merge two item_add_str() calls
  kconfig: m/nconf: remove dead code to display value of bool choice
  kconfig: m/nconf: remove dead code to display children of choice members
  kconfig: gconf: show checkbox for choice correctly
  kbuild: use GCOV_PROFILE and KCSAN_SANITIZE in scripts/Makefile.modfinal
  Makefile: remove redundant tool coverage variables
  kbuild: provide reasonable defaults for tool coverage
  modules: Drop the .export_symbol section from the final modules
  kconfig: use menu_list_for_each_sym() in sym_check_choice_deps()
  kconfig: use sym_get_choice_menu() in conf_write_defconfig()
  kconfig: add sym_get_choice_menu() helper
  kconfig: turn defaults and additional prompt for choice members into error
  kconfig: turn missing prompt for choice members into error
  kconfig: turn conf_choice() into void function
  kconfig: use linked list in sym_set_changed()
  kconfig: gconf: use MENU_CHANGED instead of SYMBOL_CHANGED
  kconfig: gconf: remove debug code
  ...
---

ff9a79307f89563da6d841da8b7cc4a0afceb0e2
diff --cc drivers/gpu/drm/msm/Makefile
index 718968717ad52,b8cc007fc1b97..eb788921ff4fe
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@@ -1,11 -1,10 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0
- ccflags-y := -I $(srctree)/$(src)
+ ccflags-y := -I $(src)
 +ccflags-y += -I $(obj)/generated
- ccflags-y += -I $(srctree)/$(src)/disp/dpu1
- ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(srctree)/$(src)/dsi
- ccflags-$(CONFIG_DRM_MSM_DP) += -I $(srctree)/$(src)/dp
+ ccflags-y += -I $(src)/disp/dpu1
+ ccflags-$(CONFIG_DRM_MSM_DSI) += -I $(src)/dsi
+ ccflags-$(CONFIG_DRM_MSM_DP) += -I $(src)/dp
  
 -msm-y := \
 +adreno-y := \
  	adreno/adreno_device.o \
  	adreno/adreno_gpu.o \
  	adreno/a2xx_gpu.o \
@@@ -145,68 -140,11 +145,68 @@@ msm-display-$(CONFIG_DRM_MSM_DSI) += ds
  			dsi/dsi_manager.o \
  			dsi/phy/dsi_phy.o
  
 -msm-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/phy/dsi_phy_28nm.o
 -msm-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += dsi/phy/dsi_phy_20nm.o
 -msm-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += dsi/phy/dsi_phy_28nm_8960.o
 -msm-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/phy/dsi_phy_14nm.o
 -msm-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/phy/dsi_phy_10nm.o
 -msm-$(CONFIG_DRM_MSM_DSI_7NM_PHY) += dsi/phy/dsi_phy_7nm.o
 +msm-display-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/phy/dsi_phy_28nm.o
 +msm-display-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += dsi/phy/dsi_phy_20nm.o
 +msm-display-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += dsi/phy/dsi_phy_28nm_8960.o
 +msm-display-$(CONFIG_DRM_MSM_DSI_14NM_PHY) += dsi/phy/dsi_phy_14nm.o
 +msm-display-$(CONFIG_DRM_MSM_DSI_10NM_PHY) += dsi/phy/dsi_phy_10nm.o
 +msm-display-$(CONFIG_DRM_MSM_DSI_7NM_PHY) += dsi/phy/dsi_phy_7nm.o
 +
 +msm-y += $(adreno-y) $(msm-display-y)
  
  obj-$(CONFIG_DRM_MSM)	+= msm.o
 +
 +ifeq (y,$(CONFIG_DRM_MSM_VALIDATE_XML))
 +	headergen-opts += --validate
 +else
 +	headergen-opts += --no-validate
 +endif
 +
 +quiet_cmd_headergen = GENHDR  $@
-       cmd_headergen = mkdir -p $(obj)/generated && $(PYTHON3) $(srctree)/$(src)/registers/gen_header.py \
- 		      $(headergen-opts) --rnn $(srctree)/$(src)/registers --xml $< c-defines > $@
++      cmd_headergen = mkdir -p $(obj)/generated && $(PYTHON3) $(src)/registers/gen_header.py \
++		      $(headergen-opts) --rnn $(src)/registers --xml $< c-defines > $@
 +
 +$(obj)/generated/%.xml.h: $(src)/registers/adreno/%.xml \
 +		$(src)/registers/adreno/adreno_common.xml \
 +		$(src)/registers/adreno/adreno_pm4.xml \
 +		$(src)/registers/freedreno_copyright.xml \
 +		$(src)/registers/gen_header.py \
 +		$(src)/registers/rules-fd.xsd \
 +		FORCE
 +	$(call if_changed,headergen)
 +
 +$(obj)/generated/%.xml.h: $(src)/registers/display/%.xml \
 +		$(src)/registers/freedreno_copyright.xml \
 +		$(src)/registers/gen_header.py \
 +		$(src)/registers/rules-fd.xsd \
 +		FORCE
 +	$(call if_changed,headergen)
 +
 +ADRENO_HEADERS = \
 +	generated/a2xx.xml.h \
 +	generated/a3xx.xml.h \
 +	generated/a4xx.xml.h \
 +	generated/a5xx.xml.h \
 +	generated/a6xx.xml.h \
 +	generated/a6xx_gmu.xml.h \
 +	generated/adreno_common.xml.h \
 +	generated/adreno_pm4.xml.h \
 +
 +DISPLAY_HEADERS = \
 +	generated/dsi_phy_7nm.xml.h \
 +	generated/dsi_phy_10nm.xml.h \
 +	generated/dsi_phy_14nm.xml.h \
 +	generated/dsi_phy_20nm.xml.h \
 +	generated/dsi_phy_28nm_8960.xml.h \
 +	generated/dsi_phy_28nm.xml.h \
 +	generated/dsi.xml.h \
 +	generated/hdmi.xml.h \
 +	generated/mdp4.xml.h \
 +	generated/mdp5.xml.h \
 +	generated/mdp_common.xml.h \
 +	generated/sfpb.xml.h
 +
 +$(addprefix $(obj)/,$(adreno-y)): $(addprefix $(obj)/,$(ADRENO_HEADERS))
 +$(addprefix $(obj)/,$(msm-display-y)): $(addprefix $(obj)/,$(DISPLAY_HEADERS))
 +
 +targets += $(ADRENO_HEADERS) $(DISPLAY_HEADERS)
diff --cc drivers/misc/lkdtm/Makefile
index b28701138b4bc,33fe61152a158..39468bd27b85f
--- a/drivers/misc/lkdtm/Makefile
+++ b/drivers/misc/lkdtm/Makefile
@@@ -15,11 -15,7 +15,7 @@@ lkdtm-$(CONFIG_PPC_64S_HASH_MMU)	+= pow
  
  KASAN_SANITIZE_stackleak.o	:= n
  
- KASAN_SANITIZE_rodata.o			:= n
- KCSAN_SANITIZE_rodata.o			:= n
- KCOV_INSTRUMENT_rodata.o		:= n
- OBJECT_FILES_NON_STANDARD_rodata.o	:= y
 -CFLAGS_REMOVE_rodata.o			+= $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS)
 +CFLAGS_REMOVE_rodata.o			+= $(CC_FLAGS_LTO) $(RETHUNK_CFLAGS) $(CC_FLAGS_CFI)
  
  OBJCOPYFLAGS :=
  OBJCOPYFLAGS_rodata_objcopy.o	:= \
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/Makefile
index 5c754b87ea20e,764ba73cde1ee..8873904f51ecb
--- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
@@@ -16,4 -15,4 +16,4 @@@ iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.
  iwlmvm-$(CONFIG_PM) += d3.o
  iwlmvm-$(CONFIG_IWLMEI) += vendor-cmd.o
  
- subdir-ccflags-y += -I $(srctree)/$(src)/../
 -ccflags-y += -I $(src)/../
++subdir-ccflags-y += -I $(src)/../