diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-11-26 20:23:56 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-11-27 11:56:43 -0800 |
| commit | 1686bfabf5dce46c74c04c28efecf4488d674536 (patch) | |
| tree | 5c19e105720ed31a845910176fae274c90c8cd34 /src/libstd/rt/mod.rs | |
| parent | e4136bd552bc7bf2b83ceb5d114f9a254bfa2b01 (diff) | |
| download | rust-1686bfabf5dce46c74c04c28efecf4488d674536.tar.gz rust-1686bfabf5dce46c74c04c28efecf4488d674536.zip | |
Use the native tls implementation on android
Turns out android doesn't support LLVM's thread_local attribute and accompanying implementation. Closes #10686
Diffstat (limited to 'src/libstd/rt/mod.rs')
| -rw-r--r-- | src/libstd/rt/mod.rs | 8 |
1 files changed, 3 insertions, 5 deletions
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. |