Skip to content

Commit 34ca6c0

Browse files
committed
Remove custom TLS implementation for Trusty targets
1 parent 1200090 commit 34ca6c0

File tree

2 files changed

+2
-39
lines changed

2 files changed

+2
-39
lines changed

library/std/src/sys/thread_local/key/trusty.rs

-30
This file was deleted.

library/std/src/sys/thread_local/mod.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ cfg_if::cfg_if! {
2828
all(target_family = "wasm", not(target_feature = "atomics")),
2929
target_os = "uefi",
3030
target_os = "zkvm",
31+
target_os = "trusty",
3132
))] {
3233
mod statik;
3334
pub use statik::{EagerStorage, LazyStorage, thread_local_inner};
@@ -91,6 +92,7 @@ pub(crate) mod guard {
9192
)),
9293
target_os = "uefi",
9394
target_os = "zkvm",
95+
target_os = "trusty",
9496
))] {
9597
pub(crate) fn enable() {
9698
// FIXME: Right now there is no concept of "thread exit" on
@@ -170,15 +172,6 @@ pub(crate) mod key {
170172
pub(crate) use xous::destroy_tls;
171173
pub(super) use xous::{Key, get, set};
172174
use xous::{create, destroy};
173-
} else if #[cfg(target_os = "trusty")] {
174-
#[allow(unused_unsafe)]
175-
mod racy;
176-
#[cfg(test)]
177-
mod tests;
178-
mod trusty;
179-
pub(super) use racy::LazyKey;
180-
pub(super) use trusty::{Key, get, set};
181-
use trusty::{create, destroy};
182175
}
183176
}
184177
}

0 commit comments

Comments
 (0)