Skip to content

std: support RwLock and thread parking on TEEOS #148694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −56
Open

std: support RwLock and thread parking on TEEOS #148694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions library/std/src/sys/sync/rwlock/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cfg_select! {
all(target_os = "windows", target_vendor = "win7"),
all(target_vendor = "fortanix", target_env = "sgx"),
target_os = "xous",
target_os = "teeos",
) => {
mod queue;
pub use queue::RwLock;
Expand All @@ -27,10 +28,6 @@ cfg_select! {
mod solid;
pub use solid::RwLock;
}
target_os = "teeos" => {
mod teeos;
pub use teeos::RwLock;
}
_ => {
mod no_threads;
pub use no_threads::RwLock;
Expand Down
50 changes: 0 additions & 50 deletions library/std/src/sys/sync/rwlock/teeos.rs
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion library/std/src/sys/sync/thread_parking/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ cfg_select! {
mod xous;
pub use xous::Parker;
}
target_family = "unix" => {
any(
target_family = "unix",
target_os = "teeos",
) => {
mod pthread;
pub use pthread::Parker;
}
Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustc/src/platform-support/aarch64-unknown-teeos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Target for the TEEOS operating system.

TEEOS is a mini os run in TrustZone, for trusted/security apps. The kernel of TEEOS is HongMeng/ChCore micro kernel. The libc for TEEOS is a part of musl.
It's very small that there is no RwLock, no network, no stdin, and no file system for apps in TEEOS.
It's very small that there is no network, no stdin, and no file system for apps in TEEOS.

Some abbreviation:

Expand Down
Loading