Skip to content

Commit f96442b

Browse files
committed
Auto merge of #123257 - ChrisDenton:enable-tls, r=fmease
Re-enable `has_thread_local` for i686-msvc A few years back, `has_thread_local` was disabled as a workaround for a compiler issue. While the exact cause was never tracked down, it was suspected to be caused by the compiler inlining a thread local access across a dylib boundary. This should be fixed now so let's try again.
2 parents 59c38c0 + 17176b8 commit f96442b

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ pub fn target() -> Target {
1818
"/SAFESEH",
1919
],
2020
);
21-
// Workaround for #95429
22-
base.has_thread_local = false;
2321

2422
Target {
2523
llvm_target: "i686-pc-windows-msvc".into(),

compiler/rustc_target/src/spec/targets/i686_win7_windows_msvc.rs

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ pub fn target() -> Target {
1818
"/SAFESEH",
1919
],
2020
);
21-
// Workaround for #95429
22-
base.has_thread_local = false;
2321

2422
Target {
2523
llvm_target: "i686-pc-windows-msvc".into(),

0 commit comments

Comments
 (0)