Rollup merge of #128005 - ChrisDenton:msvc-include, r=joboet · model-checking/verify-rust-std@d7770e9 (original) (raw)

File tree

1 file changed

lines changed

1 file changed

lines changed

Original file line number Diff line number Diff line change
@@ -78,19 +78,6 @@ pub fn enable() {
78 78 pub static CALLBACK: unsafe extern "system" fn(*mut c_void, u32, *mut c_void) = tls_callback;
79 79
80 80 unsafe extern "system" fn tls_callback(_h: *mut c_void, dw_reason: u32, _pv: *mut c_void) {
81 -// See comments above for what this is doing. Note that we don't need this
82 -// trickery on GNU windows, just on MSVC.
83 -#[cfg(all(target_env = "msvc", not(target_thread_local)))]
84 -{
85 -extern "C" {
86 -static _tls_used: u8;
87 -}
88 -
89 -unsafe {
90 - ptr::from_ref(&_tls_used).read_volatile();
91 -}
92 -}
93 -
94 81 if dw_reason == c::DLL_THREAD_DETACH |
95 82 #[cfg(target_thread_local)]
96 83 unsafe {