Merge pull request #18 from sailfishos/jb57222

[rust] Update to 1.61.0. JB#57222

Author: mlehtima

0002-Set-proper-llvm-targets.patch renamed to 0001-Set-proper-llvm-targets.patch

@@ -1,26 +1,24 @@
-From 72aaa3d28daa1b187059ef148c45bd9f186b430d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matti Kosola <[email protected]>
 Date: Thu, 9 Jul 2020 11:22:10 +0000
-Subject: [PATCH 2/4] Set proper llvm targets.
+Subject: [PATCH] Set proper llvm targets.
 
 Signed-off-by: Matti Kosola <[email protected]>
+Signed-off-by: Ruben De Smet <[email protected]>
 ---
  config.toml.example | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/config.toml.example b/config.toml.example
-index 9121d1e1799..7990f01ab42 100644
+index 6e53d9b442f1609ec929f1c021984391d038e879..02b3a376409f5e523921aca8c89c2922c950aab3 100644
 --- a/config.toml.example
 +++ b/config.toml.example
-@@ -63,7 +63,7 @@
+@@ -103,7 +103,7 @@ changelog-seen = 2
  # support. You'll need to write a target specification at least, and most
  # likely, teach rustc about the C ABI of the target. Get in touch with the
  # Rust team and file an issue if you need assistance in porting!
--#targets = "AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86"
+-#targets = "AArch64;ARM;BPF;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86"
 +targets = "X86;ARM;AArch64"
 
  # LLVM experimental targets to build support for. These targets are specified in
  # the same format as above, but since these targets are experimental, they are
--- 
-2.20.1
-

0003-Disable-statx-for-all-builds.-JB-50106.patch renamed to 0002-Disable-statx-for-all-builds.-JB-50106.patch

@@ -1,4 +1,4 @@
-From 0ea195274d580ada6af1f9687647564d9a06ecd5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Niels Breet <[email protected]>
 Date: Tue, 11 May 2021 13:03:55 +0300
 Subject: [PATCH] Disable statx for all builds. JB#50106
@@ -14,15 +14,40 @@ that gracefully without issues thanks to rust's type system.
 
 Signed-off-by: Tomi Leppänen <[email protected]
 Signed-off-by: Matti Kosola <[email protected]>
+Signed-off-by: Ruben De Smet <[email protected]>
 ---
- library/std/src/sys/unix/fs.rs | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
+ library/std/src/sys/unix/fs.rs | 27 ++-------------------------
+ 1 file changed, 2 insertions(+), 25 deletions(-)
 
 diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
-index d1b0ad9..f5ddc9b 100644
+index 7181451de575fcb8ff7df27ba5a66b18a08904be..141e1726db49f1ac483a5788bdbc31388a1c942e 100644
 --- a/library/std/src/sys/unix/fs.rs
 +++ b/library/std/src/sys/unix/fs.rs
-@@ -58,20 +58,9 @@ pub struct File(FileDesc);
+@@ -13,23 +13,11 @@
+ use crate::sys::{cvt, cvt_r};
+ use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
+ 
+-#[cfg(any(
+-    all(target_os = "linux", target_env = "gnu"),
+-    target_os = "macos",
+-    target_os = "ios",
+-))]
+-use crate::sys::weak::syscall;
+ #[cfg(target_os = "macos")]
+ use crate::sys::weak::weak;
+ 
+ use libc::{c_int, mode_t};
+ 
+-#[cfg(any(
+-    target_os = "macos",
+-    target_os = "ios",
+-    all(target_os = "linux", target_env = "gnu")
+-))]
+-use libc::c_char;
+ #[cfg(any(target_os = "linux", target_os = "emscripten", target_os = "android"))]
+ use libc::dirfd;
+ #[cfg(any(target_os = "linux", target_os = "emscripten"))]
+@@ -85,20 +73,9 @@
  // https://github.com/rust-lang/rust/pull/67774
  macro_rules! cfg_has_statx {
      ({ $($then_tt:tt)* } else { $($else_tt:tt)* }) => {
@@ -45,6 +70,3 @@ index d1b0ad9..f5ddc9b 100644
  }
 
  cfg_has_statx! {{
--- 
-1.9.1
-

0004-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch renamed to 0003-Scratchbox2-needs-to-be-able-to-tell-rustc-the-defau.patch

@@ -1,4 +1,4 @@
-From ac226bbc018e11311394126fe580763c5bc77a2c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Niels Breet <[email protected]>
 Date: Tue, 11 May 2021 13:10:49 +0300
 Subject: [PATCH] Scratchbox2 needs to be able to tell rustc the default
@@ -9,15 +9,16 @@ hardcode this for a cross-compiler, using an environment variable
 allows the same rustc binary to be used for all builds.
 
 Signed-off-by: David Greaves <[email protected]>
+Signed-off-by: Ruben De Smet <[email protected]>
 ---
  compiler/rustc_session/src/config.rs | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
-index 85448b7..ec51c50 100644
+index 4182a5d07118e0652ff63c4bec28bde0775d0c59..9904ab2e70d7aafab4ec63e86d0cdb383ca2285b 100644
 --- a/compiler/rustc_session/src/config.rs
 +++ b/compiler/rustc_session/src/config.rs
-@@ -1537,7 +1537,14 @@ fn parse_target_triple(matches: &getopts::Matches, error_format: ErrorOutputType
+@@ -1848,7 +1848,14 @@ pub fn parse_target_triple(
              })
          }
          Some(target) => TargetTriple::TargetTriple(target),
@@ -33,6 +34,3 @@ index 85448b7..ec51c50 100644
      }
  }
 
--- 
-1.9.1
-

0005-Cargo-Force-the-target-when-building-for-CompileKind-Host.patch renamed to 0004-Force-the-target-when-building-for-CompileKind-Host.patch

@@ -1,29 +1,26 @@
-From f58f4a0fb53df2b1b27c11986596c62de803afdf Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Greaves <[email protected]>
 Date: Mon, 30 Nov 2020 13:07:39 +0000
 Subject: [PATCH] Force the target when building for CompileKind::Host
 
 Currently hardwired to be i686-unknown-linux-gnu
 
 Signed-off-by: David Greaves <[email protected]>
+Signed-off-by: Ruben De Smet <[email protected]>
 ---
- src/tools/cargo/src/cargo/core/compiler/mod.rs | 3 +++
- 1 file changed, 3 insertions(+)
+ src/tools/cargo | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/tools/cargo/src/cargo/core/compiler/mod.rs b/src/tools/cargo/src/cargo/core/compiler/mod.rs
-index faee6e5..4af3f29 100644
 --- a/src/tools/cargo/src/cargo/core/compiler/mod.rs
 +++ b/src/tools/cargo/src/cargo/core/compiler/mod.rs
-@@ -912,6 +912,9 @@ fn build_base_args<'a, 'cfg>(
- 
+@@ -989,6 +989,9 @@ fn build_base_args(
+
      if let CompileKind::Target(n) = unit.kind {
          cmd.arg("--target").arg(n.rustc_target());
 +    } else {
-+	debug!("kind is {:?} - Forcing this to be 686", unit.kind);
++        debug!("kind is {:?} - Forcing this to be 686", unit.kind);
 +        cmd.arg("--target").arg("i686-unknown-linux-gnu");
      }
- 
-     opt(
--- 
-2.20.1
 
+     opt(