Merge tag 'debian/1.50.0+dfsg1-1_exp4' into debian/sid

rustc Debian release 1.50.0+dfsg1-1~exp4

diff --cc debian/changelog
index 1627fbaca0a92d0b0b9cd78ed2b09511b2e7b9cf,0ff0f546f9e7c63627d8c95d0a5cb0d6e3078ce2..70049ae9a2eef3dac93d0762a663e1858e667058
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,27 +1,39 @@@
+ rustc (1.50.0+dfsg1-1~exp4) experimental; urgency=medium
+ 
+   * Fix more tests with a backported upstream PR.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Mon, 12 Apr 2021 01:51:22 +0100
+ 
+ rustc (1.50.0+dfsg1-1~exp3) experimental; urgency=medium
+ 
+   * Fix cross-compile to windows using same-version stage0.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 11 Apr 2021 13:52:41 +0100
+ 
+ rustc (1.50.0+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * Fix tests, fix s390x breakage.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 09 Apr 2021 16:54:20 +0100
+ 
+ rustc (1.50.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Mon, 05 Apr 2021 21:30:18 +0100
+ 
 +rustc (1.49.0+dfsg1-2) unstable; urgency=medium
 +
 +  * Backport upstream PR 85807 to fix powerpc test issues.
 +
 + -- Ximin Luo <infinity0@debian.org>  Sat, 18 Sep 2021 11:33:09 +0100
 +
 +rustc (1.49.0+dfsg1-1) unstable; urgency=medium
 +
 +  * Upload to unstable.
 +
 + -- Ximin Luo <infinity0@debian.org>  Sat, 28 Aug 2021 10:48:11 +0100
 +
  rustc (1.49.0+dfsg1-1~exp1) experimental; urgency=medium
  
    * New upstream release.

diff --cc debian/patches/d-fix-mips64el-bootstrap.patch
index f879ae13c047072f2e41b3f130a754ba490e1807,49ebde6fb65c59dcfa0aca8399c5813448ed10fc..4d2bcacebbb38ec1b67e3179bcabbfa9411a8413
--- 1/debian/patches/d-fix-mips64el-bootstrap.patch
--- 2/debian/patches/d-fix-mips64el-bootstrap.patch
+++ b/debian/patches/d-fix-mips64el-bootstrap.patch
@@@ -8,27 -8,5 +8,27 @@@ Bug: https://github.com/rust-lang/rust/
  +        if self.build_triple().startswith('mips'):
  +            env["RUSTFLAGS"] += " -Ctarget-feature=+xgot"
   
-          build_section = "target.{}".format(self.build_triple())
+          build_section = "target.{}".format(self.build)
           target_features = []
 +--- a/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
 ++++ b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
 +@@ -10,7 +10,7 @@
 +             endian: "big".to_string(),
 +             // NOTE(mips64r2) matches C toolchain
 +             cpu: "mips64r2".to_string(),
 +-            features: "+mips64r2".to_string(),
 ++            features: "+mips64r2,+xgot".to_string(),
 +             max_atomic_width: Some(64),
 +             mcount: "_mcount".to_string(),
 + 
 +--- a/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
 ++++ b/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
 +@@ -9,7 +9,7 @@
 +         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),
 +             mcount: "_mcount".to_string(),
 + 

diff --cc debian/patches/series
index 1f8204f6021c331acc9553535e08e268bfb62ec8,4c99d823f1fd48c0208c6c05366f33fe7e5a007f..f4d9873d24b5a0fdbe12660907111fc312eb5405
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,10 +1,11 @@@
  # Patches for upstream
  
  # pending, or forwarded
 +u-85807.patch
+ 9756838f612da2ef6c359aaea8bf0a69ad76716a.patch
+ 0001-Revert-Auto-merge-of-79547.patch
+ u-84099.patch
+ u-8d504aa90416668d8f6b4cbd449e2e1de20fb937.patch
  u-ignore-gdb-10-failures.patch
  u-update-version-check.patch
  u-reproducible-build.patch