diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4614690aaa1744..d9da916b6dc9da 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: arch: [x86_64, arm64] toolchain: [gcc, clang, llvm] config: [debug, release] - rustc: [2021-01-02] + rustc: [2021-01-21] output: [src] # [src, build] install: [rustup] # [rustup, standalone] sysroot: [common] # [common, custom] @@ -27,7 +27,7 @@ jobs: - arch: x86_64 toolchain: gcc config: debug - rustc: 2021-01-09 + rustc: 2021-01-21 output: build install: rustup sysroot: custom @@ -35,7 +35,7 @@ jobs: - arch: arm64 toolchain: clang config: release - rustc: 2021-01-16 + rustc: 2021-01-21 output: build install: standalone sysroot: common @@ -43,7 +43,7 @@ jobs: - arch: x86_64 toolchain: llvm config: debug - rustc: 2021-01-19 + rustc: 2021-01-21 output: build install: standalone sysroot: custom diff --git a/.gitignore b/.gitignore index 41f449fec21577..8ae4040e373827 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,7 @@ *.o *.o.* *.patch -*.rlib +*.rmeta *.s *.so *.so.dbg diff --git a/Makefile b/Makefile index 84de668159c046..b5c3bf412970ec 100644 --- a/Makefile +++ b/Makefile @@ -502,7 +502,7 @@ KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -Werror=return-type -Wno-format-security \ -std=gnu89 KBUILD_CPPFLAGS := -D__KERNEL__ -KBUILD_RUSTCFLAGS := --emit=dep-info,obj,link -Zbinary_dep_depinfo=y \ +KBUILD_RUSTCFLAGS := --emit=dep-info,obj,metadata -Zbinary_dep_depinfo=y \ -Cpanic=abort -Cembed-bitcode=n -Clto=n -Crpath=n \ -Cforce-unwind-tables=n -Ccodegen-units=1 \ -Zsymbol-mangling-version=v0 @@ -1874,7 +1874,7 @@ clean: $(clean-dirs) $(call cmd,rmfiles) @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \ \( -name '*.[aios]' -o -name '*.ko' -o -name '.*.cmd' \ - -o -name '*.rlib' \ + -o -name '*.rmeta' \ -o -name '*.ko.*' \ -o -name '*.dtb' -o -name '*.dtb.S' -o -name '*.dt.yaml' \ -o -name '*.dwo' -o -name '*.lst' \ diff --git a/rust/Makefile b/rust/Makefile index f6437ae5571144..f5af10260ffb5e 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -64,7 +64,7 @@ $(objtree)/rust/exports_kernel_generated.h: $(objtree)/rust/kernel.o FORCE quiet_cmd_rustc_procmacro = RUSTC P $@ cmd_rustc_procmacro = \ - $(RUSTC) $(rustc_flags) --edition 2018 --extern proc_macro \ + $(RUSTC) $(rustc_flags) --emit=dep-info,link --edition 2018 --extern proc_macro \ --crate-type proc-macro --out-dir $(objtree)/rust/ \ --crate-name $(patsubst lib%.so,%,$(notdir $@)) $<; \ mv $(objtree)/rust/$(patsubst lib%.so,%,$(notdir $@)).d $(depfile); \