Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-07-25 10:35:20 +03:00 · 2023-07-25 10:35:20 +03:00 · bfba51aa17
parent 1925604d7c 386b9914c9
commit bfba51aa17
9 changed files with 262 additions and 98 deletions
--- a/.gitignore
+++ b/.gitignore
@ -420,3 +420,4 @@
 /wasi-libc-1dfe5c302d1c5ab621f7abf04620fae92700fd22.tar.gz
 /rustc-1.70.0-src.tar.xz
 /wasi-libc-wasi-sdk-20.tar.gz
+/rustc-1.71.0-src.tar.xz
--- a/0001-Let-environment-variables-override-some-default-CPUs.patch
+++ b/0001-Let-environment-variables-override-some-default-CPUs.patch
@ -0,0 +1,53 @@
+From 6e2adb05860b72610291d3b0e8bd525c44cb0cc9 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Fri, 9 Jun 2023 15:23:08 -0700
+Subject: [PATCH] Let environment variables override some default CPUs
+
+---
+ compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs | 2 +-
+ compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs       | 2 +-
+ compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+index fd896e086b54..08d0c43d20b4 100644
+--- a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
+ 
+ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
+-    base.cpu = "ppc64le".into();
+    base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into();
+     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
+     base.max_atomic_width = Some(64);
+     base.stack_probes = StackProbeType::Inline;
+diff --git a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+index f2c722b9a89d..17a14d10b27e 100644
+--- a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+@@ -5,7 +5,7 @@ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
+     base.endian = Endian::Big;
+     // z10 is the oldest CPU supported by LLVM
+-    base.cpu = "z10".into();
+    base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
+     // FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
+     // ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
+     // also strip v128 from the data_layout below to match the older LLVM's expectation.
+diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+index 9af1049b8702..68f876dd18c3 100644
+--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
+ 
+ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
+-    base.cpu = "x86-64".into();
+    base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
+     base.max_atomic_width = Some(64);
+     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
+     base.stack_probes = StackProbeType::X86;
+-- 
+2.40.1
+
--- a/0001-Revert-Fix-x-test-lint-docs-when-download-rustc-is-e.patch
+++ b/0001-Revert-Fix-x-test-lint-docs-when-download-rustc-is-e.patch
@ -0,0 +1,60 @@
+From 9204a8359201271fd7b1c625d6f29ddd095a419d Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Mon, 10 Jul 2023 13:48:49 -0700
+Subject: [PATCH] Revert "Fix `x test lint-docs` when download-rustc is
+ enabled"
+
+This reverts commit abf9cbcb69e485b56776112bc587f6166e7ac5c9.
+---
+ src/tools/lint-docs/src/groups.rs | 3 +--
+ src/tools/lint-docs/src/lib.rs    | 9 ---------
+ 2 files changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/src/tools/lint-docs/src/groups.rs b/src/tools/lint-docs/src/groups.rs
+index b11fb287cf4d..2a923a61b0a7 100644
+--- a/src/tools/lint-docs/src/groups.rs
+++ b/src/tools/lint-docs/src/groups.rs
+@@ -39,12 +39,11 @@ pub(crate) fn generate_group_docs(&self, lints: &[Lint]) -> Result<(), Box<dyn E
+     fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> {
+         let mut result = BTreeMap::new();
+         let mut cmd = Command::new(self.rustc_path);
+-        cmd.env_remove("LD_LIBRARY_PATH");
+         cmd.arg("-Whelp");
+         let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
+         if !output.status.success() {
+             return Err(format!(
+-                "failed to collect lint info: failed to run {cmd:?}: {:?}\n--- stderr\n{}--- stdout\n{}\n",
+                "failed to collect lint info: {:?}\n--- stderr\n{}--- stdout\n{}\n",
+                 output.status,
+                 std::str::from_utf8(&output.stderr).unwrap(),
+                 std::str::from_utf8(&output.stdout).unwrap(),
+diff --git a/src/tools/lint-docs/src/lib.rs b/src/tools/lint-docs/src/lib.rs
+index fe29b9abda39..034c6aa0708e 100644
+--- a/src/tools/lint-docs/src/lib.rs
+++ b/src/tools/lint-docs/src/lib.rs
+@@ -403,12 +403,6 @@ fn generate_lint_output(
+         fs::write(&tempfile, source)
+             .map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?;
+         let mut cmd = Command::new(self.rustc_path);
+-        // NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself.
+-        // Unfortunately, lint-docs is a bootstrap tool while rustc is built from source,
+-        // and sometimes the paths conflict. In particular, when using `download-rustc`,
+-        // the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`.
+-        // Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler.
+-        cmd.env_remove("LD_LIBRARY_PATH");
+         if options.contains(&"edition2015") {
+             cmd.arg("--edition=2015");
+         } else {
+@@ -421,9 +415,6 @@ fn generate_lint_output(
+         }
+         cmd.arg("lint_example.rs");
+         cmd.current_dir(tempdir.path());
+-        if self.verbose {
+-            eprintln!("running: {cmd:?}");
+-        }
+         let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
+         let stderr = std::str::from_utf8(&output.stderr).unwrap();
+         let msgs = stderr
+-- 
+2.41.0
+
--- a/0001-Revert-fix-bug-etc-bash_complettion-src-etc-.-to-avo.patch
+++ b/0001-Revert-fix-bug-etc-bash_complettion-src-etc-.-to-avo.patch
@ -0,0 +1,31 @@
+From cea2e61a03773ce28fd57b7338c4ae4d947650ca Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Mon, 10 Jul 2023 15:52:55 -0700
+Subject: [PATCH] Revert "fix: :bug: etc/bash_complettion -> src/etc/... to
+ avoid copy error"
+
+This reverts commit 08ce68b6a6bad360e9c3611ad60cf6598401f878.
+---
+ src/bootstrap/dist.rs | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
+index b49845386da1..9cead7adc8c3 100644
+--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
+@@ -1071,11 +1071,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ 
+         tarball.add_file(&cargo, "bin", 0o755);
+         tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644);
+-        tarball.add_renamed_file(
+-            etc.join("cargo.bashcomp.sh"),
+-            "src/etc/bash_completion.d",
+-            "cargo",
+-        );
+        tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo");
+         tarball.add_dir(etc.join("man"), "share/man/man1");
+         tarball.add_legal_and_readme_to("share/doc/cargo");
+ 
+-- 
+2.41.0
+
--- a/rust.spec
+++ b/rust.spec
@ -8,9 +8,9 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.69.0
-%global bootstrap_channel 1.69.0
-%global bootstrap_date 2023-04-20
+%global bootstrap_version 1.70.0
+%global bootstrap_channel 1.70.0
+%global bootstrap_date 2023-06-01

 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@ -46,14 +46,14 @@
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
 # is insufficient.  Rust currently requires LLVM 14.0+.
 %global min_llvm_version 14.0.0
-%global bundled_llvm_version 16.0.2
+%global bundled_llvm_version 16.0.5
 %bcond_with bundled_llvm

 # Requires stable libgit2 1.6, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.6.0
+%global min_libgit2_version 1.6.4
 %global next_libgit2_version 1.7.0~
-%global bundled_libgit2_version 1.6.3
+%global bundled_libgit2_version 1.6.4
 %if 0%{?fedora} >= 38
 %bcond_with bundled_libgit2
 %else
@ -83,7 +83,7 @@
 %endif

 Name:           rust
-Version:        1.70.0
+Version:        1.71.0
 Release:        1.0.riscv64%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
@ -106,17 +106,29 @@ Patch1:         0001-Use-lld-provided-by-system-for-wasm.patch
 # Set a substitute-path in rust-gdb for standard library sources.
 Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch

+# Override default target CPUs to match distro settings
+# TODO: upstream this ability into the actual build configuration
+Patch3:         0001-Let-environment-variables-override-some-default-CPUs.patch
+
+# Restore LD_LIBRARY_PATH when running lint-docs
+# https://github.com/rust-lang/rust/pull/110521#issuecomment-1629705099
+Patch4:         0001-Revert-Fix-x-test-lint-docs-when-download-rustc-is-e.patch
+
+# Restore the bash completion path
+# https://github.com/rust-lang/rust/pull/110906#issuecomment-1629832675
+Patch5:         0001-Revert-fix-bug-etc-bash_complettion-src-etc-.-to-avo.patch
+
 ### RHEL-specific patches below ###

 # Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
 Source100:      macros.rust-toolset

 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.70.0-disable-libssh2.patch
+Patch100:       rustc-1.71.0-disable-libssh2.patch

 # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
 # will try to build it statically -- instead we turn off the feature.
-Patch101:       rustc-1.70.0-disable-http2.patch
+Patch101:       rustc-1.71.0-disable-http2.patch

 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@ -574,6 +586,9 @@ test -f '%{local_rust_root}/bin/rustc'

 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1

 %if %with disabled_libssh2
 %patch -P100 -p1
@ -646,24 +661,20 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 %endif

 # These are similar to __cflags_arch_* in /usr/lib/rpm/redhat/macros
-%if 0%{?fedora} || 0%{?rhel} >= 9
-%ifarch x86_64
-%global rust_target_cpu %[0%{?rhel} >= 10 ? "x86-64-v3" : ""]
-%global rust_target_cpu %[0%{?rhel} == 9 ? "x86-64-v2" : "%{rust_target_cpu}"]
-%endif
-%ifarch s390x
-%global rust_target_cpu %[0%{?rhel} >= 9 ? "z14" : "zEC12"]
-%endif
-%ifarch ppc64le
-%global rust_target_cpu %[0%{?rhel} >= 9 ? "pwr9" : "pwr8"]
-%endif
-%endif
+%{lua: function rustc_target_cpus()
+  local fedora = tonumber(rpm.expand("0%{?fedora}"))
+  local rhel = tonumber(rpm.expand("0%{?rhel}"))
+  local env =
+    " RUSTC_TARGET_CPU_X86_64=x86-64" .. ((rhel >= 10) and "-v3" or (rhel == 9) and "-v2" or "")
+    .. " RUSTC_TARGET_CPU_PPC64LE=" .. ((rhel >= 9) and "pwr9" or "pwr8")
+    .. " RUSTC_TARGET_CPU_S390X=" ..
+        ((rhel >= 9) and "z14" or (rhel == 8 or fedora >= 38) and "z13" or
+         (fedora >= 26) and "zEC12" or (rhel == 7) and "z196" or "z10")
+  return env
+end}

 # Set up shared environment variables for build/install/check
-%global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"}
-%if "%{?rust_target_cpu}" != ""
-%global rust_env %{?rust_env} CARGO_TARGET_%{rust_triple_env}_RUSTFLAGS=-Ctarget-cpu=%{rust_target_cpu}
-%endif
+%global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"} %{lua: print(rustc_target_cpus())}
 %if %defined cmake_path
 %global rust_env %{?rust_env} PATH="%{cmake_path}:$PATH"
 %endif
@ -790,6 +801,9 @@ done
 # These are transient files used by x.py dist and install
 rm -rf ./build/dist/ ./build/tmp/

+# Some of the components duplicate-install binaries, leaving backups we don't want
+rm -f %{buildroot}%{_bindir}/*.old
+
 # Make sure the shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
 mkdir -p %{buildroot}%{_libdir}
@ -1049,9 +1063,15 @@ end}


 %changelog
-* Sun Jun 11 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1.70.0-1.0.riscv64
+* Tue Jul 25 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1.71.0-1.0.riscv64
 - Enable riscv64

+* Mon Jul 17 2023 Josh Stone <jistone@redhat.com> - 1.71.0-1
+- Update to 1.71.0.
+
+* Fri Jun 23 2023 Josh Stone <jistone@redhat.com> - 1.70.0-2
+- Override default target CPUs to match distro settings
+
 * Thu Jun 01 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
 - Update to 1.70.0.

--- a/rustc-1.70.0-disable-libssh2.patch
+++ b/rustc-1.70.0-disable-libssh2.patch
@ -1,43 +0,0 @@
--- rustc-beta-src/Cargo.lock.orig	2023-05-19 19:02:31.000000000 -0700
-+++ rustc-beta-src/Cargo.lock	2023-05-24 16:36:33.312232441 -0700
-@@ -2967,7 +2967,6 @@
- dependencies = [
-  "cc",
-  "libc",
- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -3000,20 +2999,6 @@
- ]
- 
- [[package]]
-name = "libssh2-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
- name = "libz-sys"
- version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--- rustc-beta-src/vendor/git2/Cargo.toml.orig	2023-05-19 21:16:57.000000000 -0700
-+++ rustc-beta-src/vendor/git2/Cargo.toml	2023-05-24 16:33:42.043813439 -0700
-@@ -55,9 +55,7 @@
- 
- [features]
- default = [
-    "ssh",
-     "https",
-    "ssh_key_from_memory",
- ]
- https = [
-     "libgit2-sys/https",
--- a/rustc-1.71.0-disable-http2.patch
+++ b/rustc-1.71.0-disable-http2.patch
@ -1,6 +1,6 @@
--- rustc-beta-src/Cargo.lock.orig	2023-05-24 16:49:05.242510531 -0700
-+++ rustc-beta-src/Cargo.lock	2023-05-24 16:51:11.741865603 -0700
-@@ -1197,7 +1197,6 @@ checksum = "14d05c10f541ae6f3bc5b3d923c2
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-07-07 17:30:04.817452621 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-07-07 17:30:27.777988139 -0700
+@@ -734,7 +734,6 @@
 dependencies = [
  "cc",
  "libc",
@ -8,14 +8,14 @@
  "libz-sys",
  "openssl-sys",
  "pkg-config",
-@@ -2989,16 +2988,6 @@ source = "registry+https://github.com/ru
- checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+@@ -1954,16 +1953,6 @@
+ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
 
 [[package]]
 -name = "libnghttp2-sys"
-version = "0.1.4+1.41.0"
+-version = "0.1.7+1.45.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
+-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
 -dependencies = [
 - "cc",
 - "libc",
@ -23,22 +23,22 @@
 -
 -[[package]]
 name = "libz-sys"
- version = "1.1.3"
+ version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-05-24 16:49:05.244510489 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-05-24 16:51:04.683013189 -0700
-@@ -23,7 +23,7 @@ cargo-platform = { path = "crates/cargo-
- cargo-util = { path = "crates/cargo-util", version = "0.2.4" }
- clap = "4.2.0"
- crates-io = { path = "crates/crates-io", version = "0.36.0" }
-curl = { version = "0.4.44", features = ["http2"] }
-+curl = { version = "0.4.44", features = [] }
- curl-sys = "0.4.61"
- env_logger = "0.10.0"
- filetime = "0.2.9"
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-05-19 19:05:42.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-05-24 16:49:05.244510489 -0700
-@@ -407,16 +407,9 @@ impl<'cfg> PackageSet<'cfg> {
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-07-07 17:30:04.819452581 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-07-07 17:30:24.133061874 -0700
+@@ -118,7 +118,7 @@
+ cargo-util.workspace = true
+ clap = { workspace = true, features = ["wrap_help"] }
+ crates-io.workspace = true
+-curl = { workspace = true, features = ["http2"] }
+curl = { workspace = true, features = [] }
+ curl-sys.workspace = true
+ env_logger.workspace = true
+ filetime.workspace = true
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-06-24 10:27:37.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-07-07 17:30:04.819452581 -0700
+@@ -407,16 +407,9 @@
         sources: SourceMap<'cfg>,
         config: &'cfg Config,
     ) -> CargoResult<PackageSet<'cfg>> {
@ -58,9 +58,9 @@
 
         Ok(PackageSet {
             packages: package_ids
--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-05-24 16:49:05.245510468 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-05-24 16:51:57.916900146 -0700
-@@ -229,16 +229,8 @@ impl<'cfg> HttpRegistry<'cfg> {
+--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-06-24 10:27:37.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-07-07 17:30:04.819452581 -0700
+@@ -229,16 +229,8 @@
         }
         self.fetch_started = true;
 
@ -79,9 +79,9 @@
 
         if !self.quiet {
             self.config
--- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-05-19 19:05:42.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-05-24 16:49:05.245510468 -0700
-@@ -25,7 +25,7 @@ impl<T> PollExt<T> for Poll<T> {
+--- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-06-24 10:27:37.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-07-07 17:30:04.819452581 -0700
+@@ -26,7 +26,7 @@
 macro_rules! try_old_curl {
     ($e:expr, $msg:expr) => {
         let result = $e;
--- a/rustc-1.71.0-disable-libssh2.patch
+++ b/rustc-1.71.0-disable-libssh2.patch
@ -0,0 +1,42 @@
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-06-24 10:27:37.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-07-07 17:12:23.406932870 -0700
+@@ -1942,7 +1942,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1965,20 +1964,6 @@
+ ]
+ 
+ [[package]]
+-name = "libssh2-sys"
+-version = "0.3.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-06-24 10:27:37.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-07-07 17:12:00.688392750 -0700
+@@ -31,7 +31,7 @@
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+ fwdansi = "1.1.0"
+-git2 = "0.17.1"
+git2 = { version = "0.17.1", default-features = false, features = ["https"] }
+ git2-curl = "0.18.0"
+ gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (rustc-1.70.0-src.tar.xz) = 21b35185fdcc35a059ee5ef6dca2b68f5f1d199e97f425a571cfc318a852c36a57bccf68e7673b4cb7cd83128f30d0b3eb93009a978f3ba3909b7eee50d40631
+SHA512 (rustc-1.71.0-src.tar.xz) = 2c93bafdd248563765a285add48ca77c1e4bad4d5431675ae6a5cdee4cfe7a41e6bcc880a489ca1069a307fd9a005f2d5f8e230dfc95b4a69152b4f9ca49ac44
 SHA512 (wasi-libc-wasi-sdk-20.tar.gz) = e264240dc7dbcf6398c8ca09bc108298f4a8aa955af22de5a3015fbcde81cb09dd83cd48349090082d5de0e8a3dbcf746c7b14657c67657b3f2f1ab28bb9cf05