From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sun, 20 Dec 2020 18:52:10 +0000 (+0000)
Subject: d-fix-mips64el-bootstrap
X-Git-Tag: archive/raspbian/1.49.0+dfsg1-1+rpi1^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=00fd818e01135d87d5456276493af533ea1dcca7;p=rustc.git

d-fix-mips64el-bootstrap

Bug: https://github.com/rust-lang/rust/issues/52108


Gbp-Pq: Name d-fix-mips64el-bootstrap.patch
---

diff --git a/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
index b2ea8a6f38..8b400d3bd3 100644
--- a/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
         options: TargetOptions {
             // NOTE(mips64r2) matches C toolchain
             cpu: "mips64r2".to_string(),
-            features: "+mips64r2".to_string(),
+            features: "+mips64r2,+xgot".to_string(),
             max_atomic_width: Some(64),
             target_mcount: "_mcount".to_string(),
 
diff --git a/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
index 48aea4a39b..edb7251347 100644
--- a/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
         options: TargetOptions {
             // NOTE(mips64r2) matches C toolchain
             cpu: "mips64r2".to_string(),
-            features: "+mips64r2".to_string(),
+            features: "+mips64r2,+xgot".to_string(),
             max_atomic_width: Some(64),
             target_mcount: "_mcount".to_string(),
 
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index c263759025..714595c943 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -793,6 +793,8 @@ class RustBuild(object):
         # preserve existing RUSTFLAGS
         env.setdefault("RUSTFLAGS", "")
         env["RUSTFLAGS"] += " -Cdebuginfo=2"
+        if self.build_triple().startswith('mips'):
+            env["RUSTFLAGS"] += " -Ctarget-feature=+xgot"
 
         build_section = "target.{}".format(self.build_triple())
         target_features = []