Skip to content

Commit 1ed6cc8

Browse files
author
The rustc-josh-sync Cronjob Bot
committed
Merge ref '873d4682c7d2' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@873d468 Filtered ref: 003d326 Upstream diff: rust-lang/rust@4862272...873d468 This merge was created using https://github.com/rust-lang/josh-sync.
2 parents a10002d + 003d326 commit 1ed6cc8

1 file changed

Lines changed: 4 additions & 1 deletion

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

0 commit comments

Comments
 (0)