Commit 207f75c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.6-3' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - fix __uint128_t capability test in Kconfig when GCC that defaults to
   32-bit is used to build the 64-bit kernel

 - suppress new noisy Clang warnings -Wpointer-to-enum-cast

 - move the namespace field in Module.symvers for the backward
   compatibility reason for the depmod tool

 - use available compression for initramdisk when INTRAMFS_SOURCE is
   defined, which was the original behavior

 - fix modpost to handle correct large section numbers when it refers to
   modversion CRCs and module namespaces

 - fix comments and documents

* tag 'kbuild-fixes-v5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  scripts/kallsyms: fix wrong kallsyms_relative_base
  modpost: Get proper section index by get_secindex() instead of st_shndx
  initramfs: restore default compression behavior
  modpost: move the namespace field in Module.symvers last
  kbuild: Disable -Wpointer-to-enum-cast
  kbuild: doc: fix references to other documents
  int128: fix __uint128_t compiler test in Kconfig
  kconfig: introduce m32-flag and m64-flag
  kbuild: Fix inconsistent comment
parents 5d892919 7883a143

Documentation/kbuild/kbuild.rst

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ This is solely useful to speed up test compiles. 
KBUILD_EXTRA_SYMBOLS

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

For modules that use symbols from other modules.

See more details in modules.txt.

See more details in modules.rst.



ALLSOURCE_ARCHS

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

Documentation/kbuild/kconfig-macro-language.rst

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ intermediate:: 
            def_bool y



Then, Kconfig moves onto the evaluation stage to resolve inter-symbol

dependency as explained in kconfig-language.txt.

dependency as explained in kconfig-language.rst.





Variables

Documentation/kbuild/makefiles.rst

+3 −3
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ When kbuild executes, the following steps are followed (roughly): 
	$(KBUILD_AFLAGS_MODULE) is used to add arch-specific options that

	are used for assembler.



	From commandline AFLAGS_MODULE shall be used (see kbuild.txt).

	From commandline AFLAGS_MODULE shall be used (see kbuild.rst).



    KBUILD_CFLAGS_KERNEL

	$(CC) options specific for built-in
@@ -937,7 +937,7 @@ When kbuild executes, the following steps are followed (roughly): 


	$(KBUILD_CFLAGS_MODULE) is used to add arch-specific options that

	are used for $(CC).

	From commandline CFLAGS_MODULE shall be used (see kbuild.txt).

	From commandline CFLAGS_MODULE shall be used (see kbuild.rst).



    KBUILD_LDFLAGS_MODULE

	Options for $(LD) when linking modules
@@ -945,7 +945,7 @@ When kbuild executes, the following steps are followed (roughly): 
	$(KBUILD_LDFLAGS_MODULE) is used to add arch-specific options

	used when linking modules. This is often a linker script.



	From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).

	From commandline LDFLAGS_MODULE shall be used (see kbuild.rst).



    KBUILD_LDS

Documentation/kbuild/modules.rst

+2 −2
Original line number Diff line number Diff line
@@ -470,9 +470,9 @@ build. 


	The syntax of the Module.symvers file is::



	<CRC>       <Symbol>          <Namespace>  <Module>                         <Export Type>

	<CRC>       <Symbol>         <Module>                         <Export Type>     <Namespace>



	0xe1cc2a05  usb_stor_suspend  USB_STORAGE  drivers/usb/storage/usb-storage  EXPORT_SYMBOL_GPL

	0xe1cc2a05  usb_stor_suspend drivers/usb/storage/usb-storage  EXPORT_SYMBOL_GPL USB_STORAGE



	The fields are separated by tabs and values may be empty (e.g.

	if no namespace is defined for an exported symbol).

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ existing-targets := $(wildcard $(sort $(targets))) 


-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)



endif # config-targets

endif # config-build

endif # mixed-build

endif # need-sub-make

CRA Git | Maintained and supported by SUSTech CRA and CCSE