about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCaleb Zulawski <caleb.zulawski@gmail.com>2024-02-09 18:41:50 -0500
committerGitHub <noreply@github.com>2024-02-09 18:41:50 -0500
commitf505736e45e256efcb36bf85b7f920ccef320435 (patch)
tree6037306fff85954fbcc0d8be4e6f2f978923be1a
parentf55ca305a509df7f3ad6719a747d7b3fb7690d4b (diff)
parent047ba0a280a5d23f52c717af053b3171b0f78de8 (diff)
downloadrust-f505736e45e256efcb36bf85b7f920ccef320435.tar.gz
rust-f505736e45e256efcb36bf85b7f920ccef320435.zip
Merge pull request #389 from RalfJung/const_intrinsic_copy
fix feature flags
-rw-r--r--crates/core_simd/src/lib.rs20
-rw-r--r--crates/test_helpers/src/lib.rs6
2 files changed, 24 insertions, 2 deletions
diff --git a/crates/core_simd/src/lib.rs b/crates/core_simd/src/lib.rs
index faec64c6344..dfb36d8c513 100644
--- a/crates/core_simd/src/lib.rs
+++ b/crates/core_simd/src/lib.rs
@@ -1,6 +1,7 @@
 #![no_std]
 #![feature(
     core_intrinsics,
+    const_intrinsic_copy,
     const_refs_to_cell,
     const_maybe_uninit_as_mut_ptr,
     const_mut_refs,
@@ -11,10 +12,27 @@
     repr_simd,
     simd_ffi,
     staged_api,
-    stdsimd,
     strict_provenance,
     ptr_metadata
 )]
+#![cfg_attr(
+    all(
+        any(target_arch = "aarch64", target_arch = "arm",),
+        any(
+            all(target_feature = "v6", not(target_feature = "mclass")),
+            all(target_feature = "mclass", target_feature = "dsp"),
+        )
+    ),
+    feature(stdarch_arm_dsp)
+)]
+#![cfg_attr(
+    all(target_arch = "arm", target_feature = "v7"),
+    feature(stdarch_arm_neon_intrinsics)
+)]
+#![cfg_attr(
+    any(target_arch = "powerpc", target_arch = "powerpc64"),
+    feature(stdarch_powerpc)
+)]
 #![warn(missing_docs, clippy::missing_inline_in_public_items)] // basically all items, really
 #![deny(unsafe_op_in_unsafe_fn, clippy::undocumented_unsafe_blocks)]
 #![allow(internal_features)]
diff --git a/crates/test_helpers/src/lib.rs b/crates/test_helpers/src/lib.rs
index b80c745aaf2..51b860a8635 100644
--- a/crates/test_helpers/src/lib.rs
+++ b/crates/test_helpers/src/lib.rs
@@ -1,4 +1,8 @@
-#![feature(stdsimd, powerpc_target_feature)]
+#![feature(powerpc_target_feature)]
+#![cfg_attr(
+    any(target_arch = "powerpc", target_arch = "powerpc64"),
+    feature(stdarch_powerpc)
+)]
 
 pub mod array;