Skip to content

Commit 7416e25

Browse files
authored
Merge pull request #1960 from maurer/remove-tme
aarch64: Remove withdrawn FEAT_TME
2 parents 672c67f + 230f29b commit 7416e25

File tree

6 files changed

+2
-210
lines changed

6 files changed

+2
-210
lines changed

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515

1616
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
1717
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -cpu max -L /usr/aarch64-linux-gnu" \
18-
OBJDUMP=aarch64-linux-gnu-objdump \
19-
STDARCH_TEST_SKIP_FEATURE=tme
18+
OBJDUMP=aarch64-linux-gnu-objdump

ci/docker/aarch64_be-unknown-linux-gnu/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ ENV AARCH64_BE_LIBC="${AARCH64_BE_TOOLCHAIN}/aarch64_be-none-linux-gnu/libc"
2727
ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_LINKER="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-gcc"
2828
ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64_be -cpu max -L ${AARCH64_BE_LIBC}"
2929
ENV OBJDUMP="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-objdump"
30-
ENV STDARCH_TEST_SKIP_FEATURE=tme

crates/core_arch/src/aarch64/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ mod neon;
2121
#[stable(feature = "neon_intrinsics", since = "1.59.0")]
2222
pub use self::neon::*;
2323

24-
mod tme;
25-
#[unstable(feature = "stdarch_aarch64_tme", issue = "117216")]
26-
pub use self::tme::*;
27-
2824
mod prefetch;
2925
#[unstable(feature = "stdarch_aarch64_prefetch", issue = "117217")]
3026
pub use self::prefetch::*;

crates/core_arch/src/aarch64/tme.rs

Lines changed: 0 additions & 201 deletions
This file was deleted.

crates/stdarch-test/src/disassembly.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub(crate) fn disassemble_myself() -> HashSet<Function> {
7878
let objdump = env::var("OBJDUMP").unwrap_or_else(|_| "objdump".to_string());
7979
let add_args = if cfg!(target_vendor = "apple") && cfg!(target_arch = "aarch64") {
8080
// Target features need to be enabled for LLVM objdump on Darwin ARM64
81-
vec!["--mattr=+v8.6a,+crypto,+tme"]
81+
vec!["--mattr=+v8.6a,+crypto"]
8282
} else if cfg!(any(target_arch = "riscv32", target_arch = "riscv64")) {
8383
vec!["--mattr=+zk,+zks,+zbc,+zbb"]
8484
} else {

crates/stdarch-verify/tests/arm.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@ fn verify_all_signatures() {
444444
&& !rust.file.ends_with("v6.rs\"")
445445
&& !rust.file.ends_with("v7.rs\"")
446446
&& !rust.file.ends_with("v8.rs\"")
447-
&& !rust.file.ends_with("tme.rs\"")
448447
&& !rust.file.ends_with("mte.rs\"")
449448
&& !rust.file.ends_with("ex.rs\"")
450449
&& !skip_intrinsic_verify.contains(&rust.name)

0 commit comments

Comments
 (0)