Skip to content

Commit 059fc0b

Browse files
authored
Unrolled build for rust-lang#120430
Rollup merge of rust-lang#120430 - devnexen:fix_tls_dtor_fbsd, r=cuviper std: thread_local::register_dtor fix proposal for FreeBSD. following-up 5d3d347 commit, rust started to spin __cxa_thread_call_dtors warnings even without any TLS usage. using instead home made TLS destructor handler `register_dtor_fallback`. close rust-lang#120413
2 parents cdaa12e + 4c01025 commit 059fc0b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

library/std/src/sys/pal/unix/thread_local_dtor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
target_os = "fuchsia",
1919
target_os = "redox",
2020
target_os = "hurd",
21-
target_os = "freebsd",
2221
target_os = "netbsd",
2322
target_os = "dragonfly"
2423
))]
@@ -118,7 +117,8 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
118117
target_os = "vxworks",
119118
target_os = "horizon",
120119
target_os = "emscripten",
121-
target_os = "aix"
120+
target_os = "aix",
121+
target_os = "freebsd",
122122
))]
123123
#[cfg_attr(target_family = "wasm", allow(unused))] // might remain unused depending on target details (e.g. wasm32-unknown-emscripten)
124124
pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {

0 commit comments

Comments
 (0)