about summary refs log tree commit diff
path: root/compiler/rustc_target/src/spec/base/cygwin.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-05-30 12:13:28 +0000
committerbors <bors@rust-lang.org>2025-05-30 12:13:28 +0000
commitaa5832b142a2bfd322659d60f5d57e25d2a1bd5d (patch)
tree7c90bce09a8f9139f97411a0db830161dcd3ec12 /compiler/rustc_target/src/spec/base/cygwin.rs
parente6152cdf5b31bd844a4cc1049433859d54863602 (diff)
parent4fce906481a1f618e0ba0c99344978576171f457 (diff)
downloadrust-aa5832b142a2bfd322659d60f5d57e25d2a1bd5d.tar.gz
rust-aa5832b142a2bfd322659d60f5d57e25d2a1bd5d.zip
Auto merge of #141765 - matthiaskrgr:rollup-4hug83b, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - rust-lang/rust#141703 (Structurally normalize types as needed in `projection_ty_core`)
 - rust-lang/rust#141719 (Add tls_model for cygwin and enable has_thread_local)
 - rust-lang/rust#141736 (resolve stage0 sysroot from rustc)
 - rust-lang/rust#141746 (Rework `#[doc(cfg(..))]` checks as distinct pass in rustdoc)
 - rust-lang/rust#141749 (Remove RUSTC_RETRY_LINKER_ON_SEGFAULT hack)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_target/src/spec/base/cygwin.rs')
-rw-r--r--compiler/rustc_target/src/spec/base/cygwin.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_target/src/spec/base/cygwin.rs b/compiler/rustc_target/src/spec/base/cygwin.rs
index 819d1d68a71..d6ae0a905bf 100644
--- a/compiler/rustc_target/src/spec/base/cygwin.rs
+++ b/compiler/rustc_target/src/spec/base/cygwin.rs
@@ -1,7 +1,8 @@
 use std::borrow::Cow;
 
 use crate::spec::{
-    BinaryFormat, Cc, DebuginfoKind, LinkerFlavor, Lld, SplitDebuginfo, TargetOptions, cvs,
+    BinaryFormat, Cc, DebuginfoKind, LinkerFlavor, Lld, SplitDebuginfo, TargetOptions, TlsModel,
+    cvs,
 };
 
 pub(crate) fn opts() -> TargetOptions {
@@ -44,6 +45,8 @@ pub(crate) fn opts() -> TargetOptions {
         eh_frame_header: false,
         debuginfo_kind: DebuginfoKind::Dwarf,
         supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
+        tls_model: TlsModel::Emulated,
+        has_thread_local: true,
         ..Default::default()
     }
 }