Skip to content

Commit ecb3eb3

Browse files
committed
Auto merge of #141794 - mati865:windows-gnu-tls, r=<try>
enable TLS for windows-gnu It didn't work a few years ago but seems to be working now. try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: dist-x86_64-mingw try-job: dist-i686-mingw
2 parents 15825b7 + 2223668 commit ecb3eb3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

compiler/rustc_target/src/spec/base/windows_gnu.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::borrow::Cow;
22

33
use crate::spec::{
44
BinaryFormat, Cc, DebuginfoKind, LinkSelfContainedDefault, LinkerFlavor, Lld, SplitDebuginfo,
5-
TargetOptions, add_link_args, crt_objects, cvs,
5+
TargetOptions, TlsModel, add_link_args, crt_objects, cvs,
66
};
77

88
pub(crate) fn opts() -> TargetOptions {
@@ -109,6 +109,8 @@ pub(crate) fn opts() -> TargetOptions {
109109
// FIXME(davidtwco): Support Split DWARF on Windows GNU - may require LLVM changes to
110110
// output DWO, despite using DWARF, doesn't use ELF..
111111
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
112+
tls_model: TlsModel::Emulated,
113+
has_thread_local: true,
112114
..Default::default()
113115
}
114116
}

0 commit comments

Comments
 (0)