From 92b72222541a86adbadf6661cccc854f9e9cdb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marie?= Date: Wed, 11 Feb 2015 13:36:44 +0100 Subject: [PATCH] openbsd don't support TLS --- src/libstd/thread_local/scoped.rs | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/libstd/thread_local/scoped.rs b/src/libstd/thread_local/scoped.rs index 1a20612d60a8..01220e7bc1fe 100644 --- a/src/libstd/thread_local/scoped.rs +++ b/src/libstd/thread_local/scoped.rs @@ -81,6 +81,7 @@ macro_rules! __scoped_thread_local_inner { #[cfg_attr(not(any(windows, target_os = "android", target_os = "ios", + target_os = "openbsd", target_arch = "aarch64")), thread_local)] static $name: ::std::thread_local::scoped::Key<$t> = @@ -90,6 +91,7 @@ macro_rules! __scoped_thread_local_inner { #[cfg_attr(not(any(windows, target_os = "android", target_os = "ios", + target_os = "openbsd", target_arch = "aarch64")), thread_local)] pub static $name: ::std::thread_local::scoped::Key<$t> = @@ -98,14 +100,22 @@ macro_rules! __scoped_thread_local_inner { ($t:ty) => ({ use std::thread_local::scoped::Key as __Key; - #[cfg(not(any(windows, target_os = "android", target_os = "ios", target_arch = "aarch64")))] + #[cfg(not(any(windows, + target_os = "android", + target_os = "ios", + target_os = "openbsd", + target_arch = "aarch64")))] const _INIT: __Key<$t> = __Key { inner: ::std::thread_local::scoped::__impl::KeyInner { inner: ::std::cell::UnsafeCell { value: 0 as *mut _ }, } }; - #[cfg(any(windows, target_os = "android", target_os = "ios", target_arch = "aarch64"))] + #[cfg(any(windows, + target_os = "android", + target_os = "ios", + target_os = "openbsd", + target_arch = "aarch64"))] const _INIT: __Key<$t> = __Key { inner: ::std::thread_local::scoped::__impl::KeyInner { inner: ::std::thread_local::scoped::__impl::OS_INIT, @@ -205,7 +215,11 @@ impl Key { } } -#[cfg(not(any(windows, target_os = "android", target_os = "ios", target_arch = "aarch64")))] +#[cfg(not(any(windows, + target_os = "android", + target_os = "ios", + target_os = "openbsd", + target_arch = "aarch64")))] mod imp { use std::cell::UnsafeCell; @@ -223,7 +237,11 @@ mod imp { } } -#[cfg(any(windows, target_os = "android", target_os = "ios", target_arch = "aarch64"))] +#[cfg(any(windows, + target_os = "android", + target_os = "ios", + target_os = "openbsd", + target_arch = "aarch64"))] mod imp { use marker; use sys_common::thread_local::StaticKey as OsStaticKey;