Skip to content

Commit

Permalink
Unrolled build for rust-lang#116500
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#116500 - simlay:tvos-support-for-register_dtor, r=workingjubilee

Add tvOS to target_os for register_dtor

Closes rust-lang#116491.
  • Loading branch information
rust-timer authored Oct 7, 2023
2 parents 8fdb0a9 + 3abef68 commit 04ad778
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/std/src/sys/unix/thread_local_dtor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
// workaround below is to register, via _tlv_atexit, a custom DTOR list once per
// thread. thread_local dtors are pushed to the DTOR list without calling
// _tlv_atexit.
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))]
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos", target_os = "tvos"))]
pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
use crate::cell::Cell;
use crate::mem;
Expand Down

0 comments on commit 04ad778

Please sign in to comment.