Revert libstd support for Trusty

rust-lang · Jan 31, 2023 · f197145 · f197145
1 parent dcd0c58
commit f197145
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 167 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -115,7 +115,5 @@ rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
 
-libc = { git = "https://github.com/randomPoison/libc.git", rev = "7ccd2753aa1e26301c73bdb6f9e2df8085ac39e6" }
-
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
diff --git a/library/core/src/ffi/mod.rs b/library/core/src/ffi/mod.rs
@@ -144,10 +144,6 @@ mod c_char_definition {
                 )
             ),
             all(target_os = "fuchsia", target_arch = "aarch64"),
-            all(
-                target_os = "trusty",
-                any(target_arch = "aarch64", target_arch = "arm")
-            ),
             target_os = "horizon"
         ))] {
             pub type c_char = u8;

diff --git a/library/std/build.rs b/library/std/build.rs
@@ -21,7 +21,6 @@ fn main() {
         || target.contains("fuchsia")
         || (target.contains("sgx") && target.contains("fortanix"))
         || target.contains("hermit")
-        || target.contains("trusty")
         || target.contains("l4re")
         || target.contains("redox")
         || target.contains("haiku")

diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs
@@ -37,9 +37,6 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "hermit")] {
         mod hermit;
         pub use self::hermit::*;
-    } else if #[cfg(target_os = "trusty")] {
-        mod trusty;
-        pub use self::trusty::*;
     } else if #[cfg(target_os = "wasi")] {
         mod wasi;
         pub use self::wasi::*;

diff --git a/library/std/src/sys/trusty/mod.rs b/library/std/src/sys/trusty/mod.rs
diff --git a/library/std/src/sys/trusty/stdio.rs b/library/std/src/sys/trusty/stdio.rs
diff --git a/library/std/src/sys/trusty/thread_local_key.rs b/library/std/src/sys/trusty/thread_local_key.rs
diff --git a/library/std/src/sys_common/mod.rs b/library/std/src/sys_common/mod.rs
@@ -45,7 +45,6 @@ cfg_if::cfg_if! {
 cfg_if::cfg_if! {
     if #[cfg(any(target_os = "l4re",
                  target_os = "hermit",
-                 target_os = "trusty",
                  feature = "restricted-std",
                  all(target_family = "wasm", not(target_os = "emscripten")),
                  all(target_vendor = "fortanix", target_env = "sgx")))] {

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -213,8 +213,7 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &'static str, Option<&[&'static str]>)]
     (Some(Mode::Std), "backtrace_in_libstd", None),
     /* Extra values not defined in the built-in targets yet, but used in std */
     (Some(Mode::Std), "target_env", Some(&["libnx"])),
-    // #[cfg(bootstrap)] trusty
-    (Some(Mode::Std), "target_os", Some(&["trusty"])),
+    // (Some(Mode::Std), "target_os", Some(&[])),
     (Some(Mode::Std), "target_arch", Some(&["asmjs", "spirv", "nvptx", "xtensa"])),
     /* Extra names used by dependencies */
     // FIXME: Used by serde_json, but we should not be triggering on external dependencies.