diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c5b7093d6896b6..6f5e2e92925d2d 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-21] + rustc: [2021-01-24] 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-21 + rustc: 2021-01-24 output: build install: rustup sysroot: custom @@ -35,7 +35,7 @@ jobs: - arch: arm64 toolchain: clang config: release - rustc: 2021-01-21 + rustc: 2021-01-24 output: build install: standalone sysroot: common @@ -43,7 +43,7 @@ jobs: - arch: x86_64 toolchain: llvm config: debug - rustc: 2021-01-21 + rustc: 2021-01-24 output: build install: standalone sysroot: custom diff --git a/Documentation/rust/quick-start.rst b/Documentation/rust/quick-start.rst index fa7e142ce63fa4..c513ea3380a4b5 100644 --- a/Documentation/rust/quick-start.rst +++ b/Documentation/rust/quick-start.rst @@ -21,7 +21,7 @@ rustc ***** A recent *nightly* Rust toolchain (with, at least, ``rustc``) is required, -e.g. ``nightly-2021-01-21``. Our goal is to use a stable toolchain as soon +e.g. ``nightly-2021-01-24``. Our goal is to use a stable toolchain as soon as possible, but for the moment we depend on a handful of nightly features. If you are using ``rustup``, run:: diff --git a/arch/arm64/rust/target.json b/arch/arm64/rust/target.json index fa52347e204465..44953e2725c4a7 100644 --- a/arch/arm64/rust/target.json +++ b/arch/arm64/rust/target.json @@ -25,7 +25,14 @@ }, "relocation-model": "static", "relro-level": "full", - "stack-probes": true, + "stack-probes": { + "kind": "inline-or-call", + "min-llvm-version-for-inline": [ + 11, + 0, + 1 + ] + }, "target-c-int-width": "32", "target-endian": "little", "target-pointer-width": "64", diff --git a/arch/x86/rust/target.json b/arch/x86/rust/target.json index ee6ca664f5e08b..6e1759cd45bf56 100644 --- a/arch/x86/rust/target.json +++ b/arch/x86/rust/target.json @@ -27,7 +27,14 @@ }, "relocation-model": "static", "relro-level": "full", - "stack-probes": true, + "stack-probes": { + "kind": "inline-or-call", + "min-llvm-version-for-inline": [ + 11, + 0, + 1 + ] + }, "target-c-int-width": "32", "target-endian": "little", "target-pointer-width": "64",