squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

std: Fix compiling the standard library on i686-MSVC

Browse source 
This commit fixes building the standard library with the `i686-pc-windows-msvc`
target by correcting an included symbol name to the linker.
This commit is contained in:
Alex Crichton 2015-07-20 16:12:48 -07:00
parent 7cb157e74d
commit 24c5e49275
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstd/sys/windows/thread_local.rs
View file

@ -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,