diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-04-02 03:34:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 03:34:22 +0200 |
| commit | 46a4754df0ff70c9e0d3cc2a9f32c0e5cdabf5fc (patch) | |
| tree | c3ae407b201273294c8312f8c2811d443cc16b07 /compiler | |
| parent | be7c363182554aab48e0d5cc48be46d998017035 (diff) | |
| parent | 017a092f45e53c9dc999b5ef1e4e0762dfd34979 (diff) | |
| download | rust-46a4754df0ff70c9e0d3cc2a9f32c0e5cdabf5fc.tar.gz rust-46a4754df0ff70c9e0d3cc2a9f32c0e5cdabf5fc.zip | |
Rollup merge of #95430 - ChrisDenton:disable-tls-i686-msvc, r=nagisa
Disable #[thread_local] support on i686-pc-windows-msvc Fixes #95429
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs index 174294895bf..5b30dc1d3da 100644 --- a/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs +++ b/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs @@ -19,6 +19,8 @@ pub fn target() -> Target { .entry(LinkerFlavor::Lld(LldFlavor::Link)) .or_default() .extend(pre_link_args_msvc); + // Workaround for #95429 + base.has_thread_local = false; Target { llvm_target: "i686-pc-windows-msvc".to_string(), |