Skip to content

Commit 7fd93ca

Browse files
committed
Migrate to the new stack probes option
The stack probes options changed from taking a boolean to a set of options. For the moment, use `inline-or-call` for both x86_64 and arm64, since that is what the x86 builtin targets moved to and since we had it enabled for arm64 too (although note that arm64 does not have it in the builtin target). This also raises the minimum version of `rustc` to 2021-01-24, which is just a few days from the previous one (2021-01-21), which is easier than trying to support both formats. Triggered by #84. Signed-off-by: Miguel Ojeda <[email protected]>
1 parent eb188eb commit 7fd93ca

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
arch: [x86_64, arm64]
1414
toolchain: [gcc, clang, llvm]
1515
config: [debug, release]
16-
rustc: [2021-01-21]
16+
rustc: [2021-01-24]
1717
output: [src] # [src, build]
1818
install: [rustup] # [rustup, standalone]
1919
sysroot: [common] # [common, custom]
@@ -27,23 +27,23 @@ jobs:
2727
- arch: x86_64
2828
toolchain: gcc
2929
config: debug
30-
rustc: 2021-01-21
30+
rustc: 2021-01-24
3131
output: build
3232
install: rustup
3333
sysroot: custom
3434

3535
- arch: arm64
3636
toolchain: clang
3737
config: release
38-
rustc: 2021-01-21
38+
rustc: 2021-01-24
3939
output: build
4040
install: standalone
4141
sysroot: common
4242

4343
- arch: x86_64
4444
toolchain: llvm
4545
config: debug
46-
rustc: 2021-01-21
46+
rustc: 2021-01-24
4747
output: build
4848
install: standalone
4949
sysroot: custom

Documentation/rust/quick-start.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustc
2121
*****
2222

2323
A recent *nightly* Rust toolchain (with, at least, ``rustc``) is required,
24-
e.g. ``nightly-2021-01-21``. Our goal is to use a stable toolchain as soon
24+
e.g. ``nightly-2021-01-24``. Our goal is to use a stable toolchain as soon
2525
as possible, but for the moment we depend on a handful of nightly features.
2626

2727
If you are using ``rustup``, run::

arch/arm64/rust/target.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@
2525
},
2626
"relocation-model": "static",
2727
"relro-level": "full",
28-
"stack-probes": true,
28+
"stack-probes": {
29+
"kind": "inline-or-call",
30+
"min-llvm-version-for-inline": [
31+
11,
32+
0,
33+
1
34+
]
35+
},
2936
"target-c-int-width": "32",
3037
"target-endian": "little",
3138
"target-pointer-width": "64",

arch/x86/rust/target.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,14 @@
2727
},
2828
"relocation-model": "static",
2929
"relro-level": "full",
30-
"stack-probes": true,
30+
"stack-probes": {
31+
"kind": "inline-or-call",
32+
"min-llvm-version-for-inline": [
33+
11,
34+
0,
35+
1
36+
]
37+
},
3138
"target-c-int-width": "32",
3239
"target-endian": "little",
3340
"target-pointer-width": "64",

0 commit comments

Comments
 (0)