about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorTaylor Cramer <cramertj@google.com>2018-07-11 18:11:53 -0700
committerTaylor Cramer <cramertj@google.com>2018-07-11 18:11:53 -0700
commita6fa656555583524d3c4e6cde702e1b63578cc44 (patch)
treebcc8475b5e9d8eb5768f7c828dc6341f74a21ac4 /src/libstd/sys
parent704af2d7e1474ba60a0b70a5aa78e29905abb4e1 (diff)
downloadrust-a6fa656555583524d3c4e6cde702e1b63578cc44.tar.gz
rust-a6fa656555583524d3c4e6cde702e1b63578cc44.zip
Use fast TLS on Fuchsia
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/unix/fast_thread_local.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstd/sys/unix/fast_thread_local.rs b/src/libstd/sys/unix/fast_thread_local.rs
index 6cdbe5df75d..d59d800a579 100644
--- a/src/libstd/sys/unix/fast_thread_local.rs
+++ b/src/libstd/sys/unix/fast_thread_local.rs
@@ -20,7 +20,7 @@
 // fallback implementation to use as well.
 //
 // Due to rust-lang/rust#18804, make sure this is not generic!
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "fuchsia"))]
 pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) {
     use libc;
     use mem;
@@ -55,11 +55,6 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) {
     _tlv_atexit(dtor, t);
 }
 
-// Just use the thread_local fallback implementation, at least until there's
-// a more direct implementation.
-#[cfg(target_os = "fuchsia")]
-pub use sys_common::thread_local::register_dtor_fallback as register_dtor;
-
 pub fn requires_move_before_drop() -> bool {
     // The macOS implementation of TLS apparently had an odd aspect to it
     // where the pointer we have may be overwritten while this destructor