[rust] Rust 1.79.0

Author: direc85

0001-Set-proper-llvm-targets.patch

@@ -5,23 +5,24 @@ Subject: [PATCH] Set proper llvm targets.
 
 Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
 Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
+Signed-off-by: Matti Viljanen <matti.viljanen@kapsi.fi>
 ---
  config.example.toml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/config.example.toml b/config.example.toml
-index e5df28a49af..48a9fafea6f 100644
+index 5c1fac767..9a090fd33 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -99,7 +99,7 @@ change-id = 116881
+@@ -96,7 +96,7 @@
  # the resulting rustc being unable to compile for the disabled architectures.
  #
  # To add support for new targets, see https://rustc-dev-guide.rust-lang.org/building/new-target.html.
 -#targets = "AArch64;ARM;BPF;Hexagon;LoongArch;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.43.0
+--
+2.45.2
 

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

@@ -10,15 +10,16 @@ allows the same rustc binary to be used for all builds.
 
 Signed-off-by: David Greaves <david.greaves@jolla.com>
 Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
+Signed-off-by: Matti Viljanen <matti.viljanen@kapsi.fi>
 ---
  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 f745bc390ca..934f16ab4ab 100644
+index 4f259960a..16defdafb 100644
 --- a/compiler/rustc_session/src/config.rs
 +++ b/compiler/rustc_session/src/config.rs
-@@ -2241,7 +2241,14 @@ pub fn parse_target_triple(
+@@ -1922,7 +1922,14 @@ pub fn parse_target_triple(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches
              })
          }
          Some(target) => TargetTriple::TargetTriple(target),
@@ -33,7 +34,7 @@ index f745bc390ca..934f16ab4ab 100644
 +        }
      }
  }
- 
--- 
-2.43.0
+
+--
+2.45.2
 

0004-Force-the-target-when-building-for-CompileKind-Host.patch

@@ -7,24 +7,25 @@ Currently hardwired to be i686-unknown-linux-gnu
 
 Signed-off-by: David Greaves <david.greaves@jolla.com>
 Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
+Signed-off-by: Matti Viljanen <matti.viljanen@kapsi.fi>
 ---
- src/tools/cargo | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/tools/cargo/src/cargo/core/compiler/mod.rs | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/src/tools/cargo/src/cargo/core/compiler/mod.rs b/src/tools/cargo/src/cargo/core/compiler/mod.rs
-index 7024a2ac5..ebce975a9 100644
+index 3b0510ac9..6b745db92 100644
 --- a/src/tools/cargo/src/cargo/core/compiler/mod.rs
 +++ b/src/tools/cargo/src/cargo/core/compiler/mod.rs
-@@ -1111,6 +1111,9 @@ fn build_base_args(cx: &Context<'_, '_>, cmd: &mut ProcessBuilder, unit: &Unit)
- 
+@@ -1150,6 +1150,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);
 +        cmd.arg("--target").arg("i686-unknown-linux-gnu");
      }
