diff options
| author | bors <bors@rust-lang.org> | 2015-07-02 18:50:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-02 18:50:46 +0000 |
| commit | fb379ef05cfdf5c61ec992c578682814c990b264 (patch) | |
| tree | 7e46588e484bec1db390c3fb45a7898172b3e693 /src/libstd/thread | |
| parent | 68094818969b295a043963ad59c502928f66239f (diff) | |
| parent | 0b7c4f57f6ba59dabe4db2808fe45e8bd8bbce22 (diff) | |
| download | rust-fb379ef05cfdf5c61ec992c578682814c990b264.tar.gz rust-fb379ef05cfdf5c61ec992c578682814c990b264.zip | |
Auto merge of #26682 - posix4e:netbsd, r=alexcrichton
This is dependent on https://github.com/rust-lang/rust-installer/pull/38. Once it is merged we most likely need to update the commit.
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/scoped_tls.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/thread/scoped_tls.rs b/src/libstd/thread/scoped_tls.rs index 679902ec7ab..c2fad0aa89c 100644 --- a/src/libstd/thread/scoped_tls.rs +++ b/src/libstd/thread/scoped_tls.rs @@ -104,6 +104,7 @@ macro_rules! __scoped_thread_local_inner { #[cfg_attr(not(any(windows, target_os = "android", target_os = "ios", + target_os = "netbsd", target_os = "openbsd", target_arch = "aarch64")), thread_local)] @@ -215,6 +216,7 @@ impl<T> ScopedKey<T> { #[cfg(not(any(windows, target_os = "android", target_os = "ios", + target_os = "netbsd", target_os = "openbsd", target_arch = "aarch64", no_elf_tls)))] @@ -238,6 +240,7 @@ mod imp { #[cfg(any(windows, target_os = "android", target_os = "ios", + target_os = "netbsd", target_os = "openbsd", target_arch = "aarch64", no_elf_tls))] |