diff options
| author | bors <bors@rust-lang.org> | 2021-12-19 12:36:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-19 12:36:56 +0000 |
| commit | 41c3017c82bbc16842cc3bc1afa904e6910e293c (patch) | |
| tree | 67f3463ab2db945a7600cb08431e6078110a8c37 /compiler/rustc_session/src | |
| parent | a41a6925badac7508d7a72cc1fc20f43dc6ad75e (diff) | |
| parent | 33406668125875e84d443387aad53b4d6e7d34fb (diff) | |
| download | rust-41c3017c82bbc16842cc3bc1afa904e6910e293c.tar.gz rust-41c3017c82bbc16842cc3bc1afa904e6910e293c.zip | |
Auto merge of #92099 - matthiaskrgr:rollup-4gwv67m, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #91141 (Revert "Temporarily rename int_roundings functions to avoid conflicts") - #91984 (Remove `in_band_lifetimes` from `rustc_middle`) - #92028 (Sync portable-simd to fix libcore build for AVX-512 enabled targets) - #92042 (Enable `#[thread_local]` for all windows-msvc targets) - #92071 (Update example code for Vec::splice to change the length) - #92077 (rustdoc: Remove unused `collapsed` field) - #92081 (rustdoc: Remove unnecessary `need_backline` function) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index 50a8f033672..de5ff231d61 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -880,7 +880,7 @@ fn default_configuration(sess: &Session) -> CrateConfig { ret.insert((sym::target_env, Some(Symbol::intern(env)))); ret.insert((sym::target_abi, Some(Symbol::intern(abi)))); ret.insert((sym::target_vendor, Some(Symbol::intern(vendor)))); - if sess.target.has_elf_tls { + if sess.target.has_thread_local { ret.insert((sym::target_thread_local, None)); } for (i, align) in [ |