Commit 7f707257 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux 

Pull Kbuild updates from Nathan Chancellor:

 - Extend modules.builtin.modinfo to include module aliases from
   MODULE_DEVICE_TABLE for builtin modules so that userspace tools (such
   as kmod) can verify that a particular module alias will be handled by
   a builtin module

 - Bump the minimum version of LLVM for building the kernel to 15.0.0

 - Upgrade several userspace API checks in headers_check.pl to errors

 - Unify and consolidate CONFIG_WERROR / W=e handling

 - Turn assembler and linker warnings into errors with CONFIG_WERROR /
   W=e

 - Respect CONFIG_WERROR / W=e when building userspace programs
   (userprogs)

 - Enable -Werror unconditionally when building host programs
   (hostprogs)

 - Support copy_file_range() and data segment alignment in gen_init_cpio
   to improve performance on filesystems that support reflinks such as
   btrfs and XFS

 - Miscellaneous small changes to scripts and configuration files

* tag 'kbuild-6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux: (47 commits)
  modpost: Initialize builtin_modname to stop SIGSEGVs
  Documentation: kbuild: note CONFIG_DEBUG_EFI in reproducible builds
  kbuild: vmlinux.unstripped should always depend on .vmlinux.export.o
  modpost: Create modalias for builtin modules
  modpost: Add modname to mod_device_table alias
  scsi: Always define blogic_pci_tbl structure
  kbuild: extract modules.builtin.modinfo from vmlinux.unstripped
  kbuild: keep .modinfo section in vmlinux.unstripped
  kbuild: always create intermediate vmlinux.unstripped
  s390: vmlinux.lds.S: Reorder sections
  KMSAN: Remove tautological checks
  objtool: Drop noinstr hack for KCSAN_WEAK_MEMORY
  lib/Kconfig.debug: Drop CLANG_VERSION check from DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
  riscv: Remove ld.lld version checks from many TOOLCHAIN_HAS configs
  riscv: Unconditionally use linker relaxation
  riscv: Remove version check for LTO_CLANG selects
  powerpc: Drop unnecessary initializations in __copy_inst_from_kernel_nofault()
  mips: Unconditionally select ARCH_HAS_CURRENT_STACK_POINTER
  arm64: Remove tautological LLVM Kconfig conditions
  ARM: Clean up definition of ARM_HAS_GROUP_RELOCS
  ...
parents c0f53f0d 2ea77fca

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ x509.genkey 
*.kdev4



# Clang's compilation database file

/compile_commands.json

compile_commands.json



# Documentation toolchain

sphinx_*/

Documentation/driver-api/early-userspace/buffer-format.rst

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ c_mtime is ignored unless CONFIG_INITRAMFS_PRESERVE_MTIME=y is set. 
The c_filesize should be zero for any file which is not a regular file

or symlink.



c_namesize may account for more than one trailing '\0', as long as the

value doesn't exceed PATH_MAX.  This can be useful for ensuring that a

subsequent file data segment is aligned, e.g. to a filesystem block

boundary.



The c_chksum field contains a simple 32-bit unsigned sum of all the

bytes in the data field.  cpio(1) refers to this as "crc", which is

clearly incorrect (a cyclic redundancy check is a different and

Documentation/kbuild/reproducible-builds.rst

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ supported. 
The Reproducible Builds web site has more information about these

`prefix-map options`_.



Some CONFIG options such as `CONFIG_DEBUG_EFI` embed absolute paths in

object files. Such options should be disabled.



Generated files in source packages

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

Documentation/process/changes.rst

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ you probably needn't concern yourself with pcmciautils. 
        Program        Minimal version       Command to check the version

====================== ===============  ========================================

GNU C                  8.1              gcc --version

Clang/LLVM (optional)  13.0.1           clang --version

Clang/LLVM (optional)  15.0.0           clang --version

Rust (optional)        1.78.0           rustc --version

bindgen (optional)     0.65.1           bindgen --version

GNU make               4.0              make --version

Makefile

+3 −5
Original line number Diff line number Diff line
@@ -901,9 +901,6 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG) := -fstack-protector-strong 


KBUILD_CFLAGS += $(stackp-flags-y)



KBUILD_RUSTFLAGS-$(CONFIG_WERROR) += -Dwarnings

KBUILD_RUSTFLAGS += $(KBUILD_RUSTFLAGS-y)



ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

KBUILD_RUSTFLAGS += -Cforce-frame-pointers=y
@@ -1138,8 +1135,9 @@ LDFLAGS_vmlinux += --emit-relocs --discard-none 
endif



# Align the bit size of userspace programs with the kernel

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

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

USERFLAGS_FROM_KERNEL := -m32 -m64 --target=%

KBUILD_USERCFLAGS  += $(filter $(USERFLAGS_FROM_KERNEL), $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter $(USERFLAGS_FROM_KERNEL), $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))



# userspace programs are linked via the compiler, use the correct linker

ifdef CONFIG_CC_IS_CLANG