Auto merge of #27172 - alexcrichton:snapshots, r=brson

Enables bootstrapping a 32-bit MSVC host compiler! Closes #26602
2015-07-22 00:29:08 +00:00
parent 39a780dcbe 24c5e49275
commit d33cab1b1f
6 changed files with 12 additions and 32 deletions
--- 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,