Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Fix stale help text in gconfig
- Support *.S files in compile_commands.json
- Flatten KBUILD_CFLAGS
- Fix external module builds with Rust so that temporary files are
created in the modules directories instead of the kernel tree
* tag 'kbuild-fixes-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: rust: avoid creating temporary files
kbuild: flatten KBUILD_CFLAGS
gen_compile_commands: add assembly files to compilation database
kconfig: gconfig: correct program name in help text
kconfig: gconfig: drop the Show Debug Info help text
+31
-15
+17
-5
Makefile
+17
-5
Makefile
···
555
555
$(USERINCLUDE)
556
556
557
557
KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
558
-
KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
559
-
-fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
560
-
-Werror=implicit-function-declaration -Werror=implicit-int \
561
-
-Werror=return-type -Wno-format-security -funsigned-char \
562
-
-std=gnu11
558
+
559
+
KBUILD_CFLAGS :=
560
+
KBUILD_CFLAGS += -std=gnu11
561
+
KBUILD_CFLAGS += -fshort-wchar
562
+
KBUILD_CFLAGS += -funsigned-char
563
+
KBUILD_CFLAGS += -fno-common
564
+
KBUILD_CFLAGS += -fno-PIE
565
+
KBUILD_CFLAGS += -fno-strict-aliasing
566
+
KBUILD_CFLAGS += -Wall
567
+
KBUILD_CFLAGS += -Wundef
568
+
KBUILD_CFLAGS += -Werror=implicit-function-declaration
569
+
KBUILD_CFLAGS += -Werror=implicit-int
570
+
KBUILD_CFLAGS += -Werror=return-type
571
+
KBUILD_CFLAGS += -Werror=strict-prototypes
572
+
KBUILD_CFLAGS += -Wno-format-security
573
+
KBUILD_CFLAGS += -Wno-trigraphs
574
+
563
575
KBUILD_CPPFLAGS := -D__KERNEL__
564
576
KBUILD_RUSTFLAGS := $(rust_common_flags) \
565
577
--target=$(objtree)/scripts/target.json \
+4
-1
scripts/Makefile.build
+4
-1
scripts/Makefile.build
···
264
264
265
265
rust_allowed_features := new_uninit
266
266
267
+
# `--out-dir` is required to avoid temporaries being created by `rustc` in the
268
+
# current working directory, which may be not accessible in the out-of-tree
269
+
# modules case.
267
270
rust_common_cmd = \
268
271
RUST_MODFILE=$(modfile) $(RUSTC_OR_CLIPPY) $(rust_flags) \
269
272
-Zallow-features=$(rust_allowed_features) \
···
275
272
--extern alloc --extern kernel \
276
273
--crate-type rlib -L $(objtree)/rust/ \
277
274
--crate-name $(basename $(notdir $@)) \
278
-
--emit=dep-info=$(depfile)
275
+
--out-dir $(dir $@) --emit=dep-info=$(depfile)
279
276
280
277
# `--emit=obj`, `--emit=asm` and `--emit=llvm-ir` imply a single codegen unit
281
278
# will be used. We explicitly request `-Ccodegen-units=1` in any case, and
+5
-1
scripts/Makefile.host
+5
-1
scripts/Makefile.host
···
86
86
hostcxx_flags = -Wp,-MMD,$(depfile) \
87
87
$(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
88
88
$(HOSTCXXFLAGS_$(target-stem).o)
89
-
hostrust_flags = --emit=dep-info=$(depfile) \
89
+
90
+
# `--out-dir` is required to avoid temporaries being created by `rustc` in the
91
+
# current working directory, which may be not accessible in the out-of-tree
92
+
# modules case.
93
+
hostrust_flags = --out-dir $(dir $@) --emit=dep-info=$(depfile) \
90
94
$(KBUILD_HOSTRUSTFLAGS) $(HOST_EXTRARUSTFLAGS) \
91
95
$(HOSTRUSTFLAGS_$(target-stem))
92
96
+1
-1
scripts/clang-tools/gen_compile_commands.py
+1
-1
scripts/clang-tools/gen_compile_commands.py
···
19
19
_DEFAULT_LOG_LEVEL = 'WARNING'
20
20
21
21
_FILENAME_PATTERN = r'^\..*\.cmd$'
22
-
_LINE_PATTERN = r'^savedcmd_[^ ]*\.o := (.* )([^ ]*\.c) *(;|$)'
22
+
_LINE_PATTERN = r'^savedcmd_[^ ]*\.o := (.* )([^ ]*\.[cS]) *(;|$)'
23
23
_VALID_LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
24
24
# The tools/ directory adopts a different build system, and produces .cmd
25
25
# files in a different format. Do not support it.
+4
-7
scripts/kconfig/gconf.c
+4
-7
scripts/kconfig/gconf.c
···
636
636
{
637
637
GtkWidget *dialog;
638
638
const gchar *intro_text =
639
-
"Welcome to gkc, the GTK+ graphical configuration tool\n"
639
+
"Welcome to gconfig, the GTK+ graphical configuration tool.\n"
640
640
"For each option, a blank box indicates the feature is disabled, a\n"
641
641
"check indicates it is enabled, and a dot indicates that it is to\n"
642
642
"be compiled as a module. Clicking on the box will cycle through the three states.\n"
···
647
647
"Although there is no cross reference yet to help you figure out\n"
648
648
"what other options must be enabled to support the option you\n"
649
649
"are interested in, you can still view the help of a grayed-out\n"
650
-
"option.\n"
651
-
"\n"
652
-
"Toggling Show Debug Info under the Options menu will show \n"
653
-
"the dependencies, which you can then match by examining other options.";
650
+
"option.";
654
651
655
652
dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
656
653
GTK_DIALOG_DESTROY_WITH_PARENT,
···
664
667
{
665
668
GtkWidget *dialog;
666
669
const gchar *about_text =
667
-
"gkc is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n"
670
+
"gconfig is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n"
668
671
"Based on the source code from Roman Zippel.\n";
669
672
670
673
dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
···
682
685
{
683
686
GtkWidget *dialog;
684
687
const gchar *license_text =
685
-
"gkc is released under the terms of the GNU GPL v2.\n"
688
+
"gconfig is released under the terms of the GNU GPL v2.\n"
686
689
"For more information, please see the source code or\n"
687
690
"visit http://www.fsf.org/licenses/licenses.html\n";
688
691