Skip to content

Commit 249c9ee

Browse files
committed
Auto merge of rust-lang#116501 - workingjubilee:rollup-fpzov6m, r=workingjubilee
Rollup of 4 pull requests Successful merges: - rust-lang#116277 (dont call mir.post_mono_checks in codegen) - rust-lang#116400 (Detect missing `=>` after match guard during parsing) - rust-lang#116458 (Properly export function defined in test which uses global_asm!()) - rust-lang#116500 (Add tvOS to target_os for register_dtor) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 113ef17 + ab1a442 commit 249c9ee

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

std/src/sys/unix/thread_local_dtor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
6767
// workaround below is to register, via _tlv_atexit, a custom DTOR list once per
6868
// thread. thread_local dtors are pushed to the DTOR list without calling
6969
// _tlv_atexit.
70-
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))]
70+
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos", target_os = "tvos"))]
7171
pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
7272
use crate::cell::Cell;
7373
use crate::mem;

0 commit comments

Comments
 (0)