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.

Author: matthiaskrgr

library/std/build.rs

@@ -42,6 +42,7 @@ fn main() {
  || target_os == "fuchsia"
  || (target_vendor == "fortanix" && target_env == "sgx")
  || target_os == "hermit"
+ || target_os == "trusty"
  || target_os == "l4re"
  || target_os == "redox"
  || target_os == "haiku"

library/std/src/fs.rs

@@ -14,7 +14,8 @@
  target_os = "emscripten",
  target_os = "wasi",
  target_env = "sgx",
- target_os = "xous"
+ target_os = "xous",
+ target_os = "trusty",
 ))
 ))]
 mod tests;

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;

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;

library/std/src/os/fd/mod.rs

@@ -13,6 +13,7 @@ mod raw;
 mod owned;
 
 // Implementations for `AsRawFd` etc. for network types.
+#[cfg(not(target_os = "trusty"))]
 mod net;
 
 #[cfg(test)]

library/std/src/os/fd/owned.rs

@@ -4,12 +4,20 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 
 usesuper::raw::{AsRawFd,FromRawFd,IntoRawFd,RawFd};
+#[cfg(not(target_os = "trusty"))]
+usecrate::fs;
 usecrate::marker::PhantomData;
 usecrate::mem::ManuallyDrop;
-#[cfg(not(any(target_arch = "wasm32", target_env = "sgx", target_os = "hermit")))]
+#[cfg(not(any(
+ target_arch = "wasm32",
+ target_env = "sgx",
+ target_os = "hermit",
+ target_os = "trusty"
+)))]
 usecrate::sys::cvt;
+#[cfg(not(target_os = "trusty"))]
 usecrate::sys_common::{AsInner,FromInner,IntoInner};
-usecrate::{fmt,fs,io};
+usecrate::{fmt, io};
 
 typeValidRawFd = core::num::niche_types::NotAllOnes<RawFd>;
 
