Skip to content

Commit f197145

Browse files
committed
Revert libstd support for Trusty
1 parent dcd0c58 commit f197145

File tree

9 files changed

+1
-167
lines changed

9 files changed

+1
-167
lines changed

Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,5 @@ rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
115115
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
116116
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
117117

118-
libc = { git = "https://github.com/randomPoison/libc.git", rev = "7ccd2753aa1e26301c73bdb6f9e2df8085ac39e6" }
119-
120118
[patch."https://github.com/rust-lang/rust-clippy"]
121119
clippy_lints = { path = "src/tools/clippy/clippy_lints" }

library/core/src/ffi/mod.rs

-4
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ mod c_char_definition {
144144
)
145145
),
146146
all(target_os = "fuchsia", target_arch = "aarch64"),
147-
all(
148-
target_os = "trusty",
149-
any(target_arch = "aarch64", target_arch = "arm")
150-
),
151147
target_os = "horizon"
152148
))] {
153149
pub type c_char = u8;

library/std/build.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ fn main() {
2121
|| target.contains("fuchsia")
2222
|| (target.contains("sgx") && target.contains("fortanix"))
2323
|| target.contains("hermit")
24-
|| target.contains("trusty")
2524
|| target.contains("l4re")
2625
|| target.contains("redox")
2726
|| target.contains("haiku")

library/std/src/sys/mod.rs

-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ cfg_if::cfg_if! {
3737
} else if #[cfg(target_os = "hermit")] {
3838
mod hermit;
3939
pub use self::hermit::*;
40-
} else if #[cfg(target_os = "trusty")] {
41-
mod trusty;
42-
pub use self::trusty::*;
4340
} else if #[cfg(target_os = "wasi")] {
4441
mod wasi;
4542
pub use self::wasi::*;

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

-42
This file was deleted.

library/std/src/sys/trusty/stdio.rs

-81
This file was deleted.

library/std/src/sys/trusty/thread_local_key.rs

-31
This file was deleted.

library/std/src/sys_common/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ cfg_if::cfg_if! {
4545
cfg_if::cfg_if! {
4646
if #[cfg(any(target_os = "l4re",
4747
target_os = "hermit",
48-
target_os = "trusty",
4948
feature = "restricted-std",
5049
all(target_family = "wasm", not(target_os = "emscripten")),
5150
all(target_vendor = "fortanix", target_env = "sgx")))] {

src/bootstrap/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &'static str, Option<&[&'static str]>)]
213213
(Some(Mode::Std), "backtrace_in_libstd", None),
214214
/* Extra values not defined in the built-in targets yet, but used in std */
215215
(Some(Mode::Std), "target_env", Some(&["libnx"])),
216-
// #[cfg(bootstrap)] trusty
217-
(Some(Mode::Std), "target_os", Some(&["trusty"])),
216+
// (Some(Mode::Std), "target_os", Some(&[])),
218217
(Some(Mode::Std), "target_arch", Some(&["asmjs", "spirv", "nvptx", "xtensa"])),
219218
/* Extra names used by dependencies */
220219
// FIXME: Used by serde_json, but we should not be triggering on external dependencies.

0 commit comments

Comments
 (0)