diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:53:32 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:53:32 +0000 |
| commit | ce92079a280d9e683f6bca3df549d1120cda0c84 (patch) | |
| tree | c252d96408967ba77ab33ee5c6a743833bd1dea1 | |
| parent | 030469406797b0a5de3899a4ac0290c306d6e924 (diff) | |
| parent | 655aa7a62ef9d7455aba7e4563a0d967ce72a1fc (diff) | |
| download | libc-ce92079a280d9e683f6bca3df549d1120cda0c84.tar.gz | |
Snap for 11400057 from 655aa7a62ef9d7455aba7e4563a0d967ce72a1fc to simpleperf-release
Change-Id: Iead11496b99a2fe81070b6abd202d5e0fcf3316c
| -rw-r--r-- | patches/rules.mk.diff | 11 | ||||
| -rw-r--r-- | patches/trusty.patch | 9 | ||||
| -rw-r--r-- | rules.mk | 4 | ||||
| -rw-r--r-- | src/trusty.rs | 5 |
4 files changed, 19 insertions, 10 deletions
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff index c3310b80..d44c11fe 100644 --- a/patches/rules.mk.diff +++ b/patches/rules.mk.diff @@ -2,16 +2,15 @@ diff --git a/rules.mk b/rules.mk index 92f34db68..08cf2d6c3 100644 --- a/rules.mk +++ b/rules.mk -@@ -24,8 +24,12 @@ MODULE_RUSTFLAGS += \ +@@ -24,5 +24,12 @@ --cfg 'libc_ptr_addr_of' \ --cfg 'libc_underscore_const_names' \ --cfg 'libc_union' \ + -A unknown-lints \ - - MODULE_LIBRARY_DEPS := \ - external/rust/crates/rustc-std-workspace-core \ ++ ++MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/libcompiler_builtins-rust \ + trusty/user/base/lib/libcore-rust \ + trusty/user/base/lib/libc-trusty \ - - include make/library.mk ++ trusty/user/base/lib/trusty-sys \ + diff --git a/patches/trusty.patch b/patches/trusty.patch index d73429be..77de58ca 100644 --- a/patches/trusty.patch +++ b/patches/trusty.patch @@ -2,7 +2,7 @@ diff --git b/src/lib.rs a/src/lib.rs index 62748d279..4d8822ec2 100644 --- b/src/lib.rs +++ a/src/lib.rs -@@ -143,6 +143,12 @@ cfg_if! { +@@ -145,6 +145,12 @@ cfg_if! { mod teeos; pub use teeos::*; @@ -20,9 +20,14 @@ new file mode 100644 index 000000000..140fa6dfe --- /dev/null +++ a/src/trusty.rs -@@ -0,0 +1,80 @@ +@@ -0,0 +1,85 @@ ++extern crate trusty_sys; ++ +pub use core::ffi::c_void; + ++pub const PROT_READ: i32 = self::trusty_sys::MMAP_FLAG_PROT_READ as i32; ++pub const PROT_WRITE: i32 = self::trusty_sys::MMAP_FLAG_PROT_WRITE as i32; ++ +pub type size_t = usize; +pub type ssize_t = isize; + @@ -1,4 +1,4 @@ -# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json. +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features .. # Do not modify this file as changes will be overridden on upgrade. LOCAL_DIR := $(GET_LOCAL_DIR) @@ -27,9 +27,9 @@ MODULE_RUSTFLAGS += \ -A unknown-lints \ MODULE_LIBRARY_DEPS := \ - external/rust/crates/rustc-std-workspace-core \ trusty/user/base/lib/libcompiler_builtins-rust \ trusty/user/base/lib/libcore-rust \ trusty/user/base/lib/libc-trusty \ + trusty/user/base/lib/trusty-sys \ include make/library.mk diff --git a/src/trusty.rs b/src/trusty.rs index 140fa6df..eca27bf7 100644 --- a/src/trusty.rs +++ b/src/trusty.rs @@ -1,5 +1,10 @@ +extern crate trusty_sys; + pub use core::ffi::c_void; +pub const PROT_READ: i32 = self::trusty_sys::MMAP_FLAG_PROT_READ as i32; +pub const PROT_WRITE: i32 = self::trusty_sys::MMAP_FLAG_PROT_WRITE as i32; + pub type size_t = usize; pub type ssize_t = isize; |