@@ -87,7 +95,7 @@ impl OwnedFd {
 implBorrowedFd<'_>{
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
-#[cfg(not(any(target_arch = "wasm32", target_os = "hermit")))]
+#[cfg(not(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty")))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pubfntry_clone_to_owned(&self) -> crate::io::Result<OwnedFd>{
 // We want to atomically duplicate this file descriptor and set the
@@ -110,7 +118,7 @@ impl BorrowedFd<'_> {
 
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
-#[cfg(any(target_arch = "wasm32", target_os = "hermit"))]
+#[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pubfntry_clone_to_owned(&self) -> crate::io::Result<OwnedFd>{
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
@@ -280,6 +288,7 @@ impl AsFd for OwnedFd {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implAsFdfor fs::File{
 #[inline]
 fnas_fd(&self) -> BorrowedFd<'_>{
@@ -288,6 +297,7 @@ impl AsFd for fs::File {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<fs::File>forOwnedFd{
 /// Takes ownership of a [`File`](fs::File)'s underlying file descriptor.
 #[inline]
@@ -297,6 +307,7 @@ impl From<fs::File> for OwnedFd {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<OwnedFd>for fs::File{
 /// Returns a [`File`](fs::File) that takes ownership of the given
 /// file descriptor.
@@ -307,6 +318,7 @@ impl From<OwnedFd> for fs::File {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implAsFdforcrate::net::TcpStream{
 #[inline]
 fnas_fd(&self) -> BorrowedFd<'_>{
@@ -315,6 +327,7 @@ impl AsFd for crate::net::TcpStream {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<crate::net::TcpStream>forOwnedFd{
 /// Takes ownership of a [`TcpStream`](crate::net::TcpStream)'s socket file descriptor.
 #[inline]
@@ -324,6 +337,7 @@ impl From<crate::net::TcpStream> for OwnedFd {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<OwnedFd>forcrate::net::TcpStream{
 #[inline]
 fnfrom(owned_fd:OwnedFd) -> Self{
@@ -334,6 +348,7 @@ impl From<OwnedFd> for crate::net::TcpStream {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implAsFdforcrate::net::TcpListener{
 #[inline]
 fnas_fd(&self) -> BorrowedFd<'_>{
@@ -342,6 +357,7 @@ impl AsFd for crate::net::TcpListener {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<crate::net::TcpListener>forOwnedFd{
 /// Takes ownership of a [`TcpListener`](crate::net::TcpListener)'s socket file descriptor.
 #[inline]
@@ -351,6 +367,7 @@ impl From<crate::net::TcpListener> for OwnedFd {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<OwnedFd>forcrate::net::TcpListener{
 #[inline]
 fnfrom(owned_fd:OwnedFd) -> Self{
@@ -361,6 +378,7 @@ impl From<OwnedFd> for crate::net::TcpListener {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implAsFdforcrate::net::UdpSocket{
 #[inline]
 fnas_fd(&self) -> BorrowedFd<'_>{
@@ -369,6 +387,7 @@ impl AsFd for crate::net::UdpSocket {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<crate::net::UdpSocket>forOwnedFd{
 /// Takes ownership of a [`UdpSocket`](crate::net::UdpSocket)'s file descriptor.
 #[inline]
@@ -378,6 +397,7 @@ impl From<crate::net::UdpSocket> for OwnedFd {
 }
 
 #[stable(feature = "io_safety", since = "1.63.0")]
+#[cfg(not(target_os = "trusty"))]
 implFrom<OwnedFd>forcrate::net::UdpSocket{
 #[inline]
 fnfrom(owned_fd:OwnedFd) -> Self{

library/std/src/os/fd/raw.rs

@@ -5,6 +5,9 @@
 #[cfg(target_os = "hermit")]
 use hermit_abi as libc;
 
+#[cfg(not(target_os = "trusty"))]
+usecrate::fs;
+usecrate::io;
 #[cfg(target_os = "hermit")]
 usecrate::os::hermit::io::OwnedFd;
 #[cfg(not(target_os = "hermit"))]
@@ -15,8 +18,8 @@ use crate::os::unix::io::AsFd;
 usecrate::os::unix::io::OwnedFd;
 #[cfg(target_os = "wasi")]
 usecrate::os::wasi::io::OwnedFd;
+#[cfg(not(target_os = "trusty"))]
 usecrate::sys_common::{AsInner,IntoInner};
-usecrate::{fs, io};
 
 /// Raw file descriptors.
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -161,20 +164,23 @@ impl FromRawFd for RawFd {
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
+#[cfg(not(target_os = "trusty"))]
 implAsRawFdfor fs::File{
 #[inline]
 fnas_raw_fd(&self) -> RawFd{
 self.as_inner().as_raw_fd()
 }
 }
 #[stable(feature = "from_raw_os", since = "1.1.0")]
+#[cfg(not(target_os = "trusty"))]
 implFromRawFdfor fs::File{
 #[inline]
 unsafefnfrom_raw_fd(fd:RawFd) -> fs::File{
 unsafe{ fs::File::from(OwnedFd::from_raw_fd(fd))}
 }
 }
 #[stable(feature = "into_raw_os", since = "1.4.0")]
+#[cfg(not(target_os = "trusty"))]
 implIntoRawFdfor fs::File{
 #[inline]
 fninto_raw_fd(self) -> RawFd{
@@ -183,6 +189,7 @@ impl IntoRawFd for fs::File {
 }
 
 #[stable(feature = "asraw_stdio", since = "1.21.0")]
+#[cfg(not(target_os = "trusty"))]
 implAsRawFdfor io::Stdin{
 #[inline]
 fnas_raw_fd(&self) -> RawFd{
@@ -207,6 +214,7 @@ impl AsRawFd for io::Stderr {
 }
 
 #[stable(feature = "asraw_stdio_locks", since = "1.35.0")]
+#[cfg(not(target_os = "trusty"))]
 impl<'a>AsRawFdfor io::StdinLock<'a>{
 #[inline]
 fnas_raw_fd(&self) -> RawFd{

library/std/src/os/mod.rs

@@ -169,6 +169,8 @@ pub mod rtems;
 pubmod solaris;
 #[cfg(target_os = "solid_asp3")]
 pubmod solid;
+#[cfg(target_os = "trusty")]
+pubmod trusty;
 #[cfg(target_os = "uefi")]
 pubmod uefi;
 #[cfg(target_os = "vita")]
@@ -178,7 +180,7 @@ pub mod vxworks;
 #[cfg(target_os = "xous")]
 pubmod xous;
 
-#[cfg(any(unix, target_os = "hermit", target_os = "wasi", doc))]
+#[cfg(any(unix, target_os = "hermit", target_os = "trusty", target_os = "wasi", doc))]
 pubmod fd;
 
 #[cfg(any(target_os = "linux", target_os = "android", doc))]

library/std/src/os/trusty/io/mod.rs

@@ -0,0 +1,4 @@
+#![stable(feature = "os_fd", since = "1.66.0")]
+
+#[stable(feature = "os_fd", since = "1.66.0")]
+pubusecrate::os::fd::*;

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

@@ -0,0 +1,3 @@
+#![stable(feature = "rust1", since = "1.0.0")]
+
+pubmod io;