Commit 4bc92736 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull Kbuild fixes frin Masahiro Yamada:

 - fix various bugs in xconfig

 - fix some issues in cross-compilation using Clang

 - fix documentation

* tag 'kbuild-fixes-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  .gitignore: Do not track `defconfig` from `make savedefconfig`
  kbuild: make Clang build userprogs for target architecture
  kbuild: fix CONFIG_CC_CAN_LINK(_STATIC) for cross-compilation with Clang
  kconfig: qconf: parse newer types at debug info
  kconfig: qconf: navigate menus on hyperlinks
  kconfig: qconf: don't show goback button on splitMode
  kconfig: qconf: simplify the goBack() logic
  kconfig: qconf: re-implement setSelected()
  kconfig: qconf: make debug links work again
  kconfig: qconf: make search fully work again on split mode
  kconfig: qconf: cleanup includes
  docs: kbuild: fix ReST formatting
  gcc-plugins: fix gcc-plugins directory path in documentation
parents 19a61a75 ba77dca5

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ x509.genkey 
/allrandom.config

/allyes.config



# Kconfig savedefconfig output

/defconfig



# Kdevelop4

*.kdev4

Documentation/kbuild/modules.rst

+4 −3
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ module 8123.ko, which is built from the following files:: 
	8123_pci.c

	8123_bin.o_shipped	<= Binary blob



--- 3.1 Shared Makefile

3.1 Shared Makefile

-------------------



	An external module always includes a wrapper makefile that

	supports building the module using "make" with no arguments.

Documentation/kbuild/reproducible-builds.rst

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ Structure randomisation 


If you enable ``CONFIG_GCC_PLUGIN_RANDSTRUCT``, you will need to

pre-generate the random seed in

``scripts/gcc-plgins/randomize_layout_seed.h`` so the same value

``scripts/gcc-plugins/randomize_layout_seed.h`` so the same value

is used in rebuilds.



Debug info conflicts

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -970,8 +970,8 @@ LDFLAGS_vmlinux += --pack-dyn-relocs=relr 
endif



# Align the bit size of userspace programs with the kernel

KBUILD_USERCFLAGS  += $(filter -m32 -m64, $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64, $(KBUILD_CFLAGS))

KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))



# make the checker run with the right architecture

CHECKFLAGS += --arch=$(ARCH)

init/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ config CLANG_VERSION 


config CC_CAN_LINK

	bool

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m64-flag)) if 64BIT

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(m32-flag))

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag)) if 64BIT

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m32-flag))



config CC_CAN_LINK_STATIC

	bool

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) -static $(m64-flag)) if 64BIT

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) -static $(m32-flag))

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m64-flag) -static) if 64BIT

	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(m32-flag) -static)



config CC_HAS_ASM_GOTO

	def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))

CRA Git | Maintained and supported by SUSTech CRA and CCSE