bootstrap/rust-1.{61-79}: New package

14 files changed, 1376 insertions, 0 deletions

diff --git a/bootstrap/rust-1.77/0001-Fix-LLVM-build.patch b/bootstrap/rust-1.77/0001-Fix-LLVM-build.patch
new file mode 100644
index 000000000..7d8158c37
--- /dev/null
+++ b/bootstrap/rust-1.77/0001-Fix-LLVM-build.patch
@@ -0,0 +1,22 @@
+From 855b7d97e96e67bd5db5c0016c3b9965a5c1843f Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Fri, 8 Sep 2017 00:04:29 -0500
+Subject: [PATCH 01/12] Fix LLVM build
+
+---
+ src/bootstrap/src/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index 33b8f1a7ce720..d933a8bc37f88 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -1212,7 +1212,7 @@ impl Build {
+             .args()
+             .iter()
+             .map(|s| s.to_string_lossy().into_owned())
+-            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
++            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O") && !s.starts_with("-static"))
+             .collect::<Vec<String>>();
+ 
+         // If we're compiling C++ on macOS then we add a flag indicating that
diff --git a/bootstrap/rust-1.77/0002-Fix-linking-to-zlib-when-cross-compiling.patch b/bootstrap/rust-1.77/0002-Fix-linking-to-zlib-when-cross-compiling.patch
new file mode 100644
index 000000000..3c60a7823
--- /dev/null
+++ b/bootstrap/rust-1.77/0002-Fix-linking-to-zlib-when-cross-compiling.patch
@@ -0,0 +1,34 @@
+From 9357baa3eede8062b7c17407d23c3d2102af8435 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Wed, 10 Jan 2018 13:36:41 -0600
+Subject: [PATCH 02/12] Fix linking to zlib when cross-compiling
+
+---
+ compiler/rustc_llvm/build.rs | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
+index 4b0c1229da134..2d61b834c784b 100644
+--- a/compiler/rustc_llvm/build.rs
++++ b/compiler/rustc_llvm/build.rs
+@@ -237,10 +237,8 @@ fn main() {
+     // of llvm-config, not the target that we're attempting to link.
+     let mut cmd = Command::new(&llvm_config);
+     cmd.arg(llvm_link_arg).arg("--libs");
+-
+-    if !is_crossed {
+-        cmd.arg("--system-libs");
+-    }
++    cmd.arg("--system-libs");
++    cmd.args(&components);
+ 
+     // We need libkstat for getHostCPUName on SPARC builds.
+     // See also: https://github.com/llvm/llvm-project/issues/64186
+@@ -273,7 +271,6 @@ fn main() {
+         println!("cargo:rustc-link-lib=z");
+         println!("cargo:rustc-link-lib=execinfo");
+     }
+-    cmd.args(&components);
+ 
+     for lib in output(&mut cmd).split_whitespace() {
+         let name = if let Some(stripped) = lib.strip_prefix("-l") {
diff --git a/bootstrap/rust-1.77/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch b/bootstrap/rust-1.77/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
new file mode 100644
index 000000000..cfcc2ad83
--- /dev/null
+++ b/bootstrap/rust-1.77/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
@@ -0,0 +1,57 @@
+From cb97ef40ec507c7ff20f7c0857b1892a1946a0f3 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sat, 2 Dec 2017 17:25:44 -0600
+Subject: [PATCH 03/12] Fix rustdoc when cross-compiling on musl
+
+musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH.
+---
+ src/bootstrap/src/bin/rustdoc.rs | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/bootstrap/src/bin/rustdoc.rs b/src/bootstrap/src/bin/rustdoc.rs
+index dbbce6fe22047..3d3cb241eaab6 100644
+--- a/src/bootstrap/src/bin/rustdoc.rs
++++ b/src/bootstrap/src/bin/rustdoc.rs
+@@ -6,12 +6,13 @@ use std::ffi::OsString;
+ use std::path::PathBuf;
+ use std::process::Command;
+ 
+-use dylib_util::{dylib_path, dylib_path_var};
++use dylib_util::dylib_path_var;
+ 
+ #[path = "../utils/bin_helpers.rs"]
+ mod bin_helpers;
+ 
+ #[path = "../utils/dylib.rs"]
++#[allow(dead_code)]
+ mod dylib_util;
+ 
+ fn main() {
+@@ -28,9 +29,6 @@ fn main() {
+     // is passed (a bit janky...)
+     let target = args.windows(2).find(|w| &*w[0] == "--target").and_then(|w| w[1].to_str());
+ 
+-    let mut dylib_path = dylib_path();
+-    dylib_path.insert(0, PathBuf::from(libdir.clone()));
+-
+     let mut cmd = Command::new(rustdoc);
+ 
+     if target.is_some() {
+@@ -43,7 +41,7 @@ fn main() {
+     }
+ 
+     cmd.args(&args);
+-    cmd.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
++    cmd.env(dylib_path_var(), PathBuf::from(libdir.clone()));
+ 
+     // Force all crates compiled by this compiler to (a) be unstable and (b)
+     // allow the `rustc_private` feature to link to other unstable crates
+@@ -68,7 +66,7 @@ fn main() {
+         eprintln!(
+             "rustdoc command: {:?}={:?} {:?}",
+             dylib_path_var(),
+-            env::join_paths(&dylib_path).unwrap(),
++            PathBuf::from(libdir.clone()),
+             cmd,
+         );
+         eprintln!("sysroot: {sysroot:?}");
diff --git a/bootstrap/rust-1.77/0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch b/bootstrap/rust-1.77/0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
new file mode 100644
index 000000000..0cb141d14
--- /dev/null
+++ b/bootstrap/rust-1.77/0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
@@ -0,0 +1,525 @@
+From 49c312ef7287f1c465076683825c58c044f857e5 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Fri, 8 Sep 2017 22:11:14 -0500
+Subject: [PATCH 04/12] Remove musl_root and CRT fallback from musl targets
+
+---
+ compiler/rustc_codegen_ssa/src/back/link.rs   |  6 +--
+ .../rustc_target/src/spec/base/linux_musl.rs  |  6 +--
+ compiler/rustc_target/src/spec/crt_objects.rs | 22 ----------
+ compiler/rustc_target/src/spec/mod.rs         |  5 ---
+ config.example.toml                           | 17 --------
+ src/bootstrap/configure.py                    | 32 --------------
+ src/bootstrap/src/core/build_steps/compile.rs | 42 +------------------
+ src/bootstrap/src/core/config/config.rs       | 11 -----
+ src/bootstrap/src/core/sanity.rs              | 23 ----------
+ src/bootstrap/src/lib.rs                      | 19 ---------
+ src/bootstrap/src/utils/cc_detect.rs          | 26 ------------
+ .../host-x86_64/dist-arm-linux/Dockerfile     |  1 -
+ .../dist-i586-gnu-i586-i686-musl/Dockerfile   |  2 -
+ .../host-x86_64/dist-various-1/Dockerfile     |  4 --
+ .../host-x86_64/dist-various-2/Dockerfile     |  3 +-
+ .../host-x86_64/dist-x86_64-musl/Dockerfile   |  1 -
+ .../host-x86_64/test-various/Dockerfile       |  1 -
+ 17 files changed, 4 insertions(+), 217 deletions(-)
+
+diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
+index b29f71bfb9553..7e161ba5c083a 100644
+--- a/compiler/rustc_codegen_ssa/src/back/link.rs
++++ b/compiler/rustc_codegen_ssa/src/back/link.rs
+@@ -1739,7 +1739,7 @@ fn detect_self_contained_mingw(sess: &Session) -> bool {
+ /// Various toolchain components used during linking are used from rustc distribution
+ /// instead of being found somewhere on the host system.
+ /// We only provide such support for a very limited number of targets.
+-fn self_contained_components(sess: &Session, crate_type: CrateType) -> LinkSelfContainedComponents {
++fn self_contained_components(sess: &Session, _crate_type: CrateType) -> LinkSelfContainedComponents {
+     // Turn the backwards compatible bool values for `self_contained` into fully inferred
+     // `LinkSelfContainedComponents`.
+     let self_contained =
+@@ -1761,10 +1761,6 @@ fn self_contained_components(sess: &Session, crate_type: CrateType) -> LinkSelfC
+                     return components;
+                 }
+ 
+-                // FIXME: Find a better heuristic for "native musl toolchain is available",
+-                // based on host and linker path, for example.
+-                // (https://github.com/rust-lang/rust/pull/71769#issuecomment-626330237).
+-                LinkSelfContainedDefault::InferredForMusl => sess.crt_static(Some(crate_type)),
+                 LinkSelfContainedDefault::InferredForMingw => {
+                     sess.host == sess.target
+                         && sess.target.vendor != "uwp"
+diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
+index 5117cadbee0e6..36d64059d59ad 100644
+--- a/compiler/rustc_target/src/spec/base/linux_musl.rs
++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
+@@ -1,13 +1,9 @@
+-use crate::spec::crt_objects;
+-use crate::spec::{base, LinkSelfContainedDefault, TargetOptions};
++use crate::spec::{base, TargetOptions};
+ 
+ pub fn opts() -> TargetOptions {
+     let mut base = base::linux::opts();
+ 
+     base.env = "musl".into();
+-    base.pre_link_objects_self_contained = crt_objects::pre_musl_self_contained();
+-    base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
+-    base.link_self_contained = LinkSelfContainedDefault::InferredForMusl;
+ 
+     // These targets statically link libc by default
+     base.crt_static_default = true;
+diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
+index 53f710b8f9e14..2a4eec15f2027 100644
+--- a/compiler/rustc_target/src/spec/crt_objects.rs
++++ b/compiler/rustc_target/src/spec/crt_objects.rs
+@@ -61,28 +61,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
+     ])
+ }
+ 
+-pub(super) fn pre_musl_self_contained() -> CrtObjects {
+-    new(&[
+-        (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
+-        (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]),
+-        (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
+-        (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o", "crtbeginS.o"]),
+-        (LinkOutputKind::DynamicDylib, &["crti.o", "crtbeginS.o"]),
+-        (LinkOutputKind::StaticDylib, &["crti.o", "crtbeginS.o"]),
+-    ])
+-}
+-
+-pub(super) fn post_musl_self_contained() -> CrtObjects {
+-    new(&[
+-        (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]),
+-        (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]),
+-        (LinkOutputKind::StaticNoPicExe, &["crtend.o", "crtn.o"]),
+-        (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]),
+-        (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]),
+-        (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]),
+-    ])
+-}
+-
+ pub(super) fn pre_mingw_self_contained() -> CrtObjects {
+     new(&[
+         (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 6c698c5b01dd5..1115389cb6970 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -512,9 +512,6 @@ pub enum LinkSelfContainedDefault {
+     /// The target spec explicitly disables self-contained linking.
+     False,
+ 
+-    /// The target spec requests that the self-contained mode is inferred, in the context of musl.
+-    InferredForMusl,
+-
+     /// The target spec requests that the self-contained mode is inferred, in the context of mingw.
+     InferredForMingw,
+ 
+@@ -531,7 +528,6 @@ impl FromStr for LinkSelfContainedDefault {
+         Ok(match s {
+             "false" => LinkSelfContainedDefault::False,
+             "true" | "wasm" => LinkSelfContainedDefault::True,
+-            "musl" => LinkSelfContainedDefault::InferredForMusl,
+             "mingw" => LinkSelfContainedDefault::InferredForMingw,
+             _ => return Err(()),
+         })
+@@ -553,7 +549,6 @@ impl ToJson for LinkSelfContainedDefault {
+             // Stable backwards-compatible values
+             LinkSelfContainedDefault::True => "true".to_json(),
+             LinkSelfContainedDefault::False => "false".to_json(),
+-            LinkSelfContainedDefault::InferredForMusl => "musl".to_json(),
+             LinkSelfContainedDefault::InferredForMingw => "mingw".to_json(),
+         }
+     }
+diff --git a/config.example.toml b/config.example.toml
+index a5ef4022d39d5..d6f51c7ec42ac 100644
+--- a/config.example.toml
++++ b/config.example.toml
+@@ -595,14 +595,6 @@
+ # behavior -- this may lead to miscompilations or other bugs.
+ #description = ""
+ 
+-# The root location of the musl installation directory. The library directory
+-# will also need to contain libunwind.a for an unwinding implementation. Note
+-# that this option only makes sense for musl targets that produce statically
+-# linked binaries.
+-#
+-# Defaults to /usr on musl hosts. Has no default otherwise.
+-#musl-root = <platform specific> (path)
+-
+ # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
+ # platforms to ensure that the compiler is usable by default from the build
+ # directory (as it links to a number of dynamic libraries). This may not be
+@@ -807,15 +799,6 @@
+ # only use static libraries. If unset, the target's default linkage is used.
+ #crt-static = <platform-specific> (bool)
+ 
+-# The root location of the musl installation directory. The library directory
+-# will also need to contain libunwind.a for an unwinding implementation. Note
+-# that this option only makes sense for musl targets that produce statically
+-# linked binaries.
+-#musl-root = build.musl-root (path)
+-
+-# The full path to the musl libdir.
+-#musl-libdir = musl-root/lib
+-
+ # The root location of the `wasm32-wasi` sysroot. Only used for the
+ # `wasm32-wasi` target. If you are building wasm32-wasi target, make sure to
+ # create a `[target.wasm32-wasi]` section and move this field there.
+diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
+index d34c19a47e3fb..8828b3f771a48 100755
+--- a/src/bootstrap/configure.py
++++ b/src/bootstrap/configure.py
+@@ -98,38 +98,6 @@ def v(*args):
+ v("llvm-filecheck", None, "set path to LLVM's FileCheck utility")
+ v("python", "build.python", "set path to python")
+ v("android-ndk", "build.android-ndk", "set path to Android NDK")
+-v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
+-  "MUSL root installation directory (deprecated)")
+-v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
+-  "x86_64-unknown-linux-musl install directory")
+-v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
+-  "i586-unknown-linux-musl install directory")
+-v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
+-  "i686-unknown-linux-musl install directory")
+-v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
+-  "arm-unknown-linux-musleabi install directory")
+-v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
+-  "arm-unknown-linux-musleabihf install directory")
+-v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
+-  "armv5te-unknown-linux-musleabi install directory")
+-v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root",
+-  "armv7-unknown-linux-musleabi install directory")
+-v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root",
+-  "armv7-unknown-linux-musleabihf install directory")
+-v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
+-  "aarch64-unknown-linux-musl install directory")
+-v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
+-  "mips-unknown-linux-musl install directory")
+-v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
+-  "mipsel-unknown-linux-musl install directory")
+-v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
+-  "mips64-unknown-linux-muslabi64 install directory")
+-v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
+-  "mips64el-unknown-linux-muslabi64 install directory")
+-v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root",
+-  "riscv32gc-unknown-linux-musl install directory")
+-v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
+-  "riscv64gc-unknown-linux-musl install directory")
+ v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
+   "rootfs in qemu testing, you probably don't want to use this")
+ v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index ddbe18ab8388d..9b63c41262440 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -332,38 +332,7 @@ fn copy_self_contained_objects(
+ 
+     // Copies the libc and CRT objects.
+     //
+-    // rustc historically provides a more self-contained installation for musl targets
+-    // not requiring the presence of a native musl toolchain. For example, it can fall back
+-    // to using gcc from a glibc-targeting toolchain for linking.
+-    // To do that we have to distribute musl startup objects as a part of Rust toolchain
+-    // and link with them manually in the self-contained mode.
+-    if target.contains("musl") && !target.contains("unikraft") {
+-        let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
+-            panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
+-        });
+-        for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
+-            copy_and_stamp(
+-                builder,
+-                &libdir_self_contained,
+-                &srcdir,
+-                obj,
+-                &mut target_deps,
+-                DependencyType::TargetSelfContained,
+-            );
+-        }
+-        let crt_path = builder.ensure(llvm::CrtBeginEnd { target });
+-        for &obj in &["crtbegin.o", "crtbeginS.o", "crtend.o", "crtendS.o"] {
+-            let src = crt_path.join(obj);
+-            let target = libdir_self_contained.join(obj);
+-            builder.copy(&src, &target);
+-            target_deps.push((target, DependencyType::TargetSelfContained));
+-        }
+-
+-        if !target.starts_with("s390x") {
+-            let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
+-            target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
+-        }
+-    } else if target.contains("-wasi") {
++    if target.contains("-wasi") {
+         let srcdir = builder
+             .wasi_root(target)
+             .unwrap_or_else(|| {
+@@ -471,15 +440,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+             .arg("--manifest-path")
+             .arg(builder.src.join("library/sysroot/Cargo.toml"));
+ 
+-        // Help the libc crate compile by assisting it in finding various
+-        // sysroot native libraries.
+-        if target.contains("musl") {
+-            if let Some(p) = builder.musl_libdir(target) {
+-                let root = format!("native={}", p.to_str().unwrap());
+-                cargo.rustflag("-L").rustflag(&root);
+-            }
+-        }
+-
+         if target.contains("-wasi") {
+             if let Some(p) = builder.wasi_root(target) {
+                 let root = format!(
+diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
+index c0dd1e1208484..c8b11ead18cbf 100644
+--- a/src/bootstrap/src/core/config/config.rs
++++ b/src/bootstrap/src/core/config/config.rs
+@@ -305,8 +305,6 @@ pub struct Config {
+     pub print_step_rusage: bool,
+     pub missing_tools: bool, // FIXME: Deprecated field. Remove it at 2024.
+ 
+-    // Fallback musl-root for all targets
+-    pub musl_root: Option<PathBuf>,
+     pub prefix: Option<PathBuf>,
+     pub sysconfdir: Option<PathBuf>,
+     pub datadir: Option<PathBuf>,
+@@ -572,8 +570,6 @@ pub struct Target {
+     pub profiler: Option<StringOrBool>,
+     pub rpath: Option<bool>,
+     pub crt_static: Option<bool>,
+-    pub musl_root: Option<PathBuf>,
+-    pub musl_libdir: Option<PathBuf>,
+     pub wasi_root: Option<PathBuf>,
+     pub qemu_rootfs: Option<PathBuf>,
+     pub no_std: bool,
+@@ -1079,7 +1075,6 @@ define_config! {
+         default_linker: Option<String> = "default-linker",
+         channel: Option<String> = "channel",
+         description: Option<String> = "description",
+-        musl_root: Option<String> = "musl-root",
+         rpath: Option<bool> = "rpath",
+         strip: Option<bool> = "strip",
+         stack_protector: Option<String> = "stack-protector",
+@@ -1130,8 +1125,6 @@ define_config! {
+         profiler: Option<StringOrBool> = "profiler",
+         rpath: Option<bool> = "rpath",
+         crt_static: Option<bool> = "crt-static",
+-        musl_root: Option<String> = "musl-root",
+-        musl_libdir: Option<String> = "musl-libdir",
+         wasi_root: Option<String> = "wasi-root",
+         qemu_rootfs: Option<String> = "qemu-rootfs",
+         no_std: Option<bool> = "no-std",
+@@ -1532,7 +1525,6 @@ impl Config {
+                 default_linker,
+                 channel,
+                 description,
+-                musl_root,
+                 rpath,
+                 verbose_tests,
+                 optimize_tests,
+@@ -1634,7 +1626,6 @@ impl Config {
+             config.rustc_parallel =
+                 parallel_compiler.unwrap_or(config.channel == "dev" || config.channel == "nightly");
+             config.rustc_default_linker = default_linker;
+-            config.musl_root = musl_root.map(PathBuf::from);
+             config.save_toolstates = save_toolstates.map(PathBuf::from);
+             set(
+                 &mut config.deny_warnings,
+@@ -1833,8 +1824,6 @@ impl Config {
+                 target.ranlib = cfg.ranlib.map(PathBuf::from);
+                 target.linker = cfg.linker.map(PathBuf::from);
+                 target.crt_static = cfg.crt_static;
+-                target.musl_root = cfg.musl_root.map(PathBuf::from);
+-                target.musl_libdir = cfg.musl_libdir.map(PathBuf::from);
+                 target.wasi_root = cfg.wasi_root.map(PathBuf::from);
+                 target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
+                 target.sanitizers = cfg.sanitizers;
+diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
+index 5f1ca5de74afb..77a5ce078fb42 100644
+--- a/src/bootstrap/src/core/sanity.rs
++++ b/src/bootstrap/src/core/sanity.rs
+@@ -11,7 +11,6 @@
+ use std::collections::HashMap;
+ use std::env;
+ use std::ffi::{OsStr, OsString};
+-use std::fs;
+ use std::path::PathBuf;
+ use std::process::Command;
+ 
+@@ -221,28 +220,6 @@ than building it.
+             continue;
+         }
+ 
+-        // Make sure musl-root is valid.
+-        if target.contains("musl") && !target.contains("unikraft") {
+-            // If this is a native target (host is also musl) and no musl-root is given,
+-            // fall back to the system toolchain in /usr before giving up
+-            if build.musl_root(*target).is_none() && build.config.build == *target {
+-                let target = build.config.target_config.entry(*target).or_default();
+-                target.musl_root = Some("/usr".into());
+-            }
+-            match build.musl_libdir(*target) {
+-                Some(libdir) => {
+-                    if fs::metadata(libdir.join("libc.a")).is_err() {
+-                        panic!("couldn't find libc.a in musl libdir: {}", libdir.display());
+-                    }
+-                }
+-                None => panic!(
+-                    "when targeting MUSL either the rust.musl-root \
+-                            option or the target.$TARGET.musl-root option must \
+-                            be specified in config.toml"
+-                ),
+-            }
+-        }
+-
+         if need_cmake && target.is_msvc() {
+             // There are three builds of cmake on windows: MSVC, MinGW, and
+             // Cygwin. The Cygwin build does not have generators for Visual
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index c67f6dd1355be..eb5c95023f0e3 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -1315,25 +1315,6 @@ impl Build {
+         }
+     }
+ 
+-    /// Returns the "musl root" for this `target`, if defined
+-    fn musl_root(&self, target: TargetSelection) -> Option<&Path> {
+-        self.config
+-            .target_config
+-            .get(&target)
+-            .and_then(|t| t.musl_root.as_ref())
+-            .or_else(|| self.config.musl_root.as_ref())
+-            .map(|p| &**p)
+-    }
+-
+-    /// Returns the "musl libdir" for this `target`.
+-    fn musl_libdir(&self, target: TargetSelection) -> Option<PathBuf> {
+-        let t = self.config.target_config.get(&target)?;
+-        if let libdir @ Some(_) = &t.musl_libdir {
+-            return libdir.clone();
+-        }
+-        self.musl_root(target).map(|root| root.join("lib"))
+-    }
+-
+     /// Returns the sysroot for the wasi target, if defined
+     fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
+         self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
+diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
+index fb5b9d8c88f7d..c073fa8053bdc 100644
+--- a/src/bootstrap/src/utils/cc_detect.rs
++++ b/src/bootstrap/src/utils/cc_detect.rs
+@@ -41,8 +41,6 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> {
+         Some(PathBuf::from(ar))
+     } else if target.is_msvc() {
+         None
+-    } else if target.contains("musl") {
+-        Some(PathBuf::from("ar"))
+     } else if target.contains("openbsd") {
+         Some(PathBuf::from("ar"))
+     } else if target.contains("vxworks") {
+@@ -201,30 +199,6 @@ fn default_compiler(
+             }
+         }
+ 
+-        "mips-unknown-linux-musl" if compiler == Language::C => {
+-            if cfg.get_compiler().path().to_str() == Some("gcc") {
+-                Some(PathBuf::from("mips-linux-musl-gcc"))
+-            } else {
+-                None
+-            }
+-        }
+-        "mipsel-unknown-linux-musl" if compiler == Language::C => {
+-            if cfg.get_compiler().path().to_str() == Some("gcc") {
+-                Some(PathBuf::from("mipsel-linux-musl-gcc"))
+-            } else {
+-                None
+-            }
+-        }
+-
+-        t if t.contains("musl") && compiler == Language::C => {
+-            if let Some(root) = build.musl_root(target) {
+-                let guess = root.join("bin/musl-gcc");
+-                if guess.exists() { Some(guess) } else { None }
+-            } else {
+-                None
+-            }
+-        }
+-
+         _ => None,
+     }
+ }
+diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
+index 420c42bc9d807..83ff773c08e1a 100644
+--- a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
++++ b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile
+@@ -36,7 +36,6 @@ ENV HOSTS=arm-unknown-linux-gnueabi,aarch64-unknown-linux-musl
+ ENV RUST_CONFIGURE_ARGS \
+       --enable-full-tools \
+       --disable-docs \
+-      --musl-root-aarch64=/usr/local/aarch64-linux-musl \
+       --enable-sanitizers \
+       --enable-profiler \
+       --set target.aarch64-unknown-linux-musl.crt-static=false
+diff --git a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
+index a62f98b21d225..f949736e866c4 100644
+--- a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
++++ b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
+@@ -58,8 +58,6 @@ COPY scripts/sccache.sh /scripts/
+ RUN sh /scripts/sccache.sh
+ 
+ ENV RUST_CONFIGURE_ARGS \
+-      --musl-root-i586=/musl-i586 \
+-      --musl-root-i686=/musl-i686 \
+       --disable-docs
+ 
+ # Newer binutils broke things on some vms/distros (i.e., linking against
+diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
+index ea185cd582cd1..e857770a97ef5 100644
+--- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
++++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
+@@ -140,10 +140,6 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft
+     CFLAGS_riscv64gc_unknown_none_elf=-march=rv64gc -mabi=lp64
+ 
+ ENV RUST_CONFIGURE_ARGS \
+-      --musl-root-armv5te=/musl-armv5te \
+-      --musl-root-arm=/musl-arm \
+-      --musl-root-armhf=/musl-armhf \
+-      --musl-root-armv7hf=/musl-armv7hf \
+       --disable-docs
+ 
+ ENV SCRIPT \
+diff --git a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile
+index 5f1fec74bed54..5585a1e2d62cd 100644
+--- a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile
++++ b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile
+@@ -136,7 +136,6 @@ RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/local/include/asm
+ 
+ ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
+   --set target.wasm32-wasi.wasi-root=/wasm32-wasi \
+-  --set target.wasm32-wasi-preview1-threads.wasi-root=/wasm32-wasi-preview1-threads \
+-  --musl-root-armv7=/musl-armv7
++  --set target.wasm32-wasi-preview1-threads.wasi-root=/wasm32-wasi-preview1-threads
+ 
+ ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
+diff --git a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
+index c9a6a2dd069e2..30eda009dee30 100644
+--- a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
++++ b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
+@@ -35,7 +35,6 @@ RUN sh /scripts/sccache.sh
+ ENV HOSTS=x86_64-unknown-linux-musl
+ 
+ ENV RUST_CONFIGURE_ARGS \
+-      --musl-root-x86_64=/usr/local/x86_64-linux-musl \
+       --enable-extended \
+       --enable-sanitizers \
+       --enable-profiler \
+diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile
+index 4fe66014c17cd..784a947e59c62 100644
+--- a/src/ci/docker/host-x86_64/test-various/Dockerfile
++++ b/src/ci/docker/host-x86_64/test-various/Dockerfile
+@@ -39,7 +39,6 @@ COPY scripts/sccache.sh /scripts/
+ RUN sh /scripts/sccache.sh
+ 
+ ENV RUST_CONFIGURE_ARGS \
+-  --musl-root-x86_64=/usr/local/x86_64-linux-musl \
+   --set build.nodejs=/node-v18.12.0-linux-x64/bin/node \
+   --set rust.lld
+ 
diff --git a/bootstrap/rust-1.77/0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/bootstrap/rust-1.77/0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch
new file mode 100644
index 000000000..9c20bbc3b
--- /dev/null
+++ b/bootstrap/rust-1.77/0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch
@@ -0,0 +1,25 @@
+From 78ae73f09d07c847ede1dc683b8907f5bd5bd17f Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sat, 9 Sep 2017 00:14:16 -0500
+Subject: [PATCH 05/12] Prefer libgcc_eh over libunwind for musl
+
+---
+ library/unwind/src/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
+index 079626f0fea..590fca0acfa 100644
+--- a/library/unwind/src/lib.rs
++++ b/library/unwind/src/lib.rs
+@@ -53,7 +53,7 @@
+         #[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
+         extern "C" {}
+     } else {
+-        #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
++        #[link(name = "gcc_eh", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
+         #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
+         extern "C" {}
+     }
+-- 
+2.35.1
+
diff --git a/bootstrap/rust-1.77/0006-Link-libssp_nonshared.a-on-all-musl-targets.patch b/bootstrap/rust-1.77/0006-Link-libssp_nonshared.a-on-all-musl-targets.patch
new file mode 100644
index 000000000..d34bb560d
--- /dev/null
+++ b/bootstrap/rust-1.77/0006-Link-libssp_nonshared.a-on-all-musl-targets.patch
@@ -0,0 +1,28 @@
+From f516ef748075ddfbcbaec493e1a7ee1e59538bd0 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 3 Nov 2019 17:01:32 -0600
+Subject: [PATCH 06/12] Link libssp_nonshared.a on all musl targets
+
+---
+ compiler/rustc_target/src/spec/base/linux_musl.rs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
+index 36d64059d59ad..c113af2464423 100644
+--- a/compiler/rustc_target/src/spec/base/linux_musl.rs
++++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
+@@ -1,10 +1,13 @@
+-use crate::spec::{base, TargetOptions};
++use crate::spec::{add_link_args, base, Cc, LinkerFlavor, Lld, TargetOptions};
+ 
+ pub fn opts() -> TargetOptions {
+     let mut base = base::linux::opts();
+ 
+     base.env = "musl".into();
+ 
++    // libssp_nonshared.a is needed for __stack_chk_fail_local when using libc.so
++    add_link_args(&mut base.post_link_args, LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-lssp_nonshared"]);
++
+     // These targets statically link libc by default
+     base.crt_static_default = true;
+ 
diff --git a/bootstrap/rust-1.77/0007-test-failed-doctest-output-Fix-normalization.patch b/bootstrap/rust-1.77/0007-test-failed-doctest-output-Fix-normalization.patch
new file mode 100644
index 000000000..328b8cae9
--- /dev/null
+++ b/bootstrap/rust-1.77/0007-test-failed-doctest-output-Fix-normalization.patch
@@ -0,0 +1,33 @@
+From 99004a91f6455c835d2625c757f17ee15d2e084a Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 7 Oct 2019 18:36:28 -0500
+Subject: [PATCH 07/12] test/failed-doctest-output: Fix normalization
+
+Otherwise we get:
+
+1
+2       running 2 tests
+-       test $DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED
+-       test $DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED
++       test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - OtherStruct (line 20) ... FAILED
++       test src/rustc-1.38.0-src/$DIR/failed-doctest-output.rs - SomeStruct (line 10) ... FAILED
+5
+6       failures:
+7
+---
+ tests/rustdoc-ui/failed-doctest-output.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/rustdoc-ui/failed-doctest-output.rs b/tests/rustdoc-ui/failed-doctest-output.rs
+index 77647f8eca954..8361f041ffca0 100644
+--- a/tests/rustdoc-ui/doctest/failed-doctest-output.rs
++++ b/tests/rustdoc-ui/doctest/failed-doctest-output.rs
+@@ -7,7 +7,7 @@
+ 
+ // compile-flags:--test --test-args --test-threads=1
+ // rustc-env:RUST_BACKTRACE=0
+-// normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
++// normalize-stdout-test: "[[:graph:]]*tests/rustdoc-ui/doctest" -> "$$DIR"
+ // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
+ // failure-status: 101
+ 
diff --git a/bootstrap/rust-1.77/0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/bootstrap/rust-1.77/0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
new file mode 100644
index 000000000..43f0f37f2
--- /dev/null
+++ b/bootstrap/rust-1.77/0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
@@ -0,0 +1,22 @@
+From cf671a6f53fe74b02aa48c0206d48506d6cdd7cd Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 17 Sep 2018 01:32:20 +0000
+Subject: [PATCH 08/12] test/sysroot-crates-are-unstable: Fix test when rpath is
+ disabled
+
+Without this environment var, the test can't run rustc to find
+the sysroot path.
+---
+ tests/run-make/sysroot-crates-are-unstable/Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/run-make/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile
+index 1e267fb9576ba..30c33c5c13d20 100644
+--- a/tests/run-make/sysroot-crates-are-unstable/Makefile
++++ b/tests/run-make/sysroot-crates-are-unstable/Makefile
+@@ -1,2 +1,4 @@
++-include ../tools.mk
++
+ all:
+-	'$(PYTHON)' test.py
++	env '$(HOST_RPATH_ENV)' '$(PYTHON)' test.py
diff --git a/bootstrap/rust-1.77/0009-Ignore-broken-and-non-applicable-tests.patch b/bootstrap/rust-1.77/0009-Ignore-broken-and-non-applicable-tests.patch
new file mode 100644
index 000000000..b7e9216e9
--- /dev/null
+++ b/bootstrap/rust-1.77/0009-Ignore-broken-and-non-applicable-tests.patch
@@ -0,0 +1,60 @@
+From db350174e9e5e2fc1b89fa6736002e63fe79ed1e Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sun, 16 Sep 2018 16:38:48 +0000
+Subject: [PATCH 09/12] Ignore broken and non-applicable tests
+
+c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475
+env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox)
+long-linker-command-lines: takes >10 minutes to run (but still passes)
+sysroot-crates-are-unstable: can't run rustc without RPATH
+---
+ tests/run-make/c-link-to-rust-va-list-fn/Makefile   | 2 ++
+ tests/run-make/long-linker-command-lines/Makefile   | 2 ++
+ tests/run-make/sysroot-crates-are-unstable/Makefile | 2 ++
+ tests/ui/env-funky-keys.rs                          | 1 +
+ 4 files changed, 7 insertions(+)
+
+diff --git a/tests/run-make/c-link-to-rust-va-list-fn/Makefile b/tests/run-make/c-link-to-rust-va-list-fn/Makefile
+index 596c0fce3ceae..3a156893f9199 100644
+--- a/tests/run-make/c-link-to-rust-va-list-fn/Makefile
++++ b/tests/run-make/c-link-to-rust-va-list-fn/Makefile
+@@ -1,4 +1,6 @@
+ # ignore-cross-compile
++# ignore-aarch64
++
+ include ../tools.mk
+ 
+ all:
+diff --git a/tests/run-make/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile
+index f864ea74f4a95..f16eaf544cc3f 100644
+--- a/tests/run-make/long-linker-command-lines/Makefile
++++ b/tests/run-make/long-linker-command-lines/Makefile
+@@ -1,4 +1,6 @@
+ # ignore-cross-compile
++# ignore-test
++
+ include ../tools.mk
+ 
+ all:
+diff --git a/tests/run-make/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile
+index 30c33c5c13d20..d733bb1c557f5 100644
+--- a/tests/run-make/sysroot-crates-are-unstable/Makefile
++++ b/tests/run-make/sysroot-crates-are-unstable/Makefile
+@@ -1,3 +1,5 @@
++# ignore-test
++
+ -include ../tools.mk
+ 
+ all:
+diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs
+index 46e20d8c61f52..b598ebfbb45a1 100644
+--- a/tests/ui/env-funky-keys.rs
++++ b/tests/ui/env-funky-keys.rs
+@@ -1,6 +1,7 @@
+ // run-pass
+ // Ignore this test on Android, because it segfaults there.
+ 
++// ignore-test
+ // ignore-android
+ // ignore-windows
+ // ignore-emscripten no execve
diff --git a/bootstrap/rust-1.77/0010-Link-stage-2-tools-dynamically-to-libstd.patch b/bootstrap/rust-1.77/0010-Link-stage-2-tools-dynamically-to-libstd.patch
new file mode 100644
index 000000000..ceaa6791f
--- /dev/null
+++ b/bootstrap/rust-1.77/0010-Link-stage-2-tools-dynamically-to-libstd.patch
@@ -0,0 +1,22 @@
+From 4443dc788cea90bdb1f9e5f3d9b702a3be46d4ed Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 24 Sep 2018 23:42:23 +0000
+Subject: [PATCH 10/12] Link stage 2 tools dynamically to libstd
+
+---
+ src/bootstrap/src/core/builder.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
+index cd276674dee6b..a16297b4fe6cc 100644
+--- a/src/bootstrap/src/core/builder.rs
++++ b/src/bootstrap/src/core/builder.rs
+@@ -2097,7 +2097,7 @@ impl<'a> Builder<'a> {
+         // When we build Rust dylibs they're all intended for intermediate
+         // usage, so make sure we pass the -Cprefer-dynamic flag instead of
+         // linking all deps statically into the dylib.
+-        if matches!(mode, Mode::Std | Mode::Rustc) {
++        if matches!(mode, Mode::Std | Mode::Rustc | Mode::ToolRustc) {
+             rustflags.arg("-Cprefer-dynamic");
+         }
+ 
diff --git a/bootstrap/rust-1.77/0011-Move-debugger-scripts-to-usr-share-rust.patch b/bootstrap/rust-1.77/0011-Move-debugger-scripts-to-usr-share-rust.patch
new file mode 100644
index 000000000..304511972
--- /dev/null
+++ b/bootstrap/rust-1.77/0011-Move-debugger-scripts-to-usr-share-rust.patch
@@ -0,0 +1,66 @@
+From 762d3cd3f87b7fdbb885e1bcd4d1314437dd9377 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 17 Sep 2018 02:09:10 +0000
+Subject: [PATCH 11/12] Move debugger scripts to /usr/share/rust
+
+---
+ src/bootstrap/dist.rs | 2 +-
+ src/etc/rust-gdb      | 2 +-
+ src/etc/rust-gdbgui   | 2 +-
+ src/etc/rust-lldb     | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
+index 76aad16c1fc26..db53459e8cae4 100644
+--- a/src/bootstrap/src/core/build_steps/dist.rs
++++ b/src/bootstrap/src/core/build_steps/dist.rs
+@@ -519,7 +519,7 @@ impl Step for DebuggerScripts {
+     fn run(self, builder: &Builder<'_>) {
+         let host = self.host;
+         let sysroot = self.sysroot;
+-        let dst = sysroot.join("lib/rustlib/etc");
++        let dst = sysroot.join("share/rust");
+         t!(fs::create_dir_all(&dst));
+         let cp_debugger_script = |file: &str| {
+             builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644);
+diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
+index 9abed30ea6f73..4c7f953edfa46 100755
+--- a/src/etc/rust-gdb
++++ b/src/etc/rust-gdb
+@@ -12,7 +12,7 @@ fi
+ 
+ # Find out where the pretty printer Python module is
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
+ 
+diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
+index 913269316bd4c..f444fbc4b104e 100755
+--- a/src/etc/rust-gdbgui
++++ b/src/etc/rust-gdbgui
+@@ -41,7 +41,7 @@ fi
+ 
+ # Find out where the pretty printer Python module is
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
++GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust"
+ # Get the commit hash for path remapping
+ RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
+ 
+diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
+index bce72f1bad698..8abb012452787 100755
+--- a/src/etc/rust-lldb
++++ b/src/etc/rust-lldb
+@@ -30,8 +30,8 @@ EOF
+     fi
+ fi
+ 
+-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\""
+-commands_file="$RUSTC_SYSROOT/lib/rustlib/etc/lldb_commands"
++script_import="command script import \"$RUSTC_SYSROOT/share/rust/lldb_lookup.py\""
++commands_file="$RUSTC_SYSROOT/share/rust/lldb_commands"
+ 
+ # Call LLDB with the commands added to the argument list
+ exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"
diff --git a/bootstrap/rust-1.77/0012-Add-foxkit-target-specs.patch b/bootstrap/rust-1.77/0012-Add-foxkit-target-specs.patch
new file mode 100644
index 000000000..3ee6ed28b
--- /dev/null
+++ b/bootstrap/rust-1.77/0012-Add-foxkit-target-specs.patch
@@ -0,0 +1,144 @@
+From 7e50215a21b198c73fe575d28c847fd645c4ee40 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 17 Sep 2018 02:29:06 +0000
+Subject: [PATCH 12/12] Add foxkit target specs
+
+---
+ .../src/spec/targets/aarch64_foxkit_linux_musl.rs             | 11 +++++++++++
+ .../src/spec/targets/armv7_foxkit_linux_musleabihf.rs         | 11 +++++++++++
+ .../rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs   | 11 +++++++++++
+ compiler/rustc_target/src/spec/mod.rs                         |  7 +++++++
+ .../src/spec/targets/powerpc64_foxkit_linux_musl.rs           | 11 +++++++++++
+ .../src/spec/targets/powerpc_foxkit_linux_musl.rs             | 11 +++++++++++
+ .../rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs | 11 +++++++++++
+ 7 files changed, 73 insertions(+)
+ create mode 100644 compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs
+ create mode 100644 compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs
+ create mode 100644 compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs
+ create mode 100644 compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs
+ create mode 100644 compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs
+ create mode 100644 compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs
+
+diff --git a/compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs
+new file mode 100644
+index 00000000000..4bdd51af4fe
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/aarch64_foxkit_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::aarch64_unknown_linux_musl::target();
++
++    base.llvm_target = "aarch64-foxkit-linux-musl".into();
++    base.vendor = "foxkit".into();
++    base.options.crt_static_default = false;
++
++    base
++}
+diff --git a/compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs
+new file mode 100644
+index 00000000000..994f3c39e7c
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/armv7_foxkit_linux_musleabihf.rs
+@@ -0,0 +1,11 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::armv7_unknown_linux_musleabihf::target();
++
++    base.llvm_target = "armv7-foxkit-linux-musleabihf".into();
++    base.vendor = "foxkit".into();
++    base.options.crt_static_default = false;
++
++    base
++}
+diff --git a/compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs
+new file mode 100644
+index 00000000000..028e4b5e930
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/i586_foxkit_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::i586_unknown_linux_musl::target();
++
++    base.llvm_target = "i586-foxkit-linux-musl".into();
++    base.vendor = "foxkit".into();
++    base.options.crt_static_default = false;
++
++    base
++}
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 92678aed5b1..66a408d0b36 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1392,6 +1392,13 @@ fn $module() {
+ }
+ 
+ supported_targets! {
++    ("aarch64-foxkit-linux-musl", aarch64_foxkit_linux_musl),
++    ("armv7-foxkit-linux-musleabihf", armv7_foxkit_linux_musleabihf),
++    ("i586-foxkit-linux-musl", i586_foxkit_linux_musl),
++    ("powerpc-foxkit-linux-musl", powerpc_foxkit_linux_musl),
++    ("powerpc64-foxkit-linux-musl", powerpc64_foxkit_linux_musl),
++    ("x86_64-foxkit-linux-musl", x86_64_foxkit_linux_musl),
++
+     ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu),
+     ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32),
+     ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
+diff --git a/compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs
+new file mode 100644
+index 00000000000..04a50f84b60
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/powerpc64_foxkit_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::powerpc64_unknown_linux_musl::target();
++
++    base.llvm_target = "powerpc64-foxkit-linux-musl".into();
++    base.vendor = "foxkit".into();
++    base.options.crt_static_default = false;
++
++    base
++}
+diff --git a/compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs
+new file mode 100644
+index 00000000000..7bca52c4299
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/powerpc_foxkit_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::powerpc_unknown_linux_musl::target();
++
++    base.llvm_target = "powerpc-foxkit-linux-musl".into();
++    base.vendor = "foxkit".into();
++    base.options.crt_static_default = false;
++
++    base
++}
+diff --git a/compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs
+new file mode 100644
+index 00000000000..1ff73687c00
+--- /dev/null
++++ b/compiler/rustc_target/src/spec/targets/x86_64_foxkit_linux_musl.rs
+@@ -0,0 +1,11 @@
++use crate::spec::Target;
++
++pub fn target() -> Target {
++    let mut base = super::x86_64_unknown_linux_musl::target();
++
++    base.llvm_target = "x86_64-foxkit-linux-musl".into();
++    base.vendor = "foxkit".into();
++    base.options.crt_static_default = false;
++
++    base
++}
+-- 
+2.35.1
+
diff --git a/bootstrap/rust-1.77/APKBUILD b/bootstrap/rust-1.77/APKBUILD
new file mode 100644
index 000000000..3afc290a4
--- /dev/null
+++ b/bootstrap/rust-1.77/APKBUILD
@@ -0,0 +1,290 @@
+# Maintainer: Samuel Holland <samuel@sholland.org>
+pkgname=rust
+pkgver=1.77.1
+_bootver=1.76.0-r0
+_llvmver=18
+pkgrel=0
+pkgdesc="The Rust Programming Language"
+url="https://www.rust-lang.org"
+arch="all"
+#options="!check"  # Failures on aarch64 and ppc64.
+license="(Apache-2.0 OR MIT) AND (NCSA OR MIT) AND BSD-2-Clause AND BSD-3-Clause"
+depends="$pkgname-std=$pkgver-r$pkgrel gcc musl-dev"
+makedepends="
+	curl-dev
+	llvm$_llvmver-dev
+	llvm$_llvmver-test-utils
+	openssl-dev
+	python3
+	cargo-bootstrap=$_bootver
+	rust-bootstrap=$_bootver
+	rustfmt-bootstrap=$_bootver
+	zlib-dev
+	"
+provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
+subpackages="
+	$pkgname-dbg
+	$pkgname-std
+	$pkgname-analysis
+	$pkgname-doc
+	$pkgname-gdb::noarch
+	$pkgname-lldb::noarch
+	$pkgname-src::noarch
+	cargo
+	cargo-clippy:_cargo_clippy
+	cargo-fmt:_cargo_fmt
+	cargo-doc:_cargo_doc:noarch
+	cargo-bash-completion:_cargo_bashcomp:noarch
+	cargo-zsh-completion:_cargo_zshcomp:noarch
+	rustfmt
+	"
+source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz
+	0001-Fix-LLVM-build.patch
+	0002-Fix-linking-to-zlib-when-cross-compiling.patch
+	0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
+	0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
+	0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+	0006-Link-libssp_nonshared.a-on-all-musl-targets.patch
+	0007-test-failed-doctest-output-Fix-normalization.patch
+	0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+	0009-Ignore-broken-and-non-applicable-tests.patch
+	0010-Link-stage-2-tools-dynamically-to-libstd.patch
+	0011-Move-debugger-scripts-to-usr-share-rust.patch
+	0012-Add-foxkit-target-specs.patch
+	powerpc-atomics.patch
+	"
+builddir="$srcdir/rustc-$pkgver-src"
+_rlibdir="/usr/lib/rustlib/$CTARGET/lib"
+
+build() {
+	cat > config.toml <<- EOF
+		changelog-seen = 2
+		[build]
+		doc-stage = 2
+		build-stage = 2
+		test-stage = 2
+		build = "$CBUILD"
+		host = [ "$CHOST" ]
+		target = [ "$CTARGET" ]
+		cargo = "/usr/bin/cargo"
+		rustc = "/usr/bin/rustc"
+		rustfmt = "/usr/bin/rustfmt"
+		docs = true
+		compiler-docs = false
+		submodules = false
+		python = "python3"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [ "analysis", "cargo", "clippy", "rustfmt", "src" ]
+		verbose = 1
+		sanitizers = false
+		profiler = false
+		cargo-native-static = false
+		[install]
+		prefix = "/usr"
+		[rust]
+		optimize = true
+		debug = false
+		codegen-units = 1
+		debuginfo-level = 2
+		debuginfo-level-rustc = 0
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		parallel-compiler = false
+		channel = "stable"
+		description = "Adelie ${pkgver}-r${pkgrel}"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = true
+		codegen-tests = true
+		dist-src = false
+		lld = false
+		use-lld = false
+		llvm-tools = false
+		backtrace-on-ice = true
+		remap-debuginfo = false
+		jemalloc = false
+		llvm-libunwind = "no"
+		new-symbol-mangling = true
+		[target.$CTARGET]
+		cc = "$CTARGET-gcc"
+		cxx = "$CTARGET-g++"
+		ar = "ar"
+		ranlib = "ranlib"
+		linker = "$CTARGET-gcc"
+		llvm-config = "/usr/lib/llvm$_llvmver/bin/llvm-config"
+		crt-static = false
+		[dist]
+		src-tarball = false
+		compression-formats = [ "xz" ]
+	EOF
+
+	LLVM_LINK_SHARED=1 \
+	RUST_BACKTRACE=1 \
+	python3 x.py dist -j ${JOBS:-2}
+}
+
+check() {
+	LLVM_LINK_SHARED=1 \
+	python3 x.py test -j ${JOBS:-2} --no-doc --no-fail-fast || true
+}
+
+package() {
+	cd "$builddir"/build/dist
+
+	tar xf rust-$pkgver-$CTARGET.tar.xz
+	rust-$pkgver-$CTARGET/install.sh \
+		--destdir="$pkgdir" \
+		--prefix=/usr \
+		--sysconfdir="$pkgdir"/etc \
+		--disable-ldconfig
+	tar xf rust-src-$pkgver.tar.xz
+	rust-src-$pkgver/install.sh \
+		--destdir="$pkgdir" \
+		--prefix=/usr \
+		--disable-ldconfig
+
+	rm "$pkgdir"/usr/lib/rustlib/components \
+	   "$pkgdir"/usr/lib/rustlib/install.log \
+	   "$pkgdir"/usr/lib/rustlib/manifest-* \
+	   "$pkgdir"/usr/lib/rustlib/rust-installer-version \
+	   "$pkgdir"/usr/lib/rustlib/uninstall.sh
+}
+
+std() {
+	pkgdesc="Standard library for Rust"
+	depends="musl-utils"
+
+	_mv "$pkgdir"$_rlibdir/*.so "$subpkgdir"$_rlibdir
+
+	mkdir -p "$subpkgdir"/etc/ld.so.conf.d
+	echo "$_rlibdir" > "$subpkgdir"/etc/ld.so.conf.d/$pkgname.conf
+}
+
+analysis() {
+	pkgdesc="Compiler analysis data for the Rust standard library"
+	depends="$pkgname=$pkgver-r$pkgrel $pkgname-std=$pkgver-r$pkgrel"
+
+	_mv "$pkgdir"${_rlibdir%/*}/analysis "$subpkgdir"${_rlibdir%/*}
+}
+
+gdb() {
+	pkgdesc="GDB pretty printers for Rust"
+	license="Apache-2.0 OR MIT"
+	depends="$pkgname gdb"
+	install_if="$pkgname=$pkgver-r$pkgrel gdb"
+
+	_mv "$pkgdir"/usr/bin/rust-gdb "$subpkgdir"/usr/bin
+	_mv "$pkgdir"/usr/bin/rust-gdbgui "$subpkgdir"/usr/bin
+	_mv "$pkgdir"/usr/share/rust/gdb_*.py "$subpkgdir"/usr/share/rust
+}
+
+lldb() {
+	pkgdesc="LLDB pretty printers for Rust"
+	license="Apache-2.0 OR MIT"
+	depends="$pkgname lldb py3-lldb"
+	install_if="$pkgname=$pkgver-r$pkgrel lldb"
+
+	_mv "$pkgdir"/usr/bin/rust-lldb "$subpkgdir"/usr/bin
+	_mv "$pkgdir"/usr/share/rust/lldb_*.py "$subpkgdir"/usr/share/rust
+}
+
+src() {
+	pkgdesc="$pkgdesc (source code)"
+	depends=""
+
+	_mv "$pkgdir"/usr/lib/rustlib/src/rust "$subpkgdir"/usr/src
+	rmdir -p "$pkgdir"/usr/lib/rustlib/src 2>/dev/null || true
+
+	mkdir -p "$subpkgdir"/usr/lib/rustlib/src
+	ln -s ../../../src/rust "$subpkgdir"/usr/lib/rustlib/src/rust
+}
+
+cargo() {
+	pkgdesc="The Rust package manager"
+	provides="cargo-bootstrap=$pkgver-r$pkgrel"
+	depends="$pkgname-std=$pkgver-r$pkgrel $pkgname"
+
+	_mv "$pkgdir"/usr/bin/cargo "$subpkgdir"/usr/bin
+}
+
+_cargo_clippy() {
+	pkgdesc="A collection of Rust lints (cargo plugin)"
+	depends="$pkgname-std=$pkgver-r$pkgrel cargo"
+
+	_mv "$pkgdir"/usr/bin/cargo-clippy \
+	    "$pkgdir"/usr/bin/clippy-driver \
+	    "$subpkgdir"/usr/bin
+}
+
+_cargo_fmt() {
+	pkgdesc="Format Rust code (cargo plugin)"
+	depends="$pkgname-std=$pkgver-r$pkgrel cargo rustfmt"
+	install_if="cargo=$pkgver-r$pkgrel rustfmt=$pkgver-r$pkgrel"
+
+	_mv "$pkgdir"/usr/bin/cargo-fmt "$subpkgdir"/usr/bin
+}
+
+_cargo_bashcomp() {
+	pkgdesc="Bash completion for cargo"
+	license="Apache-2.0 OR MIT"
+	depends=""
+	install_if="cargo=$pkgver-r$pkgrel bash-completion"
+
+	_mv "$pkgdir"/etc/bash_completion.d/cargo \
+	    "$subpkgdir"/usr/share/bash-completion/completions
+	rmdir -p "$pkgdir"/etc/bash_completion.d 2>/dev/null || true
+}
+
+_cargo_zshcomp() {
+	pkgdesc="ZSH completion for cargo"
+	license="Apache-2.0 OR MIT"
+	depends=""
+	install_if="cargo=$pkgver-r$pkgrel zsh"
+
+	_mv "$pkgdir"/usr/share/zsh/site-functions/_cargo \
+	    "$subpkgdir"/usr/share/zsh/site-functions/_cargo
+	rmdir -p "$pkgdir"/usr/share/zsh/site-functions 2>/dev/null || true
+}
+
+_cargo_doc() {
+	pkgdesc="The Rust package manager (documentation)"
+	license="Apache-2.0 OR MIT"
+	depends=""
+	install_if="cargo=$pkgver-r$pkgrel docs"
+
+	# XXX: This is hackish!
+	_mv "$pkgdir"/../$pkgname-doc/usr/share/man/man1/cargo* \
+	    "$subpkgdir"/usr/share/man/man1
+}
+
+rustfmt() {
+	pkgdesc="Format Rust code"
+	provides="rustfmt-bootstrap=$pkgver-r$pkgrel"
+	depends="$pkgname-std=$pkgver-r$pkgrel"
+
+	_mv "$pkgdir"/usr/bin/rustfmt "$subpkgdir"/usr/bin
+}
+
+_mv() {
+	local dest; for dest; do true; done  # get last argument
+	mkdir -p "$dest"
+	mv "$@"
+}
+
+sha512sums="e057ae638e4c3e54fdb367d48f4b85458121cee0d0ee1ed72f346940b8acad2f16cd9cc8abc16fcf4a17bf244b3300bb56a7e7be3bd0c23b034692c983b84fe8  rustc-1.77.1-src.tar.xz
+6d3c9de1df4828f72fe3e6b44184e6ebf563cb13834371567f1d089ca116e8f893cd5aeddcf741b769dbfc793575d6b7f6678c77d500669e90a0b852e051ab9b  0001-Fix-LLVM-build.patch
+1cb5b3eb10f9b3e05ab2ab30fa42a69009b30e7bd6a1ca81af6a5d4a7dfeebed2d5a3f2212ea72ec80b97ff374ffd0cbeba67de3265548ac3ac033dcaf5f7bc9  0002-Fix-linking-to-zlib-when-cross-compiling.patch
+619a0150bdc59ef8d844e9eff907e51015003164d17012b38bcac642618efb65e25ea4b1ead06d4b023caf02d4eb8dbd481daa04b42d0002a9986f05854c0ca4  0003-Fix-rustdoc-when-cross-compiling-on-musl.patch
+d0014f7ffb01c65448a806f31155a394deef1f4e776c9e080f88fb87ebc91030a866694079dbcfbc56b02928d151e5209c71c687aba1b01d0d864de484675525  0004-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
+b9412b30b05ddffac82e7c0c727434f66b18149383ab0ec4571ed9c4e27bd80a6fedd907c34b4f72b76abc84ee0e43f6bfc4941679f6384e0a524e1535eca453  0005-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+b34187a82cd3db02b8aac8f18147d653a7191b841e145460dfbff518a7747a6aa1c08721703929bfc7e446c9ed9512383a5eefaad2cb5c02d16e8f00d12627db  0006-Link-libssp_nonshared.a-on-all-musl-targets.patch
+47de5895cbb9787445bc5e94dcf36887baf3a3ac78730caa8d9bc245024b6ad591cf25cca79819dc3d5c8ca8c8af6d47e2631a7763797d4181a40e946ac97cd9  0007-test-failed-doctest-output-Fix-normalization.patch
+6850174cebb3dfb2f41e277b0b46db9cabe18c904f39a6775f8cd12dc6c237a7de820a5dc8c538f9b965c069b4197141f0613add096574a7df4ca2d1ae01ab4d  0008-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+5742aebf7b0e63f38bb98bc19b8d6f045332569b8c3a10e42aa8290fb4b56f7a791789f971ab6088ca376f2863648022c3ae040887481e86df67dfd323ae65b5  0009-Ignore-broken-and-non-applicable-tests.patch
+f8807ccdecaf7c1f005a06cce96498ce40d7bc35e9c01bb512953c4ef285f44579543d6c6636c80ec63f5773adf8194d2469a428b33ffe77ddb417b026f0147c  0010-Link-stage-2-tools-dynamically-to-libstd.patch
+4c0d4353ab85354b22d09071020596846acb574f26f768667b96726a4bac2b59c868cff332dca188ad60ba34783cc4b7ba1677836307d63709b35ed9c92818bb  0011-Move-debugger-scripts-to-usr-share-rust.patch
+64d048daf2bbf9acc5379c10bf5d60a45dff41189a09c8a31176bd634dccc8dad0afbd55429801e65adab30e89496cae80e930e9c1cbd969b14235b010bbab78  0012-Add-foxkit-target-specs.patch
+9a8c8a051169127578e099b4765cff62c9fdfb1bb7bd774eaf0172e1c77d5fe7f15581aca0cd3502a912b3d46d3557b779c5bcf0a03de164147b6f097eaa4ec2  powerpc-atomics.patch"
diff --git a/bootstrap/rust-1.77/powerpc-atomics.patch b/bootstrap/rust-1.77/powerpc-atomics.patch
new file mode 100644
index 000000000..b711b8009
--- /dev/null
+++ b/bootstrap/rust-1.77/powerpc-atomics.patch
@@ -0,0 +1,48 @@
+--- rustc-1.60.0-src/vendor/valuable/no_atomic.rs.old	2022-04-04 11:10:57.000000000 +0000
++++ rustc-1.60.0-src/vendor/valuable/no_atomic.rs	2022-11-23 07:36:37.687029241 +0000
+@@ -32,6 +32,7 @@
+     "mipsel-unknown-none",
+     "mipsisa32r6-unknown-linux-gnu",
+     "mipsisa32r6el-unknown-linux-gnu",
++    "powerpc-foxkit-linux-musl",
+     "powerpc-unknown-freebsd",
+     "powerpc-unknown-linux-gnu",
+     "powerpc-unknown-linux-gnuspe",
+--- rustc-1.60.0-src/vendor/valuable/.cargo-checksum.json.old	2022-04-04 11:10:57.000000000 +0000
++++ rustc-1.60.0-src/vendor/valuable/.cargo-checksum.json	2022-11-23 07:38:07.397357603 +0000
+@@ -1 +1 @@
+-{"files":{"Cargo.lock":"fea5e41d2befef0b42734010a85f95548b5255ff1e4ee2dd2e6827adb8fe5f3e","Cargo.toml":"995a2454b4e3e583124d60b694e106ebd193b9742df3e050a6f49e5801b3597b","benches/structable.rs":"1baad763d1b0900004682b139efd58b17c974dc2068ede2229f8786e4a21372e","build.rs":"4ad508d818c27ee58bf7da2b9b4b425dae3e2656850327b3080fe2ad38767928","examples/derive.rs":"238473e63c0647cdb6652f1613575e24b323d40db5c8f3e5c32d64a3ea6b4048","examples/hello_world.rs":"75e48360e53b37e077e574d9c1aa2754b197f551ac5d604b03ebec9d31bab5cf","examples/print.rs":"924c55402b18e518317acc013a6cf407fcc13532c1eca8d9cd5f5631e79df960","no_atomic.rs":"b1c5cb0bd10733eb20516d10edc047b45aa67943f3347ae44fb779ed7fc7aff2","src/enumerable.rs":"008fe833c558f7e956ba0238a9d66947a671f66c5762905ed79d48a428c0ad44","src/field.rs":"c3d96f215c4bfc2a3910d0616fb335332d17f7dcf93ca739c933d88e1f98d229","src/lib.rs":"6954630c4c7c389192f3f8b5097076bbba6e43b5c4cd4ec68b4ffc18bff0a5b4","src/listable.rs":"f1a0743ed650604634972c19b66505a5727a6a6e2d7b54861e65cdcf10949432","src/mappable.rs":"ef7d334ef00d6b34cbff45b73b13935de6659933abafff9ad3d5d2a16d7ccac1","src/named_values.rs":"df5009074379ea59b02ebaf730890d0a4b6fa5c67c4057cc60f84d3652ca2bc5","src/slice.rs":"e382f56eb14ea7848276a4c8bda537f5207a4a6ed7a4b2ee4d2dde7feebce3b4","src/structable.rs":"369b17701d59bab138eac22ec043d434a052f49976236cc5ee680e72ca23ed6e","src/tuplable.rs":"e8b64a0761263666d984257109b5d54337cd97be59f08b08ec153e68ec1636c5","src/valuable.rs":"f8fdef201d3181935330fb86b27c455a5c86079f9f2cad363cda765801d7dd50","src/value.rs":"479d2c5b9d84c930e3abfe0032734ad92b243cf095f5fea6226a9da5eec81484","src/visit.rs":"060bacd3e1c0b333692f96c3ca970ca47a859cc28700713630996d9f0dc1668e"},"package":"830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"}
+\ No newline at end of file
++{"files":{"Cargo.lock":"fea5e41d2befef0b42734010a85f95548b5255ff1e4ee2dd2e6827adb8fe5f3e","Cargo.toml":"995a2454b4e3e583124d60b694e106ebd193b9742df3e050a6f49e5801b3597b","benches/structable.rs":"1baad763d1b0900004682b139efd58b17c974dc2068ede2229f8786e4a21372e","build.rs":"4ad508d818c27ee58bf7da2b9b4b425dae3e2656850327b3080fe2ad38767928","examples/derive.rs":"238473e63c0647cdb6652f1613575e24b323d40db5c8f3e5c32d64a3ea6b4048","examples/hello_world.rs":"75e48360e53b37e077e574d9c1aa2754b197f551ac5d604b03ebec9d31bab5cf","examples/print.rs":"924c55402b18e518317acc013a6cf407fcc13532c1eca8d9cd5f5631e79df960","no_atomic.rs":"66d1146a63de2d24058f657aa14570038b96795a7facbab11402a96b6008f01a","src/enumerable.rs":"008fe833c558f7e956ba0238a9d66947a671f66c5762905ed79d48a428c0ad44","src/field.rs":"c3d96f215c4bfc2a3910d0616fb335332d17f7dcf93ca739c933d88e1f98d229","src/lib.rs":"6954630c4c7c389192f3f8b5097076bbba6e43b5c4cd4ec68b4ffc18bff0a5b4","src/listable.rs":"f1a0743ed650604634972c19b66505a5727a6a6e2d7b54861e65cdcf10949432","src/mappable.rs":"ef7d334ef00d6b34cbff45b73b13935de6659933abafff9ad3d5d2a16d7ccac1","src/named_values.rs":"df5009074379ea59b02ebaf730890d0a4b6fa5c67c4057cc60f84d3652ca2bc5","src/slice.rs":"e382f56eb14ea7848276a4c8bda537f5207a4a6ed7a4b2ee4d2dde7feebce3b4","src/structable.rs":"369b17701d59bab138eac22ec043d434a052f49976236cc5ee680e72ca23ed6e","src/tuplable.rs":"e8b64a0761263666d984257109b5d54337cd97be59f08b08ec153e68ec1636c5","src/valuable.rs":"f8fdef201d3181935330fb86b27c455a5c86079f9f2cad363cda765801d7dd50","src/value.rs":"479d2c5b9d84c930e3abfe0032734ad92b243cf095f5fea6226a9da5eec81484","src/visit.rs":"060bacd3e1c0b333692f96c3ca970ca47a859cc28700713630996d9f0dc1668e"},"package":"830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"}
+--- rustc-1.77.1-src/vendor/crossbeam-epoch-0.9.15/no_atomic.rs.old	2024-03-26 23:47:50.000000000 -0500
++++ rustc-1.77.1-src/vendor/crossbeam-epoch-0.9.15/no_atomic.rs	2024-07-30 00:22:08.722849670 -0500
+@@ -41,6 +41,7 @@
+     "mipsisa32r6-unknown-linux-gnu",
+     "mipsisa32r6el-unknown-linux-gnu",
+     "msp430-none-elf",
++    "powerpc-foxkit-linux-musl",
+     "powerpc-unknown-freebsd",
+     "powerpc-unknown-linux-gnu",
+     "powerpc-unknown-linux-gnuspe",
+--- rustc-1.77.1-src/vendor/crossbeam-epoch-0.9.15/.cargo-checksum.json.old	2024-03-26 23:47:50.000000000 -0500
++++ rustc-1.77.1-src/vendor/crossbeam-epoch-0.9.15/.cargo-checksum.json	2024-07-30 00:22:57.837722060 -0500
+@@ -1 +1 @@
+-{"files":{"CHANGELOG.md":"fb7137e9387e107a35cb94b8ef2312e37066797f13ec24fae82e6265bd68ce34","Cargo.lock":"da576c190d52b8da0b2e23cfd23218c207f78a5f01b9fe2e44f6377669c7222b","Cargo.toml":"7c03d7a6b0655f7b4f15888ac25a78136acf456ec02e2a5647162ca1179c0a25","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d67d0cf57751a019707dd95785345ee181a10ea80237789bc3c19bf28c0d45ca","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build-common.rs":"502cb7494549bed6fa10ac7bea36e880eeb60290dc69b679ac5c92b376469562","build.rs":"901be3c21843440be5c456ff049f57f72ee5ec365918a772ad2a4751e52f69c5","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"5f75132808d9e8d6e266fe77f9e20bbc35855a1c37a5dbc0940b3e989bca1a94","src/atomic.rs":"1bd4275c1411852024533e8a70959dfedf72029e3253544d1fbb0cc18b6fd519","src/collector.rs":"29e5911f61510247659b0090517bd1a38d11e1ed86e35811603cb599962d9a58","src/default.rs":"62edf5e1f934eb82d8d7f010d6f25366e6851145a6f0a162372202bb63da1f3a","src/deferred.rs":"092c49e65d5f0ccad8c868b9bcaf431b580c98b7efed98c3797d82d0b9d0c471","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"f4439909152d38c03b6dfb6eeba6c9f07c39962187d461c92a492c27c258670b","src/internal.rs":"ac40ce276f0ed3dfd561926b78f775592eabb90790e177edde41fe50c13b8256","src/lib.rs":"a036d73230d0574011e67be11d275fe46439a1b5fc3295cb242d9179e5e0a220","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"326e32489d467e974c441120640a8338aa55da55c24b20276075ce9053997326","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"}
+\ No newline at end of file
++{"files":{"CHANGELOG.md":"fb7137e9387e107a35cb94b8ef2312e37066797f13ec24fae82e6265bd68ce34","Cargo.lock":"da576c190d52b8da0b2e23cfd23218c207f78a5f01b9fe2e44f6377669c7222b","Cargo.toml":"7c03d7a6b0655f7b4f15888ac25a78136acf456ec02e2a5647162ca1179c0a25","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d67d0cf57751a019707dd95785345ee181a10ea80237789bc3c19bf28c0d45ca","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build-common.rs":"502cb7494549bed6fa10ac7bea36e880eeb60290dc69b679ac5c92b376469562","build.rs":"901be3c21843440be5c456ff049f57f72ee5ec365918a772ad2a4751e52f69c5","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"c304c181ac317718bd61e596e7ec4a1876cb204997d3dfc46dc5fa0ffae7480f","src/atomic.rs":"1bd4275c1411852024533e8a70959dfedf72029e3253544d1fbb0cc18b6fd519","src/collector.rs":"29e5911f61510247659b0090517bd1a38d11e1ed86e35811603cb599962d9a58","src/default.rs":"62edf5e1f934eb82d8d7f010d6f25366e6851145a6f0a162372202bb63da1f3a","src/deferred.rs":"092c49e65d5f0ccad8c868b9bcaf431b580c98b7efed98c3797d82d0b9d0c471","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"f4439909152d38c03b6dfb6eeba6c9f07c39962187d461c92a492c27c258670b","src/internal.rs":"ac40ce276f0ed3dfd561926b78f775592eabb90790e177edde41fe50c13b8256","src/lib.rs":"a036d73230d0574011e67be11d275fe46439a1b5fc3295cb242d9179e5e0a220","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"326e32489d467e974c441120640a8338aa55da55c24b20276075ce9053997326","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"}
+--- rustc-1.77.1-src/vendor/crossbeam-utils-0.8.16/no_atomic.rs.old	2024-03-26 23:47:50.000000000 -0500
++++ rustc-1.77.1-src/vendor/crossbeam-utils-0.8.16/no_atomic.rs	2024-07-30 00:23:57.431497655 -0500
+@@ -41,6 +41,7 @@
+     "mipsisa32r6-unknown-linux-gnu",
+     "mipsisa32r6el-unknown-linux-gnu",
+     "msp430-none-elf",
++    "powerpc-foxkit-linux-musl",
+     "powerpc-unknown-freebsd",
+     "powerpc-unknown-linux-gnu",
+     "powerpc-unknown-linux-gnuspe",
+--- rustc-1.77.1-src/vendor/crossbeam-utils-0.8.16/.cargo-checksum.json.old	2024-03-26 23:47:50.000000000 -0500
++++ rustc-1.77.1-src/vendor/crossbeam-utils-0.8.16/.cargo-checksum.json	2024-07-30 00:24:31.867900296 -0500
+@@ -1 +1 @@
+-{"files":{"CHANGELOG.md":"cb1ed07b5828eaa1f8b8ef68ab4332c479000dd8585d4f62f34c5fd97c96981a","Cargo.toml":"802d99b09fef821afec338d876fe2285cd16cae3e971526251adaf5e34a9c275","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build-common.rs":"502cb7494549bed6fa10ac7bea36e880eeb60290dc69b679ac5c92b376469562","build.rs":"ec1d47ec36b3670a6e67955a104851ee7125616888e78bd03b93304e12cd1c50","no_atomic.rs":"5f75132808d9e8d6e266fe77f9e20bbc35855a1c37a5dbc0940b3e989bca1a94","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"24dc95e68c5cd83744b10b0e41072dd39f49f1573c6ceac826837a662a11916e","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"be78811af56277fcd983f7f3303cfc8686c7b1b676a4a39f22d7fc2d96b53e6b","src/sync/sharded_lock.rs":"f27cff33fd00cb6cee51cdb2d429df99ae4b81a1fefb99655ae7e3506f534fd1","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"1c8273582381a2e1daedf59685d8c0798306d2cd2dde0945035455b03788169f","tests/atomic_cell.rs":"9dacf69273288b4689b88957e2920580d27dcb1a1fb9f34e2029a28cf6b9121c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"}
+\ No newline at end of file
++{"files":{"CHANGELOG.md":"cb1ed07b5828eaa1f8b8ef68ab4332c479000dd8585d4f62f34c5fd97c96981a","Cargo.toml":"802d99b09fef821afec338d876fe2285cd16cae3e971526251adaf5e34a9c275","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build-common.rs":"502cb7494549bed6fa10ac7bea36e880eeb60290dc69b679ac5c92b376469562","build.rs":"ec1d47ec36b3670a6e67955a104851ee7125616888e78bd03b93304e12cd1c50","no_atomic.rs":"c304c181ac317718bd61e596e7ec4a1876cb204997d3dfc46dc5fa0ffae7480f","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"24dc95e68c5cd83744b10b0e41072dd39f49f1573c6ceac826837a662a11916e","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"be78811af56277fcd983f7f3303cfc8686c7b1b676a4a39f22d7fc2d96b53e6b","src/sync/sharded_lock.rs":"f27cff33fd00cb6cee51cdb2d429df99ae4b81a1fefb99655ae7e3506f534fd1","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"1c8273582381a2e1daedf59685d8c0798306d2cd2dde0945035455b03788169f","tests/atomic_cell.rs":"9dacf69273288b4689b88957e2920580d27dcb1a1fb9f34e2029a28cf6b9121c","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"}