Skip to content

Commit

Permalink
Rollup merge of rust-lang#85807 - glaubitz:powerpc-disable-initial-ex…
Browse files Browse the repository at this point in the history
…ec-tls, r=Mark-Simulacrum

bootstrap: Disable initial-exec TLS model on powerpc

Fixes rust-lang#81334.
  • Loading branch information
JohnTitor committed Aug 6, 2021
2 parents 4c29cc8 + 283619c commit 352ad62
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down

0 comments on commit 352ad62

Please sign in to comment.