Auto merge of #1477 - RalfJung:rustup, r=RalfJung

rustup; fix Windows TLS

rust-version

@@ -1 +1 @@
-8ac1525e091d3db28e67adcbbd6db1e1deaa37fb
+567ad7455d5f25f6b38d2fded1cb621e0c34a48b

src/shims/tls.rs

@@ -236,7 +236,7 @@ fn schedule_windows_tls_dtors(&mut self) -> InterpResult<'tcx> {
         // (that would be basically https://github.com/rust-lang/miri/issues/450),
         // we specifically look up the static in libstd that we know is placed
         // in that section.
-        let thread_callback = this.eval_path_scalar(&["std", "sys", "windows", "thread_local", "p_thread_callback"])?;
+        let thread_callback = this.eval_path_scalar(&["std", "sys", "windows", "thread_local_key", "p_thread_callback"])?;
         let thread_callback = this.memory.get_fn(thread_callback.not_undef()?)?.as_instance()?;
 
         // The signature of this function is `unsafe extern "system" fn(h: c::LPVOID, dwReason: c::DWORD, pv: c::LPVOID)`.