Skip to content

Commit 2264cba

Browse files
committed
Auto merge of #3105 - devnexen:macos_stack_np, r=JohnTitor
apple add pthread_stack_frame_decode_np
2 parents 334425e + ef31c8b commit 2264cba

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

libc-test/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ fn test_apple(target: &str) {
240240
"pthread.h",
241241
"pthread_spis.h",
242242
"pthread/introspection.h",
243+
"pthread/stack_np.h",
243244
"pwd.h",
244245
"regex.h",
245246
"resolv.h",

libc-test/semver/apple.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,12 +2095,13 @@ pthread_get_stackaddr_np
20952095
pthread_get_stacksize_np
20962096
pthread_getname_np
20972097
pthread_kill
2098+
pthread_main_np
20982099
pthread_mutexattr_getpshared
20992100
pthread_mutexattr_setpshared
21002101
pthread_rwlockattr_getpshared
21012102
pthread_rwlockattr_setpshared
21022103
pthread_setname_np
2103-
pthread_main_np
2104+
pthread_stack_frame_decode_np
21042105
ptrace
21052106
pututxline
21062107
pwritev

src/unix/bsd/apple/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5190,6 +5190,10 @@ extern "C" {
51905190
f: extern "C" fn(*mut ::c_void) -> *mut ::c_void,
51915191
value: *mut ::c_void,
51925192
) -> ::c_int;
5193+
pub fn pthread_stack_frame_decode_np(
5194+
frame_addr: ::uintptr_t,
5195+
return_addr: *mut ::uintptr_t,
5196+
) -> ::uintptr_t;
51935197
pub fn pthread_get_stackaddr_np(thread: ::pthread_t) -> *mut ::c_void;
51945198
pub fn pthread_get_stacksize_np(thread: ::pthread_t) -> ::size_t;
51955199
pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: ::c_int) -> ::c_int;

0 commit comments

Comments
 (0)