From 1686bfabf5dce46c74c04c28efecf4488d674536 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 26 Nov 2013 20:23:56 -0800 Subject: Use the native tls implementation on android Turns out android doesn't support LLVM's thread_local attribute and accompanying implementation. Closes #10686 --- src/libstd/rt/mod.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/libstd/rt/mod.rs') diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 79b7dbf2aab..0c69315b27d 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -95,11 +95,9 @@ pub use self::kill::BlockedTask; pub mod shouldnt_be_public { pub use super::select::SelectInner; pub use super::select::{SelectInner, SelectPortInner}; - #[cfg(stage0)] - #[cfg(windows)] - pub use super::local_ptr::maybe_tls_key; - #[cfg(not(stage0), not(windows))] - pub use super::local_ptr::RT_TLS_PTR; + pub use super::local_ptr::native::maybe_tls_key; + #[cfg(not(stage0), not(windows), not(target_os = "android"))] + pub use super::local_ptr::compiled::RT_TLS_PTR; } // Internal macros used by the runtime. -- cgit 1.4.1-3-g733a5