about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2023-10-06 16:37:48 -0700
committerGitHub <noreply@github.com>2023-10-06 16:37:48 -0700
commit4b102b0d8d8212bd2aca7ddd9ff8f699844e37c3 (patch)
treea1d87189b3107683b145a7d98ba44934488a68a0
parent5268120d4a10a879b0fe8aae0ffa9443b3e45266 (diff)
parent3abef68e63e12a1c6af2e09c2f020f778d2892ee (diff)
downloadrust-4b102b0d8d8212bd2aca7ddd9ff8f699844e37c3.tar.gz
rust-4b102b0d8d8212bd2aca7ddd9ff8f699844e37c3.zip
Rollup merge of #116500 - simlay:tvos-support-for-register_dtor, r=workingjubilee
Add tvOS to target_os for register_dtor

Closes #116491.
-rw-r--r--library/std/src/sys/unix/thread_local_dtor.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/unix/thread_local_dtor.rs b/library/std/src/sys/unix/thread_local_dtor.rs
index e9d19766592..4a732a2cabd 100644
--- a/library/std/src/sys/unix/thread_local_dtor.rs
+++ b/library/std/src/sys/unix/thread_local_dtor.rs
@@ -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;