diff options
| author | Nadrieril <Nadrieril@users.noreply.github.com> | 2024-01-31 12:10:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 12:10:51 +0100 |
| commit | a7d5382e5c2a4cabca29667b246d9dfa6164ba85 (patch) | |
| tree | 74bcd4f3b2e3db673940649ca045b2f396d88794 /library/std/src/sys | |
| parent | 03daaa6f0777dc703c5aea9868b42762c96b90a6 (diff) | |
| parent | 4c010259ef3c9eec239f5006dfdeffc73548cf07 (diff) | |
| download | rust-a7d5382e5c2a4cabca29667b246d9dfa6164ba85.tar.gz rust-a7d5382e5c2a4cabca29667b246d9dfa6164ba85.zip | |
Rollup merge of #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 #120413
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/pal/unix/thread_local_dtor.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/unix/thread_local_dtor.rs b/library/std/src/sys/pal/unix/thread_local_dtor.rs index 7e19e6eb9eb..4bf8f20670d 100644 --- a/library/std/src/sys/pal/unix/thread_local_dtor.rs +++ b/library/std/src/sys/pal/unix/thread_local_dtor.rs @@ -18,7 +18,6 @@ target_os = "fuchsia", target_os = "redox", target_os = "hurd", - target_os = "freebsd", target_os = "netbsd", target_os = "dragonfly" ))] @@ -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)) { |