aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-12-03 14:42:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2025-12-03 14:42:21 -0800
commit2ddcf4962c1834a14340a1f50afafc3276c015bd (patch)
tree159ddc0115f74ac2367e5862056370b12edf4823 /scripts
parent784faa8eca8270671e0ed6d9d21f04bbb80fc5f7 (diff)
parent2a9c8c0b59d366acabb8f891e84569376f3e2709 (diff)
downloadnet-2ddcf4962c1834a14340a1f50afafc3276c015bd.tar.gz
Merge tag 'kbuild-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux
Pull Kbuild updates from Nicolas Schier: - Enable -fms-extensions, allowing anonymous use of tagged struct or union in struct/union (tag kbuild-ms-extensions-6.19). An exemplary conversion patch is added here, too (btrfs). [ Editor's note: the core of this actually came in early through a shared branch and a few other trees - Linus ] - Introduce architecture-specific CC_CAN_LINK and flags for userprogs - Add new packaging target 'modules-cpio-pkg' for building a initramfs cpio w/ kmods - Handle included .c files in gen_compile_commands - Minor kbuild changes: - Use objtree for module signing key path, fixing oot kmod signing - Improve documentation of KBUILD_BUILD_TIMESTAMP - Reuse KBUILD_USERCFLAGS for UAPI, instead of defining twice - Rename scripts/Makefile.extrawarn to Makefile.warn - Drop obsolete types.h check from headers_check.pl - Remove outdated config leak ignore entries * tag 'kbuild-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux: kbuild: add target to build a cpio containing modules initramfs: add gen_init_cpio to hostprogs unconditionally kbuild: allow architectures to override CC_CAN_LINK init: deduplicate cc-can-link.sh invocations kbuild: don't enable CC_CAN_LINK if the dummy program generates warnings scripts: headers_install.sh: Remove two outdated config leak ignore entries scripts/clang-tools: Handle included .c files in gen_compile_commands kbuild: uapi: Drop types.h check from headers_check.pl kbuild: Rename Makefile.extrawarn to Makefile.warn MAINTAINERS, .mailmap: Update mail address for Nicolas Schier kbuild: uapi: reuse KBUILD_USERCFLAGS kbuild: doc: improve KBUILD_BUILD_TIMESTAMP documentation kbuild: Use objtree for module signing key path btrfs: send: make use of -fms-extensions for defining struct fs_path
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Kconfig.include3
-rw-r--r--scripts/Makefile.modinst2
-rw-r--r--scripts/Makefile.package20
-rw-r--r--scripts/Makefile.warn (renamed from scripts/Makefile.extrawarn)0
-rwxr-xr-xscripts/cc-can-link.sh2
-rwxr-xr-xscripts/clang-tools/gen_compile_commands.py135
-rwxr-xr-xscripts/headers_install.sh2
7 files changed, 153 insertions, 11 deletions
diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include
index 33193ca6e8030e..d42042b6c9e243 100644
--- a/scripts/Kconfig.include
+++ b/scripts/Kconfig.include
@@ -65,6 +65,9 @@ cc-option-bit = $(if-success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null,$
m32-flag := $(cc-option-bit,-m32)
m64-flag := $(cc-option-bit,-m64)
+# Test whether the compiler can link userspace applications
+cc_can_link_user = $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(1))
+
rustc-version := $(shell,$(srctree)/scripts/rustc-version.sh $(RUSTC))
rustc-llvm-version := $(shell,$(srctree)/scripts/rustc-llvm-version.sh $(RUSTC))
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 1628198f3e8309..9ba45e5b32b183 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -100,7 +100,7 @@ endif
# Don't stop modules_install even if we can't sign external modules.
#
ifeq ($(filter pkcs11:%, $(CONFIG_MODULE_SIG_KEY)),)
-sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(srctree)/)$(CONFIG_MODULE_SIG_KEY)
+sig-key := $(if $(wildcard $(CONFIG_MODULE_SIG_KEY)),,$(objtree)/)$(CONFIG_MODULE_SIG_KEY)
else
sig-key := $(CONFIG_MODULE_SIG_KEY)
endif
diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index 74bcb9e7f7a451..83bfcf7cb09fd2 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -189,6 +189,25 @@ tar-pkg: linux-$(KERNELRELEASE)-$(ARCH).tar
tar%-pkg: linux-$(KERNELRELEASE)-$(ARCH).tar.% FORCE
@:
+# modules-cpio-pkg - generate an initramfs with the modules
+# ---------------------------------------------------------------------------
+
+.tmp_modules_cpio: FORCE
+ $(Q)$(MAKE) -f $(srctree)/Makefile
+ $(Q)rm -rf $@
+ $(Q)$(MAKE) -f $(srctree)/Makefile INSTALL_MOD_PATH=$@ modules_install
+
+quiet_cmd_cpio = CPIO $@
+ cmd_cpio = $(CONFIG_SHELL) $(srctree)/usr/gen_initramfs.sh -o $@ $<
+
+modules-$(KERNELRELEASE)-$(ARCH).cpio: .tmp_modules_cpio
+ $(Q)$(MAKE) $(build)=usr usr/gen_init_cpio
+ $(call cmd,cpio)
+
+PHONY += modules-cpio-pkg
+modules-cpio-pkg: modules-$(KERNELRELEASE)-$(ARCH).cpio
+ @:
+
# perf-tar*-src-pkg - generate a source tarball with perf source
# ---------------------------------------------------------------------------
@@ -245,6 +264,7 @@ help:
@echo ' tarbz2-pkg - Build the kernel as a bzip2 compressed tarball'
@echo ' tarxz-pkg - Build the kernel as a xz compressed tarball'
@echo ' tarzst-pkg - Build the kernel as a zstd compressed tarball'
+ @echo ' modules-cpio-pkg - Build the kernel modules as cpio archive'
@echo ' perf-tar-src-pkg - Build the perf source tarball with no compression'
@echo ' perf-targz-src-pkg - Build the perf source tarball with gzip compression'
@echo ' perf-tarbz2-src-pkg - Build the perf source tarball with bz2 compression'
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.warn
index 68e6fafcb80c89..68e6fafcb80c89 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.warn
diff --git a/scripts/cc-can-link.sh b/scripts/cc-can-link.sh
index 6efcead3198989..e67fd8d7b6841e 100755
--- a/scripts/cc-can-link.sh
+++ b/scripts/cc-can-link.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
-cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1
+cat << "END" | $@ -Werror -Wl,--fatal-warnings -x c - -o /dev/null >/dev/null 2>&1
#include <stdio.h>
int main(void)
{
diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-tools/gen_compile_commands.py
index 96e6e46ad1a702..6f4afa92a4665d 100755
--- a/scripts/clang-tools/gen_compile_commands.py
+++ b/scripts/clang-tools/gen_compile_commands.py
@@ -21,6 +21,12 @@ _DEFAULT_LOG_LEVEL = 'WARNING'
_FILENAME_PATTERN = r'^\..*\.cmd$'
_LINE_PATTERN = r'^(saved)?cmd_[^ ]*\.o := (?P<command_prefix>.* )(?P<file_path>[^ ]*\.[cS]) *(;|$)'
_VALID_LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
+
+# Pre-compiled regexes for better performance
+_INCLUDE_PATTERN = re.compile(r'^\s*#\s*include\s*[<"]([^>"]*)[>"]')
+_C_INCLUDE_PATTERN = re.compile(r'^\s*#\s*include\s*"([^"]*\.c)"\s*$')
+_FILENAME_MATCHER = re.compile(_FILENAME_PATTERN)
+
# The tools/ directory adopts a different build system, and produces .cmd
# files in a different format. Do not support it.
_EXCLUDE_DIRS = ['.git', 'Documentation', 'include', 'tools']
@@ -82,7 +88,6 @@ def cmdfiles_in_dir(directory):
The path to a .cmd file.
"""
- filename_matcher = re.compile(_FILENAME_PATTERN)
exclude_dirs = [ os.path.join(directory, d) for d in _EXCLUDE_DIRS ]
for dirpath, dirnames, filenames in os.walk(directory, topdown=True):
@@ -92,7 +97,7 @@ def cmdfiles_in_dir(directory):
continue
for filename in filenames:
- if filename_matcher.match(filename):
+ if _FILENAME_MATCHER.match(filename):
yield os.path.join(dirpath, filename)
@@ -149,8 +154,87 @@ def cmdfiles_for_modorder(modorder):
yield to_cmdfile(mod_line.rstrip())
+def extract_includes_from_file(source_file, root_directory):
+ """Extract #include statements from a C file.
+
+ Args:
+ source_file: Path to the source .c file to analyze
+ root_directory: Root directory for resolving relative paths
+
+ Returns:
+ List of header files that should be included (without quotes/brackets)
+ """
+ includes = []
+ if not os.path.exists(source_file):
+ return includes
+
+ try:
+ with open(source_file, 'r') as f:
+ for line in f:
+ line = line.strip()
+ # Look for #include statements.
+ # Match both #include "header.h" and #include <header.h>.
+ match = _INCLUDE_PATTERN.match(line)
+ if match:
+ header = match.group(1)
+ # Skip including other .c files to avoid circular includes.
+ if not header.endswith('.c'):
+ # For relative includes (quoted), resolve path relative to source file.
+ if '"' in line:
+ src_dir = os.path.dirname(source_file)
+ header_path = os.path.join(src_dir, header)
+ if os.path.exists(header_path):
+ rel_header = os.path.relpath(header_path, root_directory)
+ includes.append(rel_header)
+ else:
+ includes.append(header)
+ else:
+ # System include like <linux/sched.h>.
+ includes.append(header)
+ except IOError:
+ pass
+
+ return includes
+
+
+def find_included_c_files(source_file, root_directory):
+ """Find .c files that are included by the given source file.
+
+ Args:
+ source_file: Path to the source .c file
+ root_directory: Root directory for resolving relative paths
+
+ Yields:
+ Full paths to included .c files
+ """
+ if not os.path.exists(source_file):
+ return
+
+ try:
+ with open(source_file, 'r') as f:
+ for line in f:
+ line = line.strip()
+ # Look for #include "*.c" patterns.
+ match = _C_INCLUDE_PATTERN.match(line)
+ if match:
+ included_file = match.group(1)
+ # Handle relative paths.
+ if not os.path.isabs(included_file):
+ src_dir = os.path.dirname(source_file)
+ included_file = os.path.join(src_dir, included_file)
+
+ # Normalize the path.
+ included_file = os.path.normpath(included_file)
+
+ # Check if the file exists.
+ if os.path.exists(included_file):
+ yield included_file
+ except IOError:
+ pass
+
+
def process_line(root_directory, command_prefix, file_path):
- """Extracts information from a .cmd line and creates an entry from it.
+ """Extracts information from a .cmd line and creates entries from it.
Args:
root_directory: The directory that was searched for .cmd files. Usually
@@ -160,7 +244,8 @@ def process_line(root_directory, command_prefix, file_path):
Usually relative to root_directory, but sometimes absolute.
Returns:
- An entry to append to compile_commands.
+ A list of entries to append to compile_commands (may include multiple
+ entries if the source file includes other .c files).
Raises:
ValueError: Could not find the extracted file based on file_path and
@@ -176,11 +261,47 @@ def process_line(root_directory, command_prefix, file_path):
abs_path = os.path.realpath(os.path.join(root_directory, file_path))
if not os.path.exists(abs_path):
raise ValueError('File %s not found' % abs_path)
- return {
+
+ entries = []
+
+ # Create entry for the main source file.
+ main_entry = {
'directory': root_directory,
'file': abs_path,
'command': prefix + file_path,
}
+ entries.append(main_entry)
+
+ # Find and create entries for included .c files.
+ for included_c_file in find_included_c_files(abs_path, root_directory):
+ # For included .c files, create a compilation command that:
+ # 1. Uses the same compilation flags as the parent file
+ # 2. But compiles the included file directly (not the parent)
+ # 3. Includes necessary headers from the parent file for proper macro resolution
+
+ # Convert absolute path to relative for the command.
+ rel_path = os.path.relpath(included_c_file, root_directory)
+
+ # Extract includes from the parent file to provide proper compilation context.
+ extra_includes = ''
+ try:
+ parent_includes = extract_includes_from_file(abs_path, root_directory)
+ if parent_includes:
+ extra_includes = ' ' + ' '.join('-include ' + inc for inc in parent_includes)
+ except IOError:
+ pass
+
+ included_entry = {
+ 'directory': root_directory,
+ 'file': included_c_file,
+ # Use the same compilation prefix but target the included file directly.
+ # Add extra headers for proper macro resolution.
+ 'command': prefix + extra_includes + ' ' + rel_path,
+ }
+ entries.append(included_entry)
+ logging.debug('Added entry for included file: %s', included_c_file)
+
+ return entries
def main():
@@ -213,9 +334,9 @@ def main():
result = line_matcher.match(f.readline())
if result:
try:
- entry = process_line(directory, result.group('command_prefix'),
+ entries = process_line(directory, result.group('command_prefix'),
result.group('file_path'))
- compile_commands.append(entry)
+ compile_commands.extend(entries)
except ValueError as err:
logging.info('Could not add line from %s: %s',
cmdfile, err)
diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
index 4c20c62c4faf58..0e4e939efc9409 100755
--- a/scripts/headers_install.sh
+++ b/scripts/headers_install.sh
@@ -70,8 +70,6 @@ configs=$(sed -e '
#
# The format is <file-name>:<CONFIG-option> in each line.
config_leak_ignores="
-arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_16K
-arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K
arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE
arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8
arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-07 11:58:28 +0000