Commit 088d1324 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.15' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Add proper pahole version dependency to CONFIG_GENDWARFKSYMS to avoid
   module loading errors

 - Fix UAPI header tests for the OpenRISC architecture

 - Add dependency on the libdw package in Debian and RPM packages

 - Disable -Wdefault-const-init-unsafe warnings on Clang

 - Make "make clean ARCH=um" also clean the arch/x86/ directory

 - Revert the use of -fmacro-prefix-map=, which causes issues with
   debugger usability

* tag 'kbuild-fixes-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: fix typos "module.builtin" to "modules.builtin"
  Revert "kbuild, rust: use -fremap-path-prefix to make paths relative"
  Revert "kbuild: make all file references relative to source root"
  kbuild: fix dependency on sorttable
  init: remove unused CONFIG_CC_CAN_LINK_STATIC
  um: let 'make clean' properly clean underlying SUBARCH as well
  kbuild: Disable -Wdefault-const-init-unsafe
  kbuild: rpm-pkg: Add (elfutils-devel or libdw-devel) to BuildRequires
  kbuild: deb-pkg: Add libdw-dev:native to Build-Depends-Arch
  usr/include: openrisc: don't HDRTEST bpf_perf_event.h
  kbuild: Require pahole <v1.28 or >v1.29 with GENDWARFKSYMS on X86
parents 546bce57 e0cd396d

Documentation/kbuild/reproducible-builds.rst

+17 −0
Original line number Diff line number Diff line
@@ -46,6 +46,21 @@ The kernel embeds the building user and host names in 
`KBUILD_BUILD_USER and KBUILD_BUILD_HOST`_ variables.  If you are

building from a git commit, you could use its committer address.



Absolute filenames

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



When the kernel is built out-of-tree, debug information may include

absolute filenames for the source files.  This must be overridden by

including the ``-fdebug-prefix-map`` option in the `KCFLAGS`_ variable.



Depending on the compiler used, the ``__FILE__`` macro may also expand

to an absolute filename in an out-of-tree build.  Kbuild automatically

uses the ``-fmacro-prefix-map`` option to prevent this, if it is

supported.



The Reproducible Builds web site has more information about these

`prefix-map options`_.



Generated files in source packages

----------------------------------
@@ -116,5 +131,7 @@ See ``scripts/setlocalversion`` for details. 


.. _KBUILD_BUILD_TIMESTAMP: kbuild.html#kbuild-build-timestamp

.. _KBUILD_BUILD_USER and KBUILD_BUILD_HOST: kbuild.html#kbuild-build-user-kbuild-build-host

.. _KCFLAGS: kbuild.html#kcflags

.. _prefix-map options: https://reproducible-builds.org/docs/build-path/

.. _Reproducible Builds project: https://reproducible-builds.org/

.. _SOURCE_DATE_EPOCH: https://reproducible-builds.org/docs/source-date-epoch/

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -1068,8 +1068,7 @@ KBUILD_CFLAGS += -fno-builtin-wcslen 


# change __FILE__ to the relative path to the source directory

ifdef building_out_of_srctree

KBUILD_CPPFLAGS += $(call cc-option,-ffile-prefix-map=$(srcroot)/=)

KBUILD_RUSTFLAGS += --remap-path-prefix=$(srcroot)/=

KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srcroot)/=)

endif



# include additional Makefiles when needed

arch/um/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -154,5 +154,6 @@ MRPROPER_FILES += $(HOST_DIR)/include/generated 
archclean:

	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \

		-o -name '*.gcov' \) -type f -print | xargs rm -f

	$(Q)$(MAKE) -f $(srctree)/Makefile ARCH=$(HEADER_ARCH) clean



export HEADER_ARCH SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING DEV_NULL_PATH

init/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ config CC_CAN_LINK 
	default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(m64-flag)) if 64BIT

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



config CC_CAN_LINK_STATIC

	bool

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

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



# Fixed in GCC 14, 13.3, 12.4 and 11.5

# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113921

config GCC_ASM_GOTO_OUTPUT_BROKEN

kernel/module/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ config GENDWARFKSYMS 
	depends on !DEBUG_INFO_REDUCED && !DEBUG_INFO_SPLIT

	# Requires ELF object files.

	depends on !LTO

	# To avoid conflicts with the discarded __gendwarfksyms_ptr symbols on

	# X86, requires pahole before commit 47dcb534e253 ("btf_encoder: Stop

	# indexing symbols for VARs") or after commit 9810758003ce ("btf_encoder:

	# Verify 0 address DWARF variables are in ELF section").

	depends on !X86 || !DEBUG_INFO_BTF || PAHOLE_VERSION < 128 || PAHOLE_VERSION > 129

	help

	  Calculate symbol versions from DWARF debugging information using

	  gendwarfksyms. Requires DEBUG_INFO to be enabled.