Update rust-toolchain to nightly-2024-05-02

kunyuanxu-star · May 11, 2024 · 720461a · 720461a
1 parent 974ec9f
commit 720461a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust-toolchain: [nightly, nightly-2024-01-19]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -38,7 +38,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly, nightly-2024-01-19]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -113,7 +113,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        rust-toolchain: [nightly, nightly-2024-01-19]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -153,7 +153,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         arch: [x86_64]
-        rust-toolchain: [nightly, nightly-2024-01-19]
+        rust-toolchain: [nightly, nightly-2024-05-02]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,7 +3,7 @@ name: Build & Deploy docs
 on: [push, pull_request]
 
 env:
-  rust-toolchain: nightly-2024-01-19
+  rust-toolchain: nightly-2024-05-02
 
 jobs:
   doc:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   qemu-version: 8.2.0
-  rust-toolchain: nightly-2024-01-19
+  rust-toolchain: nightly-2024-05-02
 
 jobs:
   unit-test:

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
 profile = "minimal"
-channel = "nightly-2024-01-19"
+channel = "nightly-2024-05-02"
 components = ["rust-src", "llvm-tools", "rustfmt", "clippy"]
 targets = ["x86_64-unknown-none", "riscv64gc-unknown-none-elf", "aarch64-unknown-none", "aarch64-unknown-none-softfloat"]
diff --git a/scripts/make/build_c.mk b/scripts/make/build_c.mk
@@ -25,9 +25,7 @@ ifeq ($(MODE), release)
   CFLAGS += -O3
 endif
 
-ifeq ($(ARCH), x86_64)
-  LDFLAGS += --no-relax
-else ifeq ($(ARCH), riscv64)
+ifeq ($(ARCH), riscv64)
   CFLAGS += -march=rv64gc -mabi=lp64d -mcmodel=medany
 endif
 

diff --git a/scripts/make/cargo.mk b/scripts/make/cargo.mk
@@ -19,10 +19,6 @@ build_args := \
 RUSTFLAGS := -C link-arg=-T$(LD_SCRIPT) -C link-arg=-no-pie
 RUSTDOCFLAGS := --enable-index-page -Zunstable-options -D rustdoc::broken_intra_doc_links
 
-ifeq ($(ARCH), x86_64)
-  RUSTFLAGS += -C link-arg=--no-relax
-endif
-
 ifeq ($(MAKECMDGOALS), doc_check_missing)
   RUSTDOCFLAGS += -D missing-docs
 endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Build & Deploy docs @@
     on: [push, pull_request]
     env:
-      rust-toolchain: nightly-2024-01-19
+      rust-toolchain: nightly-2024-05-02
     jobs:
       doc:
@@ Expand Down @@