af802e87d4
- rebase patches - fix type of 'llvm-unwind' in config.toml - move linux_musl_base stuff to a single patch which makes it behave just line linux_gnu_base - copy new version of need-ssp_nonshared.patch from alpine - temporary workaround for the new rust-llvm-dwp binary: it's copied from the llvm toolchain and shoved into /usr/lib, but they copied the binary from the build machine - fix do_check (thanks cinerea0) - preliminary ppcle patches (q66)
23 lines
1,000 B
Diff
23 lines
1,000 B
Diff
From 283619cf5ca25272b294525273ec42e9c7820edb Mon Sep 17 00:00:00 2001
|
|
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
|
Date: Sat, 29 May 2021 12:38:46 +0000
|
|
Subject: [PATCH] bootstrap: Disable initial-exec TLS model on powerpc
|
|
|
|
Fixes #81334.
|
|
---
|
|
src/bootstrap/builder.rs | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
|
|
index f39e89a9d01f7..061d7ed5ee08b 100644
|
|
--- a/src/bootstrap/builder.rs
|
|
+++ b/src/bootstrap/builder.rs
|
|
@@ -1237,7 +1237,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-") && !target.triple.starts_with("powerpcle-") {
|
|
rustflags.arg("-Ztls-model=initial-exec");
|
|
}
|
|
|