From 2b9472b5ab1a55e3d7397890e16661966fee340b Mon Sep 17 00:00:00 2001 From: lyinch Date: Thu, 17 Feb 2022 17:01:31 +0100 Subject: [PATCH 1/3] Add CLOCK_UPTIME_RAW symbol for macos aarch64 --- libc-test/semver/macos-aarch64.txt | 1 + src/unix/bsd/apple/b64/aarch64/mod.rs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/libc-test/semver/macos-aarch64.txt b/libc-test/semver/macos-aarch64.txt index 1a5fcd2ac3fe2..3de7734f380ed 100644 --- a/libc-test/semver/macos-aarch64.txt +++ b/libc-test/semver/macos-aarch64.txt @@ -1,3 +1,4 @@ __darwin_arm_exception_state64 __darwin_arm_neon_state64 __darwin_arm_thread_state64 +CLOCK_UPTIME_RAW \ No newline at end of file diff --git a/src/unix/bsd/apple/b64/aarch64/mod.rs b/src/unix/bsd/apple/b64/aarch64/mod.rs index 79e9ac842f9ca..98ae5ef1eabcb 100644 --- a/src/unix/bsd/apple/b64/aarch64/mod.rs +++ b/src/unix/bsd/apple/b64/aarch64/mod.rs @@ -1,5 +1,8 @@ pub type boolean_t = ::c_int; +pub const CLOCK_UPTIME_RAW: ::clockid_t = 8; + + s! { pub struct malloc_zone_t { __private: [::uintptr_t; 18], // FIXME: needs arm64 auth pointers support From 2db639b5d68979658048114bbe01afd2a5da433b Mon Sep 17 00:00:00 2001 From: lyinch Date: Thu, 17 Feb 2022 17:12:59 +0100 Subject: [PATCH 2/3] Fix linter issue --- src/unix/bsd/apple/b64/aarch64/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/unix/bsd/apple/b64/aarch64/mod.rs b/src/unix/bsd/apple/b64/aarch64/mod.rs index 98ae5ef1eabcb..0364b6cf430b9 100644 --- a/src/unix/bsd/apple/b64/aarch64/mod.rs +++ b/src/unix/bsd/apple/b64/aarch64/mod.rs @@ -2,7 +2,6 @@ pub type boolean_t = ::c_int; pub const CLOCK_UPTIME_RAW: ::clockid_t = 8; - s! { pub struct malloc_zone_t { __private: [::uintptr_t; 18], // FIXME: needs arm64 auth pointers support From 16214c4a1c559cfd02e033a3b42878ea2055a3a8 Mon Sep 17 00:00:00 2001 From: lyinch Date: Thu, 17 Feb 2022 17:46:27 +0100 Subject: [PATCH 3/3] Fix style issue --- src/unix/bsd/apple/b64/aarch64/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unix/bsd/apple/b64/aarch64/mod.rs b/src/unix/bsd/apple/b64/aarch64/mod.rs index 0364b6cf430b9..67f0f7032e9c0 100644 --- a/src/unix/bsd/apple/b64/aarch64/mod.rs +++ b/src/unix/bsd/apple/b64/aarch64/mod.rs @@ -1,13 +1,13 @@ pub type boolean_t = ::c_int; -pub const CLOCK_UPTIME_RAW: ::clockid_t = 8; - s! { pub struct malloc_zone_t { __private: [::uintptr_t; 18], // FIXME: needs arm64 auth pointers support } } +pub const CLOCK_UPTIME_RAW: ::clockid_t = 8; + cfg_if! { if #[cfg(libc_align)] { mod align;