diff options
Diffstat (limited to 'library/stdarch/crates/std_detect')
5 files changed, 11 insertions, 4 deletions
diff --git a/library/stdarch/crates/std_detect/src/detect/arch/aarch64.rs b/library/stdarch/crates/std_detect/src/detect/arch/aarch64.rs index f697ae857e8..742c2bebd98 100644 --- a/library/stdarch/crates/std_detect/src/detect/arch/aarch64.rs +++ b/library/stdarch/crates/std_detect/src/detect/arch/aarch64.rs @@ -2,7 +2,7 @@ features! { @TARGET: aarch64; - @CFG: target_arch = "aarch64"; + @CFG: any(target_arch = "aarch64", target_arch = "arm64ec"); @MACRO_NAME: is_aarch64_feature_detected; @MACRO_ATTRS: /// This macro tests, at runtime, whether an `aarch64` feature is enabled on aarch64 platforms. diff --git a/library/stdarch/crates/std_detect/src/detect/arch/mod.rs b/library/stdarch/crates/std_detect/src/detect/arch/mod.rs index 2123fec8bff..d0f5fab7491 100644 --- a/library/stdarch/crates/std_detect/src/detect/arch/mod.rs +++ b/library/stdarch/crates/std_detect/src/detect/arch/mod.rs @@ -29,7 +29,7 @@ cfg_if! { } else if #[cfg(target_arch = "arm")] { #[unstable(feature = "stdarch_arm_feature_detection", issue = "111190")] pub use arm::*; - } else if #[cfg(target_arch = "aarch64")] { + } else if #[cfg(any(target_arch = "aarch64", target_arch = "arm64ec"))] { #[stable(feature = "simd_aarch64", since = "1.60.0")] pub use aarch64::*; } else if #[cfg(any(target_arch = "riscv32", target_arch = "riscv64"))] { diff --git a/library/stdarch/crates/std_detect/src/detect/mod.rs b/library/stdarch/crates/std_detect/src/detect/mod.rs index c938abf17da..ae86ca987ee 100644 --- a/library/stdarch/crates/std_detect/src/detect/mod.rs +++ b/library/stdarch/crates/std_detect/src/detect/mod.rs @@ -63,7 +63,7 @@ cfg_if! { mod aarch64; #[path = "os/openbsd/aarch64.rs"] mod os; - } else if #[cfg(all(target_os = "windows", target_arch = "aarch64"))] { + } else if #[cfg(all(target_os = "windows", any(target_arch = "aarch64", target_arch = "arm64ec")))] { #[path = "os/windows/aarch64.rs"] mod os; } else if #[cfg(all(target_os = "macos", target_arch = "aarch64", feature = "libc"))] { @@ -93,6 +93,7 @@ pub fn features() -> impl Iterator<Item = (&'static str, bool)> { target_arch = "x86_64", target_arch = "arm", target_arch = "aarch64", + target_arch = "arm64ec", target_arch = "riscv32", target_arch = "riscv64", target_arch = "powerpc", diff --git a/library/stdarch/crates/std_detect/tests/cpu-detection.rs b/library/stdarch/crates/std_detect/tests/cpu-detection.rs index 1053de3a826..fcad846fbd9 100644 --- a/library/stdarch/crates/std_detect/tests/cpu-detection.rs +++ b/library/stdarch/crates/std_detect/tests/cpu-detection.rs @@ -9,6 +9,7 @@ any( target_arch = "arm", target_arch = "aarch64", + target_arch = "arm64ec", target_arch = "x86", target_arch = "x86_64", target_arch = "powerpc", @@ -101,7 +102,10 @@ fn aarch64_linux() { } #[test] -#[cfg(all(target_arch = "aarch64", target_os = "windows"))] +#[cfg(all( + any(target_arch = "aarch64", target_arch = "arm64ec"), + target_os = "windows" +))] fn aarch64_windows() { println!("asimd: {:?}", is_aarch64_feature_detected!("asimd")); println!("fp: {:?}", is_aarch64_feature_detected!("fp")); diff --git a/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs b/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs index d37629ec0a4..1d1ed4d3868 100644 --- a/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs +++ b/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs @@ -3,6 +3,7 @@ any( target_arch = "arm", target_arch = "aarch64", + target_arch = "arm64ec", target_arch = "x86", target_arch = "x86_64", target_arch = "powerpc", @@ -18,6 +19,7 @@ #[cfg(any( target_arch = "arm", target_arch = "aarch64", + target_arch = "arm64ec", target_arch = "x86", target_arch = "x86_64", target_arch = "powerpc", |