diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-08-07 01:46:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-07 01:46:31 +0900 |
| commit | 352ad622656ee3a8d8362cb92f5b608a13bc14f5 (patch) | |
| tree | 91c19f6092c1b10374de7b58e7b612d303e7ef35 | |
| parent | 4c29cc8fd09889880880cb6081174c79744ab1b6 (diff) | |
| parent | 283619cf5ca25272b294525273ec42e9c7820edb (diff) | |
| download | rust-352ad622656ee3a8d8362cb92f5b608a13bc14f5.tar.gz rust-352ad622656ee3a8d8362cb92f5b608a13bc14f5.zip | |
Rollup merge of #85807 - glaubitz:powerpc-disable-initial-exec-tls, r=Mark-Simulacrum
bootstrap: Disable initial-exec TLS model on powerpc Fixes #81334.
| -rw-r--r-- | src/bootstrap/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index f2d841cb335..f5f4cd40265 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1291,7 +1291,7 @@ impl<'a> Builder<'a> { // efficient initial-exec TLS model. This doesn't work with `dlopen`, // so we can't use it by default in general, but we can use it for tools // and our own internal libraries. - if !mode.must_support_dlopen() { + if !mode.must_support_dlopen() && !target.triple.starts_with("powerpc-") { rustflags.arg("-Ztls-model=initial-exec"); } |