From ce5ed69eac64dc581debf39c0ec4322126ff55f0 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 15 Jul 2020 08:42:15 +0200
Subject: [PATCH] rustup; fix Windows TLS

---
 rust-version     | 2 +-
 src/shims/tls.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-version b/rust-version
index f1a465c7d624..c8c4d489e1d6 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-8ac1525e091d3db28e67adcbbd6db1e1deaa37fb
+567ad7455d5f25f6b38d2fded1cb621e0c34a48b
diff --git a/src/shims/tls.rs b/src/shims/tls.rs
index 0cd9ef056505..d2d5522c4023 100644
--- a/src/shims/tls.rs
+++ b/src/shims/tls.rs
@@ -236,7 +236,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, '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)`.