Commit be9160a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.8' of... 

Merge tag 'kbuild-fixes-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix -gz=zlib compiler option test for CONFIG_DEBUG_INFO_COMPRESSED

 - improve cc-option in scripts/Kbuild.include to clean up temp files

 - improve cc-option in scripts/Kconfig.include for more reliable
   compile option test

 - do not copy modules.builtin by 'make install' because it would break
   existing systems

 - use 'userprogs' syntax for watch_queue sample

* tag 'kbuild-fixes-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  samples: watch_queue: build sample program for target architecture
  Revert "Makefile: install modules.builtin even if CONFIG_MODULES=n"
  scripts: Fix typo in headers_install.sh
  kconfig: unify cc-option and as-option
  kbuild: improve cc-option to clean up all temporary files
  Makefile: Improve compressed debug info support detection
parents 75613939 214377e9

Makefile

+4 −12
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ endif 


ifdef CONFIG_DEBUG_INFO_COMPRESSED

DEBUG_CFLAGS	+= -gz=zlib

KBUILD_AFLAGS	+= -Wa,--compress-debug-sections=zlib

KBUILD_AFLAGS	+= -gz=zlib

KBUILD_LDFLAGS	+= --compress-debug-sections=zlib

endif
@@ -1336,16 +1336,6 @@ dt_binding_check: scripts_dtc 
# ---------------------------------------------------------------------------

# Modules



# install modules.builtin regardless of CONFIG_MODULES

PHONY += _builtin_inst_

_builtin_inst_:

	@mkdir -p $(MODLIB)/

	@cp -f modules.builtin $(MODLIB)/

	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/



PHONY += install

install: _builtin_inst_



ifdef CONFIG_MODULES



# By default, build modules as well
@@ -1389,7 +1379,7 @@ PHONY += modules_install 
modules_install: _modinst_ _modinst_post



PHONY += _modinst_

_modinst_: _builtin_inst_

_modinst_:

	@rm -rf $(MODLIB)/kernel

	@rm -f $(MODLIB)/source

	@mkdir -p $(MODLIB)/kernel
@@ -1399,6 +1389,8 @@ _modinst_: _builtin_inst_ 
		ln -s $(CURDIR) $(MODLIB)/build ; \

	fi

	@sed 's:^:kernel/:' modules.order > $(MODLIB)/modules.order

	@cp -f modules.builtin $(MODLIB)/

	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst



# This depmod is only for convenience to give the initial

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ config CC_HAS_SIGN_RETURN_ADDRESS 
	def_bool $(cc-option,-msign-return-address=all)



config AS_HAS_PAC

	def_bool $(as-option,-Wa$(comma)-march=armv8.3-a)

	def_bool $(cc-option,-Wa$(comma)-march=armv8.3-a)



config AS_HAS_CFI_NEGATE_RA_STATE

	def_bool $(as-instr,.cfi_startproc\n.cfi_negate_ra_state\n.cfi_endproc\n)

lib/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ config DEBUG_INFO_COMPRESSED 
	bool "Compressed debugging information"

	depends on DEBUG_INFO

	depends on $(cc-option,-gz=zlib)

	depends on $(as-option,-Wa$(comma)--compress-debug-sections=zlib)

	depends on $(ld-option,--compress-debug-sections=zlib)

	help

	  Compress the debug information using zlib.  Requires GCC 5.0+ or Clang

samples/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ config SAMPLE_WATCHDOG 


config SAMPLE_WATCH_QUEUE

	bool "Build example /dev/watch_queue notification consumer"

	depends on HEADERS_INSTALL

	depends on CC_CAN_LINK && HEADERS_INSTALL

	help

	  Build example userspace program to use the new mount_notify(),

	  sb_notify() syscalls and the KEYCTL_WATCH_KEY keyctl() function.

samples/watch_queue/Makefile

+4 −6
Original line number Diff line number Diff line 
# List of programs to build

hostprogs := watch_test

# SPDX-License-Identifier: GPL-2.0-only

userprogs := watch_test

always-y := $(userprogs)



# Tell kbuild to always build the programs

always-y := $(hostprogs)



HOSTCFLAGS_watch_test.o += -I$(objtree)/usr/include
 
userccflags += -I usr/include

CRA Git | Maintained and supported by SUSTech CRA and CCSE