From b67bcf9740fd7a50081c8f28f86c316f857e4bde Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Wed, 21 Jun 2023 12:28:41 +0200 Subject: [PATCH] CI: upgrade to Rust 1.70.0 This includes disabling debug assertions due to the `eh_frame` issue [1]. They can be re-enabled in Rust 1.72.0. This also disables handling dependency info since it is not generated anymore. Link: https://github.com/Rust-for-Linux/linux/issues/1012 [1] Signed-off-by: Miguel Ojeda --- .github/workflows/ci.yaml | 2 +- .github/workflows/kernel-arm-debug.config | 2 +- .github/workflows/kernel-arm64-debug-thinlto.config | 2 +- .github/workflows/kernel-arm64-debug.config | 2 +- .github/workflows/kernel-ppc64le-debug.config | 2 +- .github/workflows/kernel-riscv64-debug.config | 2 +- .github/workflows/kernel-x86_64-debug-thinlto.config | 2 +- .github/workflows/kernel-x86_64-debug.config | 2 +- scripts/Makefile.build | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 512906d767f840..d0ae127ed8ced5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: jobs: ci: runs-on: ubuntu-20.04 - container: ghcr.io/rust-for-linux/ci:Rust-1.66.0 + container: ghcr.io/rust-for-linux/ci:Rust-1.70.0 timeout-minutes: 25 strategy: diff --git a/.github/workflows/kernel-arm-debug.config b/.github/workflows/kernel-arm-debug.config index c91d8bdb3c63ef..76a999e7daebad 100644 --- a/.github/workflows/kernel-arm-debug.config +++ b/.github/workflows/kernel-arm-debug.config @@ -1817,7 +1817,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set # CONFIG_RUST_OPT_LEVEL_0 is not set diff --git a/.github/workflows/kernel-arm64-debug-thinlto.config b/.github/workflows/kernel-arm64-debug-thinlto.config index 685c8e0982efe1..a1f963368297c6 100644 --- a/.github/workflows/kernel-arm64-debug-thinlto.config +++ b/.github/workflows/kernel-arm64-debug-thinlto.config @@ -1465,7 +1465,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set # CONFIG_RUST_OPT_LEVEL_0 is not set diff --git a/.github/workflows/kernel-arm64-debug.config b/.github/workflows/kernel-arm64-debug.config index b20218794e90da..f3c75e485e075f 100644 --- a/.github/workflows/kernel-arm64-debug.config +++ b/.github/workflows/kernel-arm64-debug.config @@ -1460,7 +1460,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set # CONFIG_RUST_OPT_LEVEL_0 is not set diff --git a/.github/workflows/kernel-ppc64le-debug.config b/.github/workflows/kernel-ppc64le-debug.config index 163173416726b2..039b53bf470119 100644 --- a/.github/workflows/kernel-ppc64le-debug.config +++ b/.github/workflows/kernel-ppc64le-debug.config @@ -1582,7 +1582,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set CONFIG_RUST_OPT_LEVEL_0=y diff --git a/.github/workflows/kernel-riscv64-debug.config b/.github/workflows/kernel-riscv64-debug.config index 0c39089a35ef68..046d8758f9597d 100644 --- a/.github/workflows/kernel-riscv64-debug.config +++ b/.github/workflows/kernel-riscv64-debug.config @@ -1310,7 +1310,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set CONFIG_RUST_OPT_LEVEL_0=y diff --git a/.github/workflows/kernel-x86_64-debug-thinlto.config b/.github/workflows/kernel-x86_64-debug-thinlto.config index a4db37edef2a48..2a06e662506c06 100644 --- a/.github/workflows/kernel-x86_64-debug-thinlto.config +++ b/.github/workflows/kernel-x86_64-debug-thinlto.config @@ -1533,7 +1533,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set CONFIG_RUST_OPT_LEVEL_0=y diff --git a/.github/workflows/kernel-x86_64-debug.config b/.github/workflows/kernel-x86_64-debug.config index 635eecc7ec72d6..aa113d97674a9b 100644 --- a/.github/workflows/kernel-x86_64-debug.config +++ b/.github/workflows/kernel-x86_64-debug.config @@ -1536,7 +1536,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # # Rust hacking # -CONFIG_RUST_DEBUG_ASSERTIONS=y +#CONFIG_RUST_DEBUG_ASSERTIONS is not set CONFIG_RUST_OVERFLOW_CHECKS=y # CONFIG_RUST_OPT_LEVEL_SIMILAR_AS_CHOSEN_FOR_C is not set CONFIG_RUST_OPT_LEVEL_0=y diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 94d67252df4e0c..b05809ad1f7269 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -309,7 +309,7 @@ quiet_cmd_rustc_rsi_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) $@ $(obj)/%.rsi: $(src)/%.rs FORCE - $(call if_changed_dep,rustc_rsi_rs) + $(call if_changed,rustc_rsi_rs) quiet_cmd_rustc_s_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_s_rs = $(rust_common_cmd) --emit=asm=$@ $<