Skip to content

Commit 2f9bc39

Browse files
authored
Merge pull request #2002 from rust-lang/rustc-pull
Rustc pull update
2 parents 9cf9966 + 1ed6cc8 commit 2f9bc39

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

crates/core_arch/src/arm_shared/hints.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ pub unsafe fn __sevl() {
8383
/// improve overall system performance.
8484
// Section 10.1 of ACLE says that the supported arches are: 8, 6K, 6-M
8585
// LLVM says "instruction requires: armv6k"
86+
// On ARMv6 in Thumb mode, T2 is required (see Arm DDI0406C Section A8.8.427)
8687
#[cfg(any(
87-
target_feature = "v6",
88+
all(target_feature = "v6k", not(target_feature = "thumb-mode")),
89+
target_feature = "v6t2",
90+
all(target_feature = "v6", target_feature = "mclass"),
8891
target_arch = "aarch64",
8992
target_arch = "arm64ec",
9093
doc

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
48622726c4a91c87bf6cd4dbe1000c95df59906e
1+
873d4682c7d285540b8f28bfe637006cef8918a6

0 commit comments

Comments
 (0)