diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-03-13 10:58:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-13 10:58:17 +0100 |
| commit | a488cf8a70ded0be48928b7051b2277890f945ea (patch) | |
| tree | 18170f4941faed918ac650af88f3fd47b0f79c5b /library/std/src/net | |
| parent | b3ab69504aaa3cb0e91cafb3a0dd64c502915a32 (diff) | |
| parent | d3c55cd52b40ce2088122933bf3527670a42bd8a (diff) | |
Rollup merge of #136842 - randomPoison:trusty-libstd-v3, r=ChrisDenton
Add libstd support for Trusty targets This PR adds support for `alloc` and `std` for the Trusty targets based on the internal patches used in Android. The original patches can be seen [here](https://android.googlesource.com/toolchain/android_rust/+/refs/heads/main/patches/development/rustc-0023-Add-Trusty-OS-support-to-Rust-std.patch) and [here](https://android.googlesource.com/toolchain/android_rust/+/refs/heads/main/patches/development/rustc-0054-Add-std-os-fd-support-for-Trusty.patch). Please let me know if there's any additional context I need to add.
Diffstat (limited to 'library/std/src/net')
| -rw-r--r-- | library/std/src/net/tcp.rs | 3 | ||||
| -rw-r--r-- | library/std/src/net/udp.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/net/tcp.rs b/library/std/src/net/tcp.rs index 9b68f872955..6a951426407 100644 --- a/library/std/src/net/tcp.rs +++ b/library/std/src/net/tcp.rs @@ -5,7 +5,8 @@ not(any( target_os = "emscripten", all(target_os = "wasi", target_env = "p1"), - target_os = "xous" + target_os = "xous", + target_os = "trusty", )) ))] mod tests; diff --git a/library/std/src/net/udp.rs b/library/std/src/net/udp.rs index 3eb798ad34a..a97b3299774 100644 --- a/library/std/src/net/udp.rs +++ b/library/std/src/net/udp.rs @@ -4,7 +4,8 @@ target_os = "emscripten", all(target_os = "wasi", target_env = "p1"), target_env = "sgx", - target_os = "xous" + target_os = "xous", + target_os = "trusty", )) ))] mod tests; |