Merge pull request #85 from Rust-for-Linux/rust-stack-probes

Migrate to the new stack probes option
Rust-for-Linux · Feb 11, 2021 · 095daad · 095daad
2 parents eb188eb + 7fd93ca
commit 095daad
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git 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,23 +27,23 @@ jobs:
           - arch: x86_64
             toolchain: gcc
             config: debug
-            rustc: 2021-01-21
+            rustc: 2021-01-24
             output: build
             install: rustup
             sysroot: custom
 
           - arch: arm64
             toolchain: clang
             config: release
-            rustc: 2021-01-21
+            rustc: 2021-01-24
             output: build
             install: standalone
             sysroot: common
 
           - 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
@@ -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
@@ -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
@@ -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",