Skip to content

Commit

Permalink
Rollup merge of #120430 - devnexen:fix_tls_dtor_fbsd, r=cuviper
Browse files Browse the repository at this point in the history
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 #120413
  • Loading branch information
Nadrieril authored Jan 31, 2024
2 parents 03daaa6 + 4c01025 commit a7d5382
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions library/std/src/sys/pal/unix/thread_local_dtor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
target_os = "fuchsia",
target_os = "redox",
target_os = "hurd",
target_os = "freebsd",
target_os = "netbsd",
target_os = "dragonfly"
))]
Expand Down Expand Up @@ -118,7 +117,8 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
target_os = "vxworks",
target_os = "horizon",
target_os = "emscripten",
target_os = "aix"
target_os = "aix",
target_os = "freebsd",
))]
#[cfg_attr(target_family = "wasm", allow(unused))] // might remain unused depending on target details (e.g. wasm32-unknown-emscripten)
pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern "C" fn(*mut u8)) {
Expand Down

0 comments on commit a7d5382

Please sign in to comment.