Skip to content

Commit b9fb8e9

Browse files
authored
Merge pull request #2617 from rust-lang/rustc-pull
Rustc pull update
2 parents 7de5cf5 + 0579bde commit b9fb8e9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4068bafedd8ba724e332a5221c06a6fa531a30d2
1+
b1b464d6f61ec8c4e609c1328106378c066a9729

src/tests/directives.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ Some examples of `X` in `ignore-X` or `only-X`:
163163
The following directives will check rustc build settings and target
164164
settings:
165165

166-
- `needs-asm-support` — ignores if it is running on a target that doesn't have
167-
stable support for `asm!`
166+
- `needs-asm-support` — ignores if the **host** architecture doesn't have
167+
stable support for `asm!`. For tests that cross-compile to explicit targets
168+
via `--target`, use `needs-llvm-components` instead to ensure the appropriate
169+
backend is available.
168170
- `needs-profiler-runtime` — ignores the test if the profiler runtime was not
169171
enabled for the target
170172
(`build.profiler = true` in rustc's `bootstrap.toml`)

0 commit comments

Comments
 (0)