From b0e82a0c65bac4b9e14a29793055ab469d669036 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Sun, 4 Jul 2021 14:47:09 +0200 Subject: [PATCH 1/2] docs: fix extra hyphen Signed-off-by: Miguel Ojeda --- Documentation/kbuild/kbuild.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/kbuild/kbuild.rst b/Documentation/kbuild/kbuild.rst index 150e90664c0d18..468a0d216c29f3 100644 --- a/Documentation/kbuild/kbuild.rst +++ b/Documentation/kbuild/kbuild.rst @@ -58,7 +58,7 @@ CFLAGS_MODULE Additional module specific options to use for $(CC). KRUSTFLAGS ------------ +---------- Additional options to the Rust compiler (for built-in and modules). LDFLAGS_MODULE From dbf407f06fff12651ec6d9c2e8abecca55ff3e76 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Sun, 4 Jul 2021 14:48:02 +0200 Subject: [PATCH 2/2] rust: normalize `rustc_flags` to `rust_flags` Signed-off-by: Miguel Ojeda --- rust/Makefile | 18 +++++++++--------- scripts/Makefile.build | 2 +- scripts/Makefile.lib | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rust/Makefile b/rust/Makefile index e719e8a92d0f01..233b8f365482e4 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -32,7 +32,7 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< cmd_rustdoc = \ RUST_BINDINGS_FILE=$(abspath $(objtree)/rust/bindings_generated.rs) \ $(RUSTDOC) $(if $(rustdoc_host),,$(rust_cross_flags)) \ - $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rustc_flags))) \ + $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rust_flags))) \ $(rustc_target_flags) -L $(objtree)/rust \ --output $(objtree)/rust/doc --crate-name $(subst rustdoc-,,$@) \ @$(objtree)/include/generated/rustc_cfg $< @@ -79,7 +79,7 @@ rustdoc-kernel: $(srctree)/rust/kernel/lib.rs rustdoc-core \ quiet_cmd_rustc_test_library = RUSTC TL $< cmd_rustc_test_library = \ RUST_BINDINGS_FILE=$(abspath $(objtree)/rust/bindings_generated.rs) \ - $(RUSTC) $(filter-out --sysroot=%, $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rustc_flags)))) \ + $(RUSTC) $(filter-out --sysroot=%, $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rust_flags)))) \ $(rustc_target_flags) --crate-type $(if $(rustc_test_library_proc),proc-macro,rlib) \ --out-dir $(objtree)/rust/test/ --cfg testlib \ --sysroot $(objtree)/rust/test/sysroot \ @@ -96,7 +96,7 @@ rusttestlib-macros: $(srctree)/rust/macros/lib.rs rusttest-prepare FORCE quiet_cmd_rustdoc_test = RUSTDOC T $< cmd_rustdoc_test = \ RUST_BINDINGS_FILE=$(abspath $(objtree)/rust/bindings_generated.rs) \ - $(RUSTDOC) --test $(filter-out --sysroot=%, $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rustc_flags)))) \ + $(RUSTDOC) --test $(filter-out --sysroot=%, $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rust_flags)))) \ $(rustc_target_flags) $(rustdoc_test_target_flags) \ --sysroot $(objtree)/rust/test/sysroot $(rustdoc_test_quiet) \ -L $(objtree)/rust/test \ @@ -108,7 +108,7 @@ quiet_cmd_rustdoc_test = RUSTDOC T $< quiet_cmd_rustc_test = RUSTC T $< cmd_rustc_test = \ RUST_BINDINGS_FILE=$(abspath $(objtree)/rust/bindings_generated.rs) \ - $(RUSTC) --test $(filter-out --sysroot=%, $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rustc_flags)))) \ + $(RUSTC) --test $(filter-out --sysroot=%, $(filter-out -Cpanic=abort, $(filter-out --emit=%, $(rust_flags)))) \ $(rustc_target_flags) --out-dir $(objtree)/rust/test \ --sysroot $(objtree)/rust/test/sysroot \ -L $(objtree)/rust/test/ --crate-name $(subst rusttest-,,$@) $<; \ @@ -244,11 +244,11 @@ $(objtree)/rust/exports_alloc_generated.h: $(objtree)/rust/alloc.o FORCE $(objtree)/rust/exports_kernel_generated.h: $(objtree)/rust/kernel.o FORCE $(call if_changed,exports) -# `-Cpanic=unwind -Cforce-unwind-tables=y` overrides `rustc_flags` in order to +# `-Cpanic=unwind -Cforce-unwind-tables=y` overrides `rust_flags` in order to # avoid the https://github.com/rust-lang/rust/issues/82320 rustc crash. quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ cmd_rustc_procmacro = \ - $(RUSTC_OR_CLIPPY) $(rustc_flags) \ + $(RUSTC_OR_CLIPPY) $(rust_flags) \ --emit=dep-info,link --extern proc_macro \ -Cpanic=unwind -Cforce-unwind-tables=y \ --crate-type proc-macro --out-dir $(objtree)/rust/ \ @@ -267,15 +267,15 @@ quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L cmd_rustc_library = \ RUST_BINDINGS_FILE=$(abspath $(objtree)/rust/bindings_generated.rs) \ $(if $(skip_clippy),$(RUSTC),$(RUSTC_OR_CLIPPY)) \ - $(rustc_flags) $(rust_cross_flags) $(rustc_target_flags) \ + $(rust_flags) $(rust_cross_flags) $(rustc_target_flags) \ --crate-type rlib --out-dir $(objtree)/rust/ -L $(objtree)/rust/ \ --crate-name $(patsubst %.o,%,$(notdir $@)) $<; \ mv $(objtree)/rust/$(patsubst %.o,%,$(notdir $@)).d $(depfile); \ sed -i '/^\#/d' $(depfile) \ $(if $(rustc_objcopy),;$(OBJCOPY) $(rustc_objcopy) $@) -# `$(rustc_flags)` is passed in case the user added `--sysroot`. -rustc_sysroot = $(shell $(RUSTC) $(rustc_flags) --print sysroot) +# `$(rust_flags)` is passed in case the user added `--sysroot`. +rustc_sysroot = $(shell $(RUSTC) $(rust_flags) --print sysroot) rustc_host_target = $(shell $(RUSTC) --version --verbose | grep -F 'host: ' | cut -d' ' -f2) RUST_LIB_SRC ?= $(rustc_sysroot)/lib/rustlib/src/rust/library diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 3a489d1c4b9688..bb22acf8415bc3 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -299,7 +299,7 @@ rust_cross_flags := --target=$(realpath $(KBUILD_RUST_TARGET)) quiet_cmd_rustc_o_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_o_rs = \ RUST_MODFILE=$(modfile) \ - $(RUSTC_OR_CLIPPY) $(rustc_flags) $(rust_cross_flags) \ + $(RUSTC_OR_CLIPPY) $(rust_flags) $(rust_cross_flags) \ -Zallow-features=allocator_api,bench_black_box,concat_idents,global_asm,try_reserve \ --extern alloc --extern kernel \ --crate-type rlib --out-dir $(obj) -L $(objtree)/rust/ \ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 2a0615d2b9326d..cee5af32c65c35 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -134,7 +134,7 @@ _c_flags = $(filter-out $(CFLAGS_REMOVE_$(target-stem).o), \ $(filter-out $(ccflags-remove-y), \ $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(ccflags-y)) \ $(CFLAGS_$(target-stem).o)) -_rustc_flags = $(filter-out $(RUSTFLAGS_REMOVE_$(target-stem).o), \ +_rust_flags = $(filter-out $(RUSTFLAGS_REMOVE_$(target-stem).o), \ $(filter-out $(rustflags-remove-y), \ $(KBUILD_RUSTFLAGS) $(rustflags-y)) \ $(RUSTFLAGS_$(target-stem).o)) @@ -221,7 +221,7 @@ c_flags = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(_c_flags) $(modkern_cflags) \ $(basename_flags) $(modname_flags) -rustc_flags = $(_rustc_flags) $(modkern_rustflags) @$(objtree)/include/generated/rustc_cfg +rust_flags = $(_rust_flags) $(modkern_rustflags) @$(objtree)/include/generated/rustc_cfg a_flags = -Wp,-MMD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(_a_flags) $(modkern_aflags)