Merging debian version 1.70.0+dfsg1-7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 3 deletions

diff --git a/debian/patches/d-rustc-i686-baseline.patch b/debian/patches/d-rustc-i686-baseline.patch
index b856d9391..bc1e55d91 100644
--- a/debian/patches/d-rustc-i686-baseline.patch
+++ b/debian/patches/d-rustc-i686-baseline.patch
@@ -7,9 +7,11 @@ Subject: d-rustc-i686-baseline
  compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
+Index: rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+===================================================================
+--- rust.orig/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
++++ rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@ use crate::spec::{Cc, LinkerFlavor, Lld,
  
  pub fn target() -> Target {
      let mut base = super::linux_gnu_base::opts();
@@ -18,3 +20,30 @@ Subject: d-rustc-i686-baseline
      base.max_atomic_width = Some(64);
      base.supported_sanitizers = SanitizerSet::ADDRESS;
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
+Index: rust/tests/ui/sse2.rs
+===================================================================
+--- rust.orig/tests/ui/sse2.rs
++++ rust/tests/ui/sse2.rs
+@@ -15,7 +15,7 @@ fn main() {
+         }
+         Err(_) => return,
+     }
+-    if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
++    if cfg!(any(target_arch = "x86_64")) {
+         assert!(cfg!(target_feature = "sse2"),
+                 "SSE2 was not detected as available on an x86 platform");
+     }
+Index: rust/tests/ui/abi/homogenous-floats-target-feature-mixup.rs
+===================================================================
+--- rust.orig/tests/ui/abi/homogenous-floats-target-feature-mixup.rs
++++ rust/tests/ui/abi/homogenous-floats-target-feature-mixup.rs
+@@ -24,7 +24,8 @@ fn main() {
+     match std::env::var("TARGET") {
+         Ok(s) => {
+             // Skip this tests on i586-unknown-linux-gnu where sse2 is disabled
+-            if s.contains("i586") {
++            // Debian: our i686 doesn't have SSE 2..
++            if s.contains("i586") || s.contains("i686") {
+                 return
+             }
+         }