Skip to content

Commit 02cfedd

Browse files
committed
Auto merge of rust-lang#117372 - Amanieu:stdarch_update, r=Mark-Simulacrum
Update stdarch submodule Splits up rust-lang#27731 into multiple tracking issues. Closes rust-lang#27731
2 parents 7e09db6 + e106019 commit 02cfedd

File tree

5 files changed

+31
-20
lines changed

5 files changed

+31
-20
lines changed

core/src/lib.rs

-4
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,6 @@ pub mod primitive;
428428
deprecated_in_future
429429
)]
430430
#[allow(rustdoc::bare_urls)]
431-
// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is
432-
// merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet.
433-
#[allow(clashing_extern_declarations)]
434-
#[unstable(feature = "stdsimd", issue = "48556")]
435431
mod core_arch;
436432

437433
#[stable(feature = "simd_arch", since = "1.27.0")]

portable-simd/crates/core_simd/src/vendor/arm.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ use core::arch::arm::*;
77
#[cfg(target_arch = "aarch64")]
88
use core::arch::aarch64::*;
99

10-
#[cfg(any(
11-
target_arch = "aarch64",
12-
all(target_arch = "arm", target_feature = "v7"),
10+
#[cfg(all(
11+
any(
12+
target_arch = "aarch64",
13+
all(target_arch = "arm", target_feature = "v7"),
14+
),
15+
target_endian = "little"
1316
))]
1417
mod neon {
1518
use super::*;

std/src/lib.rs

+14-6
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
)]
263263
#![cfg_attr(any(windows, target_os = "uefi"), feature(round_char_boundary))]
264264
#![cfg_attr(target_os = "xous", feature(slice_ptr_len))]
265+
#![cfg_attr(target_family = "wasm", feature(stdarch_wasm_atomic_wait))]
265266
//
266267
// Language features:
267268
// tidy-alphabetical-start
@@ -364,6 +365,11 @@
364365
#![feature(panic_unwind)]
365366
// tidy-alphabetical-end
366367
//
368+
// Library features (std_detect):
369+
// tidy-alphabetical-start
370+
#![feature(stdarch_internal)]
371+
// tidy-alphabetical-end
372+
//
367373
// Only for re-exporting:
368374
// tidy-alphabetical-start
369375
#![feature(assert_matches)]
@@ -379,7 +385,6 @@
379385
#![feature(get_many_mut)]
380386
#![feature(lazy_cell)]
381387
#![feature(log_syntax)]
382-
#![feature(stdsimd)]
383388
#![feature(test)]
384389
#![feature(trace_macros)]
385390
// tidy-alphabetical-end
@@ -618,13 +623,16 @@ pub mod arch {
618623

619624
#[stable(feature = "simd_aarch64", since = "1.60.0")]
620625
pub use std_detect::is_aarch64_feature_detected;
626+
#[unstable(feature = "stdarch_arm_feature_detection", issue = "111190")]
627+
pub use std_detect::is_arm_feature_detected;
628+
#[unstable(feature = "is_riscv_feature_detected", issue = "111192")]
629+
pub use std_detect::is_riscv_feature_detected;
621630
#[stable(feature = "simd_x86", since = "1.27.0")]
622631
pub use std_detect::is_x86_feature_detected;
623-
#[unstable(feature = "stdsimd", issue = "48556")]
624-
pub use std_detect::{
625-
is_arm_feature_detected, is_mips64_feature_detected, is_mips_feature_detected,
626-
is_powerpc64_feature_detected, is_powerpc_feature_detected, is_riscv_feature_detected,
627-
};
632+
#[unstable(feature = "stdarch_mips_feature_detection", issue = "111188")]
633+
pub use std_detect::{is_mips64_feature_detected, is_mips_feature_detected};
634+
#[unstable(feature = "stdarch_powerpc_feature_detection", issue = "111191")]
635+
pub use std_detect::{is_powerpc64_feature_detected, is_powerpc_feature_detected};
628636
}
629637

630638
// This was stabilized in the crate root so we have to keep it there.

std/tests/run-time-detect.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
//! These tests just check that the macros are available in std.
22
33
#![cfg_attr(
4-
any(
5-
all(target_arch = "arm", any(target_os = "linux", target_os = "android")),
6-
all(target_arch = "powerpc", target_os = "linux"),
7-
all(target_arch = "powerpc64", target_os = "linux"),
8-
),
9-
feature(stdsimd)
4+
all(target_arch = "arm", any(target_os = "linux", target_os = "android")),
5+
feature(stdarch_arm_feature_detection)
6+
)]
7+
#![cfg_attr(
8+
all(target_arch = "powerpc", target_os = "linux"),
9+
feature(stdarch_powerpc_feature_detection)
10+
)]
11+
#![cfg_attr(
12+
all(target_arch = "powerpc64", target_os = "linux"),
13+
feature(stdarch_powerpc_feature_detection)
1014
)]
1115

1216
#[test]

stdarch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit f4528dd6e85d97bb802240d7cd048b6e1bf72540
1+
Subproject commit 5ef6eb42bdcfef6891517a6e4c77a89c18722f18

0 commit comments

Comments
 (0)