Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Fix build error for the combination of SYSTEM_TRUSTED_KEYRING=y and
X509_CERTIFICATE_PARSER=m
- Fix DEBUG_INFO_SPLIT to generate debug info for GCC 11+ and Clang 12+
- Revive debug info for assembly files
- Remove unused code
* tag 'kbuild-fixes-v6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
Makefile.debug: re-enable debug info for .S files
Makefile.debug: set -g unconditional on CONFIG_DEBUG_INFO_SPLIT
certs: make system keyring depend on built-in x509 parser
Kconfig: remove unused function 'menu_get_root_menu'
scripts/clang-tools: remove unused module
+14
-20
+1
-1
certs/Kconfig
+1
-1
certs/Kconfig
···
43
43
bool "Provide system-wide ring of trusted keys"
44
44
depends on KEYS
45
45
depends on ASYMMETRIC_KEY_TYPE
46
-
depends on X509_CERTIFICATE_PARSER
46
+
depends on X509_CERTIFICATE_PARSER = y
47
47
help
48
48
Provide a system keyring to which trusted keys can be added. Keys in
49
49
the keyring are considered to be trusted. Keys may be added at will
+3
-1
lib/Kconfig.debug
+3
-1
lib/Kconfig.debug
···
264
264
config DEBUG_INFO_DWARF4
265
265
bool "Generate DWARF Version 4 debuginfo"
266
266
select DEBUG_INFO
267
+
depends on !CC_IS_CLANG || (CC_IS_CLANG && (AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502)))
267
268
help
268
-
Generate DWARF v4 debug info. This requires gcc 4.5+ and gdb 7.0+.
269
+
Generate DWARF v4 debug info. This requires gcc 4.5+, binutils 2.35.2
270
+
if using clang without clang's integrated assembler, and gdb 7.0+.
269
271
270
272
If you have consumers of DWARF debug info that are not ready for
271
273
newer revisions of DWARF, you may wish to choose this or have your
+10
-11
scripts/Makefile.debug
+10
-11
scripts/Makefile.debug
···
1
1
DEBUG_CFLAGS :=
2
+
debug-flags-y := -g
2
3
3
4
ifdef CONFIG_DEBUG_INFO_SPLIT
4
5
DEBUG_CFLAGS += -gsplit-dwarf
5
-
else
6
-
DEBUG_CFLAGS += -g
7
6
endif
8
7
9
-
ifndef CONFIG_AS_IS_LLVM
10
-
KBUILD_AFLAGS += -Wa,-gdwarf-2
8
+
debug-flags-$(CONFIG_DEBUG_INFO_DWARF4) += -gdwarf-4
9
+
debug-flags-$(CONFIG_DEBUG_INFO_DWARF5) += -gdwarf-5
10
+
ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_AS_IS_GNU),yy)
11
+
# Clang does not pass -g or -gdwarf-* option down to GAS.
12
+
# Add -Wa, prefix to explicitly specify the flags.
13
+
KBUILD_AFLAGS += $(addprefix -Wa$(comma), $(debug-flags-y))
11
14
endif
12
-
13
-
ifndef CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
14
-
dwarf-version-$(CONFIG_DEBUG_INFO_DWARF4) := 4
15
-
dwarf-version-$(CONFIG_DEBUG_INFO_DWARF5) := 5
16
-
DEBUG_CFLAGS += -gdwarf-$(dwarf-version-y)
17
-
endif
15
+
DEBUG_CFLAGS += $(debug-flags-y)
16
+
KBUILD_AFLAGS += $(debug-flags-y)
18
17
19
18
ifdef CONFIG_DEBUG_INFO_REDUCED
20
19
DEBUG_CFLAGS += -fno-var-tracking
···
28
29
KBUILD_LDFLAGS += --compress-debug-sections=zlib
29
30
endif
30
31
31
-
KBUILD_CFLAGS += $(DEBUG_CFLAGS)
32
+
KBUILD_CFLAGS += $(DEBUG_CFLAGS)
32
33
export DEBUG_CFLAGS
-1
scripts/clang-tools/run-clang-tools.py
-1
scripts/clang-tools/run-clang-tools.py
-1
scripts/kconfig/lkc.h
-1
scripts/kconfig/lkc.h
···
98
98
bool menu_is_visible(struct menu *menu);
99
99
bool menu_has_prompt(struct menu *menu);
100
100
const char *menu_get_prompt(struct menu *menu);
101
-
struct menu *menu_get_root_menu(struct menu *menu);
102
101
struct menu *menu_get_parent_menu(struct menu *menu);
103
102
bool menu_has_help(struct menu *menu);
104
103
const char *menu_get_help(struct menu *menu);