about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKornel <kornel@geekhood.net>2025-02-17 21:17:05 +0000
committerKornel <kornel@geekhood.net>2025-02-17 22:10:25 +0000
commit40ecda6a33bdfb4ca66ecb5555473511a9b1b9f6 (patch)
treed248c59e8eebb57b7dcf062e3f2bfc72bf46b30d
parentce36a966c79e109dabeef7a47fe68e5294c6d71e (diff)
downloadrust-40ecda6a33bdfb4ca66ecb5555473511a9b1b9f6.tar.gz
rust-40ecda6a33bdfb4ca66ecb5555473511a9b1b9f6.zip
Remove obsolete MinGW ThinLTO+TLS workaround
#109797 is fixed
-rw-r--r--library/std/src/sys/thread_local/os.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/library/std/src/sys/thread_local/os.rs b/library/std/src/sys/thread_local/os.rs
index 00d2e30bd60..fe6af27db3a 100644
--- a/library/std/src/sys/thread_local/os.rs
+++ b/library/std/src/sys/thread_local/os.rs
@@ -28,9 +28,7 @@ pub macro thread_local_inner {
         // user provided type or type alias with a matching name. Please update the shadowing test
         // in `tests/thread.rs` if these types are renamed.
         unsafe {
-            // Inlining does not work on windows-gnu due to linking errors around
-            // dllimports. See https://github.com/rust-lang/rust/issues/109797.
-            $crate::thread::LocalKey::new(#[cfg_attr(windows, inline(never))] |init| {
+            $crate::thread::LocalKey::new(|init| {
                 static VAL: $crate::thread::local_impl::Storage<$t>
                     = $crate::thread::local_impl::Storage::new();
                 VAL.get(init, __init)