Skip to content

Commit 3d9ed44

Browse files
committed
Auto merge of #151615 - matthiaskrgr:rollup-2WQ1USJ, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang/rust#149962 (Promote powerpc64-unknown-linux-musl to tier 2 with host tools) - rust-lang/rust#150138 (Add new Tier 3 targets for ARMv6) - rust-lang/rust#150905 (Fix(lib/win/net): Remove hostname support under Win7) - rust-lang/rust#151094 (remote-test-server: Fix compilation on UEFI targets) - rust-lang/rust#151346 (add `simd_splat` intrinsic) - rust-lang/rust#151353 (compiletest: Make `aux-crate` directive explicitly handle `--extern` modifiers) - rust-lang/rust#151538 (std: `sleep_until` on Motor and VEX) - rust-lang/rust#151098 (Add Korean translation to Rust By Example) - rust-lang/rust#151157 (Extend build-manifest local test guide) - rust-lang/rust#151403 (std: use 64-bit `clock_nanosleep` on GNU/Linux if available) - rust-lang/rust#151571 (Fix cstring-merging test for Hexagon target)
2 parents a6df6c4 + 5463298 commit 3d9ed44

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)