Skip to content

Commit aa94a08

Browse files
committed
Fixes for use in the standard library
1 parent eeb0ebd commit aa94a08

File tree

2 files changed

+4
-6
lines changed
  • crates

2 files changed

+4
-6
lines changed

crates/core_arch/src/arm_shared/neon/mod.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -8707,8 +8707,7 @@ pub unsafe fn vpadalq_u32(a: uint64x2_t, b: uint32x4_t) -> uint64x2_t {
87078707

87088708
/// 8-bit integer matrix multiply-accumulate
87098709
#[inline]
8710-
#[cfg_attr(not(bootstrap), target_feature(enable = "i8mm"))]
8711-
#[target_feature(enable = "neon")]
8710+
#[target_feature(enable = "neon,i8mm")]
87128711
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
87138712
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(nop))]
87148713
#[cfg_attr(all(test, target_arch = "aarch64"), assert_instr(smmla))]
@@ -8735,8 +8734,7 @@ pub unsafe fn vmmlaq_s32(a: int32x4_t, b: int8x16_t, c: int8x16_t) -> int32x4_t
87358734

87368735
/// 8-bit integer matrix multiply-accumulate
87378736
#[inline]
8738-
#[cfg_attr(not(bootstrap), target_feature(enable = "i8mm"))]
8739-
#[target_feature(enable = "neon")]
8737+
#[target_feature(enable = "neon,i8mm")]
87408738
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
87418739
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(nop))]
87428740
#[cfg_attr(all(test, target_arch = "aarch64"), assert_instr(ummla))]
@@ -8763,8 +8761,7 @@ pub unsafe fn vmmlaq_u32(a: uint32x4_t, b: uint8x16_t, c: uint8x16_t) -> uint32x
87638761

87648762
/// Unsigned and signed 8-bit integer matrix multiply-accumulate
87658763
#[inline]
8766-
#[cfg_attr(not(bootstrap), target_feature(enable = "i8mm"))]
8767-
#[target_feature(enable = "neon")]
8764+
#[target_feature(enable = "neon,i8mm")]
87688765
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
87698766
#[cfg_attr(all(test, target_arch = "arm"), assert_instr(nop))]
87708767
#[cfg_attr(all(test, target_arch = "aarch64"), assert_instr(usmmla))]

crates/std_detect/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
// Remove this as soon as the stdarch submodule is updated on nightly.
2525
#![allow(stable_features)]
2626
#![feature(stdsimd)]
27+
#![cfg_attr(feature = "rustc-dep-of-std", feature(stdarch_x86_has_cpuid))]
2728

2829
#[cfg(test)]
2930
#[macro_use]

0 commit comments

Comments
 (0)