Skip to content

Commit 46a4754

Browse files
authored
Rollup merge of #95430 - ChrisDenton:disable-tls-i686-msvc, r=nagisa
Disable #[thread_local] support on i686-pc-windows-msvc Fixes #95429
2 parents be7c363 + 017a092 commit 46a4754

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ pub fn target() -> Target {
1919
.entry(LinkerFlavor::Lld(LldFlavor::Link))
2020
.or_default()
2121
.extend(pre_link_args_msvc);
22+
// Workaround for #95429
23+
base.has_thread_local = false;
2224

2325
Target {
2426
llvm_target: "i686-pc-windows-msvc".to_string(),

0 commit comments

Comments
 (0)