Merge "Update Trusty support patch" am: 814b17b am: e8f5819

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2124573

Change-Id: I1717b41a187b64316ebe7058e9417cdfbb6a0a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Author: Treehugger Robot

patches/std.diff

@@ -1,12 +1,13 @@
 Index: libc/src/lib.rs
 ===================================================================
---- libc.orig/src/lib.rs
-+++ libc/src/lib.rs
-@@ -30,6 +30,9 @@
- #![cfg_attr(target_os = "redox", feature(static_nobundle))]
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -30,6 +30,10 @@
+ )]
  #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))]
 
 +// ANDROID: Use std to allow building as a dylib.
++#[cfg(android_dylib)]
 +extern crate std;
 +
  #[macro_use]

patches/trusty.patch

@@ -1,19 +1,19 @@
-From dc028fa4f316bec221c9b59d02a1c2648bb1cbbd Mon Sep 17 00:00:00 2001
+From e8131d6a00005b4686f26d25d8617dd83540e98d Mon Sep 17 00:00:00 2001
 From: David LeGare <legare@google.com>
-Date: Mon, 23 May 2022 17:58:51 +0000
+Date: Mon, 13 Jun 2022 22:23:23 +0000
 Subject: [PATCH] Add support for the Trusty OS
 
 ---
  src/lib.rs    |  6 ++++++
- src/trusty.rs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 52 insertions(+)
+ src/trusty.rs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 66 insertions(+)
  create mode 100644 src/trusty.rs
 
 diff --git a/src/lib.rs b/src/lib.rs
-index d87d0d8e1..2eeb88c83 100644
+index cce80f8c..a7eddaf2 100644
 --- a/src/lib.rs
 +++ b/src/lib.rs
-@@ -141,6 +141,12 @@ cfg_if! {
+@@ -144,6 +144,12 @@ cfg_if! {
 
          mod hermit;
          pub use hermit::*;
@@ -28,13 +28,14 @@ index d87d0d8e1..2eeb88c83 100644
          pub use fixed_width_ints::*;
 diff --git a/src/trusty.rs b/src/trusty.rs
 new file mode 100644
-index 000000000..2b7d57285
+index 00000000..f06c0760
 --- /dev/null
 +++ b/src/trusty.rs
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,60 @@
 +pub use core::ffi::c_void;
 +
 +pub type size_t = usize;
++pub type ssize_t = isize;
 +
 +#[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
 +pub type c_char = u8;
@@ -71,13 +72,25 @@ index 000000000..2b7d57285
 +pub type c_int32_t = i32;
 +pub type c_int64_t = i64;
 +
++pub const STDOUT_FILENO: ::c_int = 1;
++pub const STDERR_FILENO: ::c_int = 2;
++
 +extern "C" {
 +    pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
 +    pub fn malloc(size: size_t) -> *mut c_void;
 +    pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
 +    pub fn free(p: *mut c_void);
++    pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
 +    pub fn posix_memalign(memptr: *mut *mut ::c_void, align: ::size_t, size: ::size_t) -> ::c_int;
++    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t) -> ::ssize_t;
++    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
++}
++
++s! {
++    pub struct iovec {
++        pub iov_base: *mut ::c_void,
++        pub iov_len: ::size_t,
++    }
 +}
 -- 
-2.36.1.124.g0e6072fb45-goog
-
+2.36.1.476.g0c4daa206d-goog

src/lib.rs

@@ -31,6 +31,7 @@
 #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))]
 
 // ANDROID: Use std to allow building as a dylib.
+#[cfg(android_dylib)]
 extern crate std;
 
 #[macro_use]

src/trusty.rs

@@ -1,6 +1,7 @@
 pub use core::ffi::c_void;
 
 pub type size_t = usize;
+pub type ssize_t = isize;
 
 #[cfg(any(target_arch = "aarch64", target_arch = "arm"))]
 pub type c_char = u8;
@@ -37,10 +38,23 @@ pub type c_int16_t = i16;
 pub type c_int32_t = i32;
 pub type c_int64_t = i64;
 
+pub const STDOUT_FILENO: ::c_int = 1;
+pub const STDERR_FILENO: ::c_int = 2;
+
 extern "C" {
     pub fn calloc(nobj: size_t, size: size_t) -> *mut c_void;
     pub fn malloc(size: size_t) -> *mut c_void;
     pub fn realloc(p: *mut c_void, size: size_t) -> *mut c_void;
     pub fn free(p: *mut c_void);
+    pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
     pub fn posix_memalign(memptr: *mut *mut ::c_void, align: ::size_t, size: ::size_t) -> ::c_int;
+    pub fn write(fd: ::c_int, buf: *const ::c_void, count: ::size_t) -> ::ssize_t;
+    pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
+}
+
+s! {
+    pub struct iovec {
+        pub iov_base: *mut ::c_void,
+        pub iov_len: ::size_t,
+    }
 }