diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-04-27 22:15:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 22:15:04 +0200 |
| commit | f81a41a86a3dcec2c12692755ad4940e97c7ecc5 (patch) | |
| tree | 935f74e1d4947f4f83b873c9867ca0bb5daeda2f /src/librustc_interface | |
| parent | e2976c13710605094282cc38072afbb0601c95b2 (diff) | |
| parent | 45dc4350c3119db37945fa72e8cae174949e0ee0 (diff) | |
| download | rust-f81a41a86a3dcec2c12692755ad4940e97c7ecc5.tar.gz rust-f81a41a86a3dcec2c12692755ad4940e97c7ecc5.zip | |
Rollup merge of #71558 - petrochenkov:tlsm, r=Amanieu
Cleanup and document `-Z tls-model` r? @Amanieu
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/tests.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/librustc_interface/tests.rs b/src/librustc_interface/tests.rs index f0e7581b760..cee2e5b5bec 100644 --- a/src/librustc_interface/tests.rs +++ b/src/librustc_interface/tests.rs @@ -14,7 +14,8 @@ use rustc_session::{build_session, Session}; use rustc_span::edition::{Edition, DEFAULT_EDITION}; use rustc_span::symbol::sym; use rustc_span::SourceFileHashAlgorithm; -use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy, RelocModel, RelroLevel}; +use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy}; +use rustc_target::spec::{RelocModel, RelroLevel, TlsModel}; use std::collections::{BTreeMap, BTreeSet}; use std::iter::FromIterator; use std::path::PathBuf; @@ -567,7 +568,7 @@ fn test_debugging_options_tracking_hash() { tracked!(symbol_mangling_version, SymbolManglingVersion::V0); tracked!(teach, true); tracked!(thinlto, Some(true)); - tracked!(tls_model, Some(String::from("tls model"))); + tracked!(tls_model, Some(TlsModel::GeneralDynamic)); tracked!(treat_err_as_bug, Some(1)); tracked!(unleash_the_miri_inside_of_you, true); tracked!(verify_llvm_ir, true); |
