Merge pull request torvalds#363 from nbdd0121/intrinsics

Disable stack probes
nbdd0121 · Jun 7, 2021 · 6470c0c · 6470c0c
2 parents bc06587 + 53bc4d4
commit 6470c0c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 40 deletions.
diff --git a/arch/arm64/rust/target.json b/arch/arm64/rust/target.json
@@ -26,12 +26,7 @@
   "relocation-model": "static",
   "relro-level": "full",
   "stack-probes": {
-    "kind": "inline-or-call",
-    "min-llvm-version-for-inline": [
-      11,
-      0,
-      1
-    ]
+    "kind": "none"
   },
   "target-c-int-width": "32",
   "target-endian": "little",

diff --git a/arch/riscv/rust/rv32ima.json b/arch/riscv/rust/rv32ima.json
@@ -28,12 +28,7 @@
   "relocation-model": "static",
   "relro-level": "full",
   "stack-probes": {
-    "kind": "inline-or-call",
-    "min-llvm-version-for-inline": [
-      11,
-      0,
-      1
-    ]
+    "kind": "none"
   },
   "target-c-int-width": "32",
   "target-endian": "little",

diff --git a/arch/riscv/rust/rv32imac.json b/arch/riscv/rust/rv32imac.json
@@ -28,12 +28,7 @@
   "relocation-model": "static",
   "relro-level": "full",
   "stack-probes": {
-    "kind": "inline-or-call",
-    "min-llvm-version-for-inline": [
-      11,
-      0,
-      1
-    ]
+    "kind": "none"
   },
   "target-c-int-width": "32",
   "target-endian": "little",

diff --git a/arch/riscv/rust/rv64ima.json b/arch/riscv/rust/rv64ima.json
@@ -28,12 +28,7 @@
   "relocation-model": "static",
   "relro-level": "full",
   "stack-probes": {
-    "kind": "inline-or-call",
-    "min-llvm-version-for-inline": [
-      11,
-      0,
-      1
-    ]
+    "kind": "none"
   },
   "target-c-int-width": "32",
   "target-endian": "little",

diff --git a/arch/riscv/rust/rv64imac.json b/arch/riscv/rust/rv64imac.json
@@ -28,12 +28,7 @@
   "relocation-model": "static",
   "relro-level": "full",
   "stack-probes": {
-    "kind": "inline-or-call",
-    "min-llvm-version-for-inline": [
-      11,
-      0,
-      1
-    ]
+    "kind": "none"
   },
   "target-c-int-width": "32",
   "target-endian": "little",

diff --git a/arch/x86/rust/target.json b/arch/x86/rust/target.json
@@ -28,12 +28,7 @@
   "relocation-model": "static",
   "relro-level": "full",
   "stack-probes": {
-    "kind": "inline-or-call",
-    "min-llvm-version-for-inline": [
-      11,
-      0,
-      1
-    ]
+    "kind": "none"
   },
   "target-c-int-width": "32",
   "target-endian": "little",

diff --git a/rust/compiler_builtins.rs b/rust/compiler_builtins.rs
@@ -42,10 +42,6 @@ macro_rules! define_panicking_intrinsics(
     }
 );
 
-define_panicking_intrinsics!("non-inline stack probes should not be used", {
-    __rust_probestack,
-});
-
 define_panicking_intrinsics!("`f32` should not be used", {
     __addsf3,
     __addsf3vfp,