- 
+
      opt(
--- 
-2.42.0
+--
+2.45.2
 

0005-Provide-ENV-controls-to-bypass-some-sb2-calls-betwee.patch

@@ -35,18 +35,19 @@ needed to support the SHIM functionality
 Co-authored-by: Ruben De Smet <ruben.de.smet@rubdos.be>
 Signed-off-by: David Greaves <david.greaves@jolla.com>
 Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
+Signed-off-by: Matti Viljanen <matti.viljanen@kapsi.fi>
 ---
- .../src/sys/unix/process/process_common.rs    |  55 ++++++-
- .../std/src/sys/unix/process/process_unix.rs  | 137 ++++++++++++++++--
+ .../sys/pal/unix/process/process_common.rs    |  55 ++++++-
+ .../src/sys/pal/unix/process/process_unix.rs  | 137 ++++++++++++++++--
  2 files changed, 172 insertions(+), 20 deletions(-)
 
-diff --git a/library/std/src/sys/unix/process/process_common.rs b/library/std/src/sys/unix/process/process_common.rs
-index bac32d9e60e..3cd9767da88 100644
---- a/library/std/src/sys/unix/process/process_common.rs
-+++ b/library/std/src/sys/unix/process/process_common.rs
-@@ -85,7 +85,7 @@ pub unsafe fn sigaddset(set: *mut libc::sigset_t, signum: libc::c_int) -> libc::
+diff --git a/library/std/src/sys/pal/unix/process/process_common.rs b/library/std/src/sys/pal/unix/process/process_common.rs
+index f615e8086..7e90aa40f 100644
+--- a/library/std/src/sys/pal/unix/process/process_common.rs
++++ b/library/std/src/sys/pal/unix/process/process_common.rs
+@@ -85,7 +85,7 @@ cfg_if::cfg_if! {
  ////////////////////////////////////////////////////////////////////////////////
- 
+
  pub struct Command {
 -    program: CString,
 +    pub(crate) program: CString,
@@ -64,13 +65,13 @@ index bac32d9e60e..3cd9767da88 100644
 +    pub(crate) setuid: Option<SetuidFn>,
 +    pub(crate) setgid: Option<SetgidFn>,
 +    pub(crate) setgroups: Option<SetgroupsFn>,
- 
+
      program_kind: ProgramKind,
      cwd: Option<CString>,
 @@ -110,6 +117,14 @@ pub struct Command {
      pgroup: Option<pid_t>,
  }
- 
+
 +pub(crate) type ExecvpFn = fn(*const c_char, *const *const c_char) -> c_int;
 +pub(crate) type Dup2Fn = fn(c_int, c_int) -> c_int;
 +pub(crate) type CloseFn = fn(c_int) -> c_int;
@@ -81,8 +82,8 @@ index bac32d9e60e..3cd9767da88 100644
 +
  // Create a new type for argv, so that we can make it `Send` and `Sync`
  struct Argv(Vec<*const c_char>);
- 
-@@ -183,16 +198,24 @@ pub fn new(program: &OsStr) -> Command {
+
+@@ -183,16 +198,24 @@ impl Command {
          let mut saw_nul = false;
          let program_kind = ProgramKind::new(program.as_ref());
          let program = os2c(program, &mut saw_nul);
@@ -110,7 +111,7 @@ index bac32d9e60e..3cd9767da88 100644
              closures: Vec::new(),
              groups: None,
              stdin: None,
-@@ -207,16 +230,24 @@ pub fn new(program: &OsStr) -> Command {
+@@ -207,16 +230,24 @@ impl Command {
          let mut saw_nul = false;
          let program_kind = ProgramKind::new(program.as_ref());
          let program = os2c(program, &mut saw_nul);
@@ -138,10 +139,10 @@ index bac32d9e60e..3cd9767da88 100644
              closures: Vec::new(),
              groups: None,
              stdin: None,
-@@ -227,6 +258,16 @@ pub fn new(program: &OsStr) -> Command {
+@@ -227,6 +258,16 @@ impl Command {
          }
      }
- 
+
 +    // This allows process_unix::{spawn, exec} to push program to the
 +    // start of /usr/bin/env's arg list
 +    pub fn insert_program(&mut self, arg: String) {
@@ -155,34 +156,34 @@ index bac32d9e60e..3cd9767da88 100644
      pub fn set_arg_0(&mut self, arg: &OsStr) {
          // Set a new arg0
          let arg = os2c(arg, &mut self.saw_nul);
-diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs
-index 72aca4e6659..495368b58ec 100644
---- a/library/std/src/sys/unix/process/process_unix.rs
-+++ b/library/std/src/sys/unix/process/process_unix.rs
-@@ -25,7 +25,7 @@
+diff --git a/library/std/src/sys/pal/unix/process/process_unix.rs b/library/std/src/sys/pal/unix/process/process_unix.rs
+index d65657790..9b2f68b8c 100644
+--- a/library/std/src/sys/pal/unix/process/process_unix.rs
++++ b/library/std/src/sys/pal/unix/process/process_unix.rs
+@@ -15,7 +15,7 @@ use crate::os::unix::io::AsRawFd;
  use libc::RTP_ID as pid_t;
- 
+
  #[cfg(not(target_os = "vxworks"))]
 -use libc::{c_int, pid_t};
 +use libc::{c_char, c_int, dlsym, pid_t};
- 
+
  #[cfg(not(any(
      target_os = "vxworks",
-@@ -62,6 +62,10 @@ fn get_clock_resolution() -> Duration {
+@@ -52,6 +52,10 @@ cfg_if::cfg_if! {
      }
  }
- 
+
 +use crate::ffi::OsString;
 +use crate::intrinsics::transmute;
 +use sys::os::getenv;
 +
  ////////////////////////////////////////////////////////////////////////////////
  // Command
  ////////////////////////////////////////////////////////////////////////////////
-@@ -95,6 +99,65 @@ pub fn spawn(
+@@ -85,6 +89,65 @@ impl Command {
          #[cfg(not(target_os = "linux"))]
          let (input, output) = sys::pipe::anon_pipe()?;
- 
+
 +        // If there is a RUST_EXEC_SHIM (could be "/usr/bin/env --")
 +        // then we're probably going to directly execvp it via dlsym
 +        // to avoid issues with threads and malloc post-fork and
@@ -245,7 +246,7 @@ index 72aca4e6659..495368b58ec 100644
          // Whatever happens after the fork is almost for sure going to touch or
          // look at the environment in one way or another (PATH in `execvp` or
          // accessing the `environ` pointer ourselves). Make sure no other thread
-@@ -111,7 +174,7 @@ pub fn spawn(
+@@ -101,7 +164,7 @@ impl Command {
          if pid == 0 {
              crate::panic::always_abort();
              mem::forget(env_lock); // avoid non-async-signal-safe unlocking
@@ -254,7 +255,7 @@ index 72aca4e6659..495368b58ec 100644
              #[cfg(target_os = "linux")]
              if self.get_create_pidfd() {
                  self.send_pidfd(&output);
-@@ -268,7 +331,47 @@ pub fn exec(&mut self, default: Stdio) -> io::Error {
+@@ -257,7 +320,47 @@ impl Command {
              Err(e) => e,
          }
      }
@@ -303,9 +304,9 @@ index 72aca4e6659..495368b58ec 100644
      // And at this point we've reached a special time in the life of the
      // child. The child must now be considered hamstrung and unable to
      // do anything other than syscalls really. Consider the following
-@@ -308,13 +411,13 @@ unsafe fn do_exec(
+@@ -297,13 +400,13 @@ impl Command {
          use crate::sys::{self, cvt_r};
- 
+
          if let Some(fd) = stdio.stdin.fd() {
 -            cvt_r(|| libc::dup2(fd, libc::STDIN_FILENO))?;
 +            cvt_r(|| self.unwrap_dup2(fd, libc::STDIN_FILENO))?;
@@ -318,9 +319,9 @@ index 72aca4e6659..495368b58ec 100644
 -            cvt_r(|| libc::dup2(fd, libc::STDERR_FILENO))?;
 +            cvt_r(|| self.unwrap_dup2(fd, libc::STDERR_FILENO))?;
          }
- 
+
          #[cfg(not(target_os = "l4re"))]
-@@ -322,10 +425,10 @@ unsafe fn do_exec(
+@@ -311,10 +414,10 @@ impl Command {
              if let Some(_g) = self.get_groups() {
                  //FIXME: Redox kernel does not support setgroups yet
                  #[cfg(not(target_os = "redox"))]
@@ -333,12 +334,18 @@ index 72aca4e6659..495368b58ec 100644
              }
              if let Some(u) = self.get_uid() {
                  // When dropping privileges from root, the `setgroups` call
-@@ -337,13 +440,13 @@ unsafe fn do_exec(
+@@ -326,7 +429,7 @@ impl Command {
                  //FIXME: Redox kernel does not support setgroups yet
                  #[cfg(not(target_os = "redox"))]
-                 if libc::getuid() == 0 && self.get_groups().is_none() {
--                    cvt(libc::setgroups(0, crate::ptr::null()))?;
-+                    cvt(self.unwrap_setgroups(0, crate::ptr::null()))?;
+                 if self.get_groups().is_none() {
+-                    let res = cvt(libc::setgroups(0, crate::ptr::null()));
++                    let res = cvt(self.unwrap_setgroups(0, crate::ptr::null()));
+                     if let Err(e) = res {
+                         // Here we ignore the case of not having CAP_SETGID.
+                         // An alternative would be to require CAP_SETGID (in
+@@ -336,11 +439,11 @@ impl Command {
+                         }
+                     }
                  }
 -                cvt(libc::setuid(u as uid_t))?;
 +                cvt(self.unwrap_setuid(u as uid_t))?;
@@ -348,9 +355,9 @@ index 72aca4e6659..495368b58ec 100644
 -            cvt(libc::chdir(cwd.as_ptr()))?;
 +            cvt(self.unwrap_chdir(cwd.as_ptr()))?;
          }
- 
+
          if let Some(pgroup) = self.get_pgroup() {
-@@ -408,8 +511,12 @@ fn drop(&mut self) {
+@@ -405,8 +508,12 @@ impl Command {
              _reset = Some(Reset(*sys::os::environ()));
              *sys::os::environ() = envp.as_ptr();
          }
@@ -364,19 +371,19 @@ index 72aca4e6659..495368b58ec 100644
 +        };
          Err(io::Error::last_os_error())
      }
- 
-@@ -436,6 +543,7 @@ fn posix_spawn(
+
+@@ -433,6 +540,7 @@ impl Command {
          _: &ChildPipes,
          _: Option<&CStringArray>,
      ) -> io::Result<Option<Process>> {
 +        eprintln!("process_unix:270: in null posix_spawn");
          Ok(None)
      }
- 
-@@ -459,12 +567,15 @@ fn posix_spawn(
-         use crate::mem::MaybeUninit;
+
+@@ -457,12 +565,15 @@ impl Command {
+         use crate::sys::weak::weak;
          use crate::sys::{self, cvt_nz, unix_sigpipe_attr_specified};
- 
+
 +        let skip_spawnvp: bool = getenv(&OsString::from("SB2_RUST_NO_SPAWNVP")).is_some();
 +
          if self.get_gid().is_some()
@@ -389,6 +396,6 @@ index 72aca4e6659..495368b58ec 100644
          {
              return Ok(None);
          }
--- 
-2.43.0
+--
+2.45.2
 

0006-Scratchbox2-needs-to-be-able-to-tell-cargo-the-defau.patch

@@ -7,29 +7,30 @@ Subject: [PATCH] Scratchbox2 needs to be able to tell cargo the default
 This is analogous to the SB2 patch to rustc; ac226bbc018e11311394126fe580763c5bc77a2c
 
 Signed-off-by: Ruben De Smet <ruben.de.smet@rubdos.be>
+Signed-off-by: Matti Viljanen <matti.viljanen@kapsi.fi>
 ---
- src/tools/cargo | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/tools/cargo/src/cargo/core/compiler/compile_kind.rs | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs b/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs
-index 73d8f89cc..5d17c15d2 100644
+index 222732dde..a5056be7b 100644
 --- a/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs
 +++ b/src/tools/cargo/src/cargo/core/compiler/compile_kind.rs
 @@ -71,7 +71,13 @@ impl CompileKind {
          }
- 
-         let kinds = match &config.build_config()?.target {
+
+         let kinds = match &gctx.build_config()?.target {
 -            None => Ok(vec![CompileKind::Host]),
 +            None => {
 +                if let Ok(sb2_tgt) = std::env::var("SB2_RUST_TARGET_TRIPLE") {
 +                    Ok(vec![CompileKind::Target(CompileTarget::new(&sb2_tgt)?)])
 +                } else {
 +                    Ok(vec![CompileKind::Host])
 +                }
-+            }
-             Some(build_target_config) => dedup(&build_target_config.values(config)?),
++            },
+             Some(build_target_config) => dedup(&build_target_config.values(gctx)?),
          };
- 
--- 
-2.42.0
+
+--
+2.45.2