diff options
| author | bors <bors@rust-lang.org> | 2015-07-22 00:29:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-22 00:29:08 +0000 |
| commit | d33cab1b1fa4943a4bf37baa8c7421e672df10c7 (patch) | |
| tree | bd623d33a0795fcfeda8e8de7ea5135120714013 /src/libstd | |
| parent | 39a780dcbe5f64a1fa51a5a36e2acdf41b04671f (diff) | |
| parent | 24c5e492751489280f446f4efff1740a6c3e5aa1 (diff) | |
| download | rust-d33cab1b1fa4943a4bf37baa8c7421e672df10c7.tar.gz rust-d33cab1b1fa4943a4bf37baa8c7421e672df10c7.zip | |
Auto merge of #27172 - alexcrichton:snapshots, r=brson
Enables bootstrapping a 32-bit MSVC host compiler! Closes #26602
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index a2dbb0f8342..7550b7ce6c3 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -231,9 +231,12 @@ pub static p_thread_callback: unsafe extern "system" fn(LPVOID, DWORD, LPVOID) = on_tls_callback; -#[cfg(target_env = "msvc")] +#[cfg(all(target_env = "msvc", target_pointer_width = "64"))] #[link_args = "/INCLUDE:_tls_used"] extern {} +#[cfg(all(target_env = "msvc", target_pointer_width = "32"))] +#[link_args = "/INCLUDE:__tls_used"] +extern {} #[allow(warnings)] unsafe extern "system" fn on_tls_callback(h: LPVOID, |