mirror of
https://github.com/torvalds/linux.git
synced 2025-12-01 07:26:02 +07:00
Merge tag 'kbuild-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada: - Improve performance in gendwarfksyms - Remove deprecated EXTRA_*FLAGS and KBUILD_ENABLE_EXTRA_GCC_CHECKS - Support CONFIG_HEADERS_INSTALL for ARCH=um - Use more relative paths to sources files for better reproducibility - Support the loong64 Debian architecture - Add Kbuild bash completion - Introduce intermediate vmlinux.unstripped for architectures that need static relocations to be stripped from the final vmlinux - Fix versioning in Debian packages for -rc releases - Treat missing MODULE_DESCRIPTION() as an error - Convert Nios2 Makefiles to use the generic rule for built-in DTB - Add debuginfo support to the RPM package * tag 'kbuild-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (40 commits) kbuild: rpm-pkg: build a debuginfo RPM kconfig: merge_config: use an empty file as initfile nios2: migrate to the generic rule for built-in DTB rust: kbuild: skip `--remap-path-prefix` for `rustdoc` kbuild: pacman-pkg: hardcode module installation path kbuild: deb-pkg: don't set KBUILD_BUILD_VERSION unconditionally modpost: require a MODULE_DESCRIPTION() kbuild: make all file references relative to source root x86: drop unnecessary prefix map configuration kbuild: deb-pkg: add comment about future removal of KDEB_COMPRESS kbuild: Add a help message for "headers" kbuild: deb-pkg: remove "version" variable in mkdebian kbuild: deb-pkg: fix versioning for -rc releases Documentation/kbuild: Fix indentation in modules.rst example x86: Get rid of Makefile.postlink kbuild: Create intermediate vmlinux build with relocations preserved kbuild: Introduce Kconfig symbol for linking vmlinux with relocations kbuild: link-vmlinux.sh: Make output file name configurable kbuild: do not generate .tmp_vmlinux*.map when CONFIG_VMLINUX_MAP=y Revert "kheaders: Ignore silly-rename files" ...
This commit is contained in:
@@ -31,6 +31,7 @@ set -e
|
||||
LD="$1"
|
||||
KBUILD_LDFLAGS="$2"
|
||||
LDFLAGS_vmlinux="$3"
|
||||
VMLINUX="$4"
|
||||
|
||||
is_enabled() {
|
||||
grep -q "^$1=y" include/config/auto.conf
|
||||
@@ -97,8 +98,8 @@ vmlinux_link()
|
||||
ldflags="${ldflags} ${wl}--strip-debug"
|
||||
fi
|
||||
|
||||
if is_enabled CONFIG_VMLINUX_MAP; then
|
||||
ldflags="${ldflags} ${wl}-Map=${output}.map"
|
||||
if [ -n "${generate_map}" ]; then
|
||||
ldflags="${ldflags} ${wl}-Map=vmlinux.map"
|
||||
fi
|
||||
|
||||
${ld} ${ldflags} -o ${output} \
|
||||
@@ -208,6 +209,7 @@ fi
|
||||
btf_vmlinux_bin_o=
|
||||
kallsymso=
|
||||
strip_debug=
|
||||
generate_map=
|
||||
|
||||
if is_enabled CONFIG_KALLSYMS; then
|
||||
true > .tmp_vmlinux0.syms
|
||||
@@ -276,23 +278,27 @@ fi
|
||||
|
||||
strip_debug=
|
||||
|
||||
vmlinux_link vmlinux
|
||||
if is_enabled CONFIG_VMLINUX_MAP; then
|
||||
generate_map=1
|
||||
fi
|
||||
|
||||
vmlinux_link "${VMLINUX}"
|
||||
|
||||
# fill in BTF IDs
|
||||
if is_enabled CONFIG_DEBUG_INFO_BTF; then
|
||||
info BTFIDS vmlinux
|
||||
info BTFIDS "${VMLINUX}"
|
||||
RESOLVE_BTFIDS_ARGS=""
|
||||
if is_enabled CONFIG_WERROR; then
|
||||
RESOLVE_BTFIDS_ARGS=" --fatal_warnings "
|
||||
fi
|
||||
${RESOLVE_BTFIDS} ${RESOLVE_BTFIDS_ARGS} vmlinux
|
||||
${RESOLVE_BTFIDS} ${RESOLVE_BTFIDS_ARGS} "${VMLINUX}"
|
||||
fi
|
||||
|
||||
mksysmap vmlinux System.map
|
||||
mksysmap "${VMLINUX}" System.map
|
||||
|
||||
if is_enabled CONFIG_BUILDTIME_TABLE_SORT; then
|
||||
info SORTTAB vmlinux
|
||||
if ! sorttable vmlinux; then
|
||||
info SORTTAB "${VMLINUX}"
|
||||
if ! sorttable "${VMLINUX}"; then
|
||||
echo >&2 Failed to sort kernel tables
|
||||
exit 1
|
||||
fi
|
||||
@@ -308,4 +314,4 @@ if is_enabled CONFIG_KALLSYMS; then
|
||||
fi
|
||||
|
||||
# For fixdep
|
||||
echo "vmlinux: $0" > .vmlinux.d
|
||||
echo "${VMLINUX}: $0" > ".${VMLINUX}.d"
|
||||
|
||||
Reference in New Issue
Block a user