diff options
Diffstat (limited to 'bootstrap/rust-1.66')
18 files changed, 1573 insertions, 0 deletions
diff --git a/bootstrap/rust-1.66/0001-Fix-LLVM-build.patch b/bootstrap/rust-1.66/0001-Fix-LLVM-build.patch new file mode 100644 index 000000000..cee283189 --- /dev/null +++ b/bootstrap/rust-1.66/0001-Fix-LLVM-build.patch @@ -0,0 +1,25 @@ +From 1a5423cf2c7eb0784fcc9b789cdd271efbf43d45 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/14] Fix LLVM build + +--- + src/bootstrap/lib.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs +index 3130dcc277b..c6ac4f9e636 100644 +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -1066,7 +1066,7 @@ fn cflags(&self, target: TargetSelection, which: GitRepo, c: CLang) -> Vec<Strin + .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 on macOS then we add a few unconditional flags +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0002-Fix-linking-to-zlib-when-cross-compiling.patch b/bootstrap/rust-1.66/0002-Fix-linking-to-zlib-when-cross-compiling.patch new file mode 100644 index 000000000..e99155e78 --- /dev/null +++ b/bootstrap/rust-1.66/0002-Fix-linking-to-zlib-when-cross-compiling.patch @@ -0,0 +1,35 @@ +From d5caf4a4c7cfee3a53892b6ad90603ae86321baa 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/14] Fix linking to zlib when cross-compiling + +--- + compiler/rustc_llvm/build.rs | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs +index 28e092c1eb72c..00e5cff65d851 100644 +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -234,10 +234,10 @@ 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"); ++ cmd.arg("--system-libs"); ++ cmd.args(&components); + +- if !is_crossed { +- cmd.arg("--system-libs"); +- } else if target.contains("windows-gnu") { ++ if target.contains("windows-gnu") { + println!("cargo:rustc-link-lib=shell32"); + println!("cargo:rustc-link-lib=uuid"); + } else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") { +@@ -250,7 +250,6 @@ fn main() { + // 32-bit targets need to link libatomic. + println!("cargo:rustc-link-lib=atomic"); + } +- 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.66/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch b/bootstrap/rust-1.66/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch new file mode 100644 index 000000000..facd399e0 --- /dev/null +++ b/bootstrap/rust-1.66/0003-Fix-rustdoc-when-cross-compiling-on-musl.patch @@ -0,0 +1,42 @@ +From 05264618f6902def4daf5a5fd087d6a831e3ff57 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/14] Fix rustdoc when cross-compiling on musl + +musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. +--- + src/bootstrap/bin/rustdoc.rs | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs +index 5f85fc5aa5903..01e81fc398409 100644 +--- a/src/bootstrap/bin/rustdoc.rs ++++ b/src/bootstrap/bin/rustdoc.rs +@@ -27,9 +27,6 @@ fn main() { + Err(_) => 0, + }; + +- let mut dylib_path = dylib_path(); +- dylib_path.insert(0, PathBuf::from(libdir.clone())); +- + let mut cmd = Command::new(rustdoc); + + if target.is_some() { +@@ -42,7 +39,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 +@@ -78,7 +75,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.66/0004-Use-static-native-libraries-when-linking-static-exec.patch b/bootstrap/rust-1.66/0004-Use-static-native-libraries-when-linking-static-exec.patch new file mode 100644 index 000000000..a94d72ea4 --- /dev/null +++ b/bootstrap/rust-1.66/0004-Use-static-native-libraries-when-linking-static-exec.patch @@ -0,0 +1,66 @@ +From 741978c5a73185b817cb2052413c0ef644dfad16 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Fri, 8 Sep 2017 00:05:18 -0500 +Subject: [PATCH 04/14] Use static native libraries when linking static executables + +On ELF targets like Linux, gcc/ld will create a dynamically-linked +executable without warning, even when passed `-static`, when asked to +link to a `.so`. Avoid this confusing and unintended behavior by always +using the static version of libraries when trying to link static +executables. +--- + compiler/rustc_codegen_ssa/src/back/link.rs | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs +index 6cce95427463c..ef3fcef87e2a0 100644 +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs +@@ -2064,7 +2064,7 @@ fn linker_with_args<'a>( + // together with their respective upstream crates, and in their originally specified order. + // This may be slightly breaking due to our use of `--as-needed` and needs a crater run. + if sess.opts.unstable_opts.link_native_libraries { +- add_upstream_native_libraries(cmd, sess, codegen_results); ++ add_upstream_native_libraries(cmd, sess, codegen_results, crate_type); + } + + // Link with the import library generated for any raw-dylib functions. +@@ -2705,8 +2705,7 @@ fn add_upstream_rust_crates<'a>( + } + } + +-/// Link in all of our upstream crates' native dependencies. Remember that all of these upstream +-/// native dependencies are all non-static dependencies. We've got two cases then: ++/// Link in all of our upstream crates' native dependencies. We have two cases: + /// + /// 1. The upstream crate is an rlib. In this case we *must* link in the native dependency because + /// the rlib is just an archive. +@@ -2724,6 +2723,7 @@ fn add_upstream_native_libraries( + cmd: &mut dyn Linker, + sess: &Session, + codegen_results: &CodegenResults, ++ crate_type: CrateType, + ) { + let mut last = (None, NativeLibKind::Unspecified, None); + for &cnum in &codegen_results.crate_info.used_crates { +@@ -2748,7 +2748,19 @@ fn add_upstream_native_libraries( + NativeLibKind::Dylib { as_needed } => { + cmd.link_dylib(name, verbatim, as_needed.unwrap_or(true)) + } +- NativeLibKind::Unspecified => cmd.link_dylib(name, verbatim, true), ++ NativeLibKind::Unspecified => { ++ // On some targets, like Linux, linking a static executable inhibits using ++ // dylibs at all. Force native libraries to be static, even if for example ++ // an upstream rlib was originally linked against a native shared library. ++ if crate_type == config::CrateType::Executable ++ && sess.crt_static(Some(crate_type)) ++ && !sess.target.options.crt_static_allows_dylibs ++ { ++ cmd.link_staticlib(name, verbatim) ++ } else { ++ cmd.link_dylib(name, verbatim, true) ++ } ++ }, + NativeLibKind::Framework { as_needed } => { + cmd.link_framework(name, as_needed.unwrap_or(true)) + } diff --git a/bootstrap/rust-1.66/0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch b/bootstrap/rust-1.66/0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch new file mode 100644 index 000000000..81cc36edb --- /dev/null +++ b/bootstrap/rust-1.66/0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch @@ -0,0 +1,519 @@ +From 29098b3d6718822fe41c6399cc7604422c8efd0c Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Fri, 8 Sep 2017 22:11:14 -0500 +Subject: [PATCH 05/14] Remove musl_root and CRT fallback from musl targets + +--- + compiler/rustc_codegen_ssa/src/back/link.rs | 6 +-- + compiler/rustc_target/src/spec/crt_objects.rs | 25 ----------- + .../rustc_target/src/spec/linux_musl_base.rs | 4 -- + config.toml.example | 17 -------- + src/bootstrap/cc_detect.rs | 27 +----------- + src/bootstrap/compile.rs | 42 +------------------ + src/bootstrap/config.rs | 10 ----- + src/bootstrap/configure.py | 28 ------------- + src/bootstrap/lib.rs | 19 --------- + src/bootstrap/sanity.rs | 23 ---------- + .../dist-i586-gnu-i586-i686-musl/Dockerfile | 2 - + .../host-x86_64/dist-various-1/Dockerfile | 8 ---- + .../host-x86_64/dist-various-2/Dockerfile | 3 +- + .../host-x86_64/dist-x86_64-musl/Dockerfile | 1 - + .../host-x86_64/test-various/Dockerfile | 1 - + 15 files changed, 5 insertions(+), 211 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs +index 8f9eb619999f5..2c1c462adbf9f 100644 +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs +@@ -1613,7 +1613,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(sess: &Session, crate_type: CrateType) -> bool { ++fn self_contained(sess: &Session, _crate_type: CrateType) -> bool { + if let Some(self_contained) = sess.opts.cg.link_self_contained { + return self_contained; + } +@@ -1621,10 +1621,6 @@ fn self_contained(sess: &Session, crate_type: CrateType) -> bool { + match sess.target.link_self_contained { + LinkSelfContainedDefault::False => false, + LinkSelfContainedDefault::True => true, +- // 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::Musl => sess.crt_static(Some(crate_type)), + LinkSelfContainedDefault::Mingw => { + sess.host == sess.target + && sess.target.vendor != "uwp" +diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs +index c126390f5a908..63e3074b5b7c2 100644 +--- a/compiler/rustc_target/src/spec/crt_objects.rs ++++ b/compiler/rustc_target/src/spec/crt_objects.rs +@@ -63,28 +63,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"]), +@@ -130,7 +108,6 @@ pub(super) fn post_wasi_self_contained() -> CrtObjects { + pub enum LinkSelfContainedDefault { + False, + True, +- Musl, + Mingw, + } + +@@ -141,7 +118,6 @@ impl FromStr for LinkSelfContainedDefault { + Ok(match s { + "false" => LinkSelfContainedDefault::False, + "true" | "wasm" => LinkSelfContainedDefault::True, +- "musl" => LinkSelfContainedDefault::Musl, + "mingw" => LinkSelfContainedDefault::Mingw, + _ => return Err(()), + }) +@@ -153,7 +129,6 @@ impl ToJson for LinkSelfContainedDefault { + match *self { + LinkSelfContainedDefault::False => "false", + LinkSelfContainedDefault::True => "true", +- LinkSelfContainedDefault::Musl => "musl", + LinkSelfContainedDefault::Mingw => "mingw", + } + .to_json() +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 61553e71b4500..67d18c886eba5 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -1,13 +1,9 @@ +-use crate::spec::crt_objects::{self, LinkSelfContainedDefault}; + use crate::spec::TargetOptions; + + pub fn opts() -> TargetOptions { + let mut base = super::linux_base::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::Musl; + + // These targets statically link libc by default + base.crt_static_default = true; +diff --git a/config.toml.example b/config.toml.example +index a46813e4d7a3b..377d9b07ceb20 100644 +--- a/config.toml.example ++++ b/config.toml.example +@@ -533,14 +533,6 @@ changelog-seen = 2 + # behavior -- this may lead to miscompilations or other bugs. + #description = <none> (string) + +-# 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 +@@ -722,15 +714,6 @@ changelog-seen = 2 + # 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/cc_detect.rs b/src/bootstrap/cc_detect.rs +index 759a99c330c27..6f48fd8efc1b9 100644 +--- a/src/bootstrap/cc_detect.rs ++++ b/src/bootstrap/cc_detect.rs +@@ -41,8 +41,6 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> { + Some(PathBuf::from(ar)) + } else if target.contains("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") { +@@ -101,7 +99,7 @@ pub fn find(build: &mut Build) { + if let Some(cc) = config.and_then(|c| c.cc.as_ref()) { + cfg.compiler(cc); + } else { +- set_compiler(&mut cfg, Language::C, target, config, build); ++ set_compiler(&mut cfg, Language::C, target, config); + } + + let compiler = cfg.get_compiler(); +@@ -122,7 +120,7 @@ pub fn find(build: &mut Build) { + cfg.compiler(cxx); + true + } else if build.hosts.contains(&target) || build.build == target { +- set_compiler(&mut cfg, Language::CPlusPlus, target, config, build); ++ set_compiler(&mut cfg, Language::CPlusPlus, target, config); + true + } else { + // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars). +@@ -158,7 +156,6 @@ fn set_compiler( + compiler: Language, + target: TargetSelection, + config: Option<&Target>, +- build: &Build, + ) { + match &*target.triple { + // When compiling for android we may have the NDK configured in the +@@ -201,26 +198,6 @@ fn set_compiler( + } + } + +- "mips-unknown-linux-musl" => { +- if cfg.get_compiler().path().to_str() == Some("gcc") { +- cfg.compiler("mips-linux-musl-gcc"); +- } +- } +- "mipsel-unknown-linux-musl" => { +- if cfg.get_compiler().path().to_str() == Some("gcc") { +- cfg.compiler("mipsel-linux-musl-gcc"); +- } +- } +- +- t if t.contains("musl") => { +- if let Some(root) = build.musl_root(target) { +- let guess = root.join("bin/musl-gcc"); +- if guess.exists() { +- cfg.compiler(guess); +- } +- } +- } +- + _ => {} + } + } +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index e02a10b816408..a5bc42e797bf7 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -230,38 +230,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") { +- 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(native::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.ends_with("-wasi") { ++ if target.ends_with("-wasi") { + let srcdir = builder + .wasi_root(target) + .unwrap_or_else(|| { +@@ -350,15 +319,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car + .arg("--manifest-path") + .arg(builder.src.join("library/test/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.ends_with("-wasi") { + if let Some(p) = builder.wasi_root(target) { + let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap()); +diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs +index a8c403675d821..d1637104ff129 100644 +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -190,8 +190,6 @@ pub struct Config { + pub print_step_rusage: bool, + pub missing_tools: bool, + +- // Fallback musl-root for all targets +- pub musl_root: Option<PathBuf>, + pub prefix: Option<PathBuf>, + pub sysconfdir: Option<PathBuf>, + pub datadir: Option<PathBuf>, +@@ -429,8 +427,6 @@ pub struct Target { + pub sanitizers: Option<bool>, + pub profiler: 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, +@@ -723,7 +719,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", + verbose_tests: Option<bool> = "verbose-tests", + optimize_tests: Option<bool> = "optimize-tests", +@@ -770,8 +765,6 @@ define_config! { + sanitizers: Option<bool> = "sanitizers", + profiler: Option<bool> = "profiler", + 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", +@@ -1175,7 +1168,6 @@ impl Config { + set(&mut config.llvm_tools_enabled, rust.llvm_tools); + config.rustc_parallel = rust.parallel_compiler.unwrap_or(false); + config.rustc_default_linker = rust.default_linker; +- config.musl_root = rust.musl_root.map(PathBuf::from); + config.save_toolstates = rust.save_toolstates.map(PathBuf::from); + set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings)); + set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); +@@ -1235,8 +1227,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/configure.py b/src/bootstrap/configure.py +index 6b139decb5551..a2e19b8f4836d 100755 +--- a/src/bootstrap/configure.py ++++ b/src/bootstrap/configure.py +@@ -112,34 +112,6 @@ def v(*args): + "aarch64-linux-android NDK standalone path") + v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk", + "x86_64-linux-android NDK standalone path") +-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("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/lib.rs b/src/bootstrap/lib.rs +index 65a2e022ef5f6..08dc576bc2091 100644 +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -1168,25 +1168,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/sanity.rs b/src/bootstrap/sanity.rs +index e905517253c0a..ba1ca3c119546 100644 +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/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; + +@@ -190,28 +189,6 @@ than building it. + } + } + +- // Make sure musl-root is valid +- if target.contains("musl") { +- // 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.contains("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/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 26eb69f2eae93..8b2d087e63a8d 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 cd0f01faa1bfa..6951c9ea9b1b3 100644 +--- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile ++++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile +@@ -172,14 +172,6 @@ ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft + CC_riscv64gc_unknown_none_elf=false + + ENV RUST_CONFIGURE_ARGS \ +- --musl-root-armv5te=/musl-armv5te \ +- --musl-root-arm=/musl-arm \ +- --musl-root-armhf=/musl-armhf \ +- --musl-root-armv7hf=/musl-armv7hf \ +- --musl-root-mips=/musl-mips \ +- --musl-root-mipsel=/musl-mipsel \ +- --musl-root-mips64=/musl-mips64 \ +- --musl-root-mips64el=/musl-mips64el \ + --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 8250ec0c3119b..204048f2db149 100644 +--- a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile ++++ b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile +@@ -126,8 +126,7 @@ ENV TARGETS=$TARGETS,x86_64-unknown-none + RUN ln -s /usr/include/asm-generic /usr/local/include/asm + + ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \ +- --set target.wasm32-wasi.wasi-root=/wasm32-wasi \ +- --musl-root-armv7=/musl-armv7 ++ --set target.wasm32-wasi.wasi-root=/wasm32-wasi + + ENV EXTERNAL_LLVM 1 + +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 51645a81853fd..b9edb339cc0e5 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 +@@ -37,7 +37,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 b75e2f085cd3b..a9022b52d3324 100644 +--- a/src/ci/docker/host-x86_64/test-various/Dockerfile ++++ b/src/ci/docker/host-x86_64/test-various/Dockerfile +@@ -35,7 +35,6 @@ RUN sh /scripts/sccache.sh + ENV NO_DOWNLOAD_CI_LLVM 1 + + ENV RUST_CONFIGURE_ARGS \ +- --musl-root-x86_64=/usr/local/x86_64-linux-musl \ + --set build.nodejs=/node-v15.14.0-linux-x64/bin/node \ + --set rust.lld + diff --git a/bootstrap/rust-1.66/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/bootstrap/rust-1.66/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch new file mode 100644 index 000000000..b0fd2e1e3 --- /dev/null +++ b/bootstrap/rust-1.66/0006-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 06/14] 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 +@@ -49,7 +49,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.66/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch b/bootstrap/rust-1.66/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch new file mode 100644 index 000000000..7e40003ca --- /dev/null +++ b/bootstrap/rust-1.66/0007-Link-libssp_nonshared.a-on-all-musl-targets.patch @@ -0,0 +1,28 @@ +From 5e7144b4963e6c733033738dbf5552c9ae0f19e3 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 3 Nov 2019 17:01:32 -0600 +Subject: [PATCH 07/14] Link libssp_nonshared.a on all musl targets + +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 67d18c886eba5..f9be51095d6fc 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -1,10 +1,13 @@ +-use crate::spec::TargetOptions; ++use crate::spec::{Cc, LinkerFlavor, Lld, TargetOptions}; + + pub fn opts() -> TargetOptions { + let mut base = super::linux_base::opts(); + + base.env = "musl".into(); + ++ // libssp_nonshared.a is needed for __stack_chk_fail_local when using libc.so ++ base.add_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.66/0008-test-failed-doctest-output-Fix-normalization.patch b/bootstrap/rust-1.66/0008-test-failed-doctest-output-Fix-normalization.patch new file mode 100644 index 000000000..b31ce81d2 --- /dev/null +++ b/bootstrap/rust-1.66/0008-test-failed-doctest-output-Fix-normalization.patch @@ -0,0 +1,36 @@ +From 26ba9c852ad73dcc0401b74534b34bf33d5b6444 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 7 Oct 2019 18:36:28 -0500 +Subject: [PATCH 08/14] 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 +--- + src/test/rustdoc-ui/failed-doctest-output.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs +index 92473b49e14..ed29b446aba 100644 +--- a/src/test/rustdoc-ui/failed-doctest-output.rs ++++ b/src/test/rustdoc-ui/failed-doctest-output.rs +@@ -7,7 +7,7 @@ + + // compile-flags:--test --test-args --test-threads=1 + // rustc-env:RUST_BACKTRACE=0 +-// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR" ++// normalize-stdout-test: "[[:graph:]]*src/test/rustdoc-ui" -> "$$DIR" + // normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME" + // failure-status: 101 + +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/bootstrap/rust-1.66/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch new file mode 100644 index 000000000..dfefc36ec --- /dev/null +++ b/bootstrap/rust-1.66/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch @@ -0,0 +1,25 @@ +From 765788107fca34a8fcedf03a8902932255ad01cb Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 01:32:20 +0000 +Subject: [PATCH 09/14] 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. +--- + .../run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index 1e267fb9576..30c33c5c13d 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,2 +1,4 @@ ++-include ../tools.mk ++ + all: +- '$(PYTHON)' test.py ++ env '$(HOST_RPATH_ENV)' '$(PYTHON)' test.py +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/bootstrap/rust-1.66/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch new file mode 100644 index 000000000..e55c1bffc --- /dev/null +++ b/bootstrap/rust-1.66/0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch @@ -0,0 +1,30 @@ +From 5f08947cef0556245748e5a3d0b9d1da926939ff Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sat, 6 Oct 2018 04:01:48 +0000 +Subject: [PATCH 10/14] test/use-extern-for-plugins: Don't assume multilib + +--- + src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +index 838b1a2719b..94fa9f6d067 100644 +--- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile ++++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +@@ -4,12 +4,7 @@ + # ignore-openbsd + # ignore-sunos + +-HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') +-ifeq ($(findstring i686,$(HOST)),i686) +-TARGET := $(subst i686,x86_64,$(HOST)) +-else +-TARGET := $(subst x86_64,i686,$(HOST)) +-endif ++TARGET := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') + + all: + $(RUSTC) foo.rs -C extra-filename=-host +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0011-Ignore-broken-and-non-applicable-tests.patch b/bootstrap/rust-1.66/0011-Ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 000000000..0843a2d05 --- /dev/null +++ b/bootstrap/rust-1.66/0011-Ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,61 @@ +From b7ab3ecb6233472afdbb5247b4c48cc8f45ad8ac Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 11/14] 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 +--- + src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile | 2 ++ + src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 2 ++ + src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++ + src/test/ui/env-funky-keys.rs | 1 + + 4 files changed, 7 insertions(+) + +diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile +index f124ca2ab61..363b18f0985 100644 +--- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile ++++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile +@@ -1,3 +1,5 @@ ++# ignore-aarch64 ++ + include ../tools.mk + + all: +diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +index 5876fbc94bc..5f167ece1a2 100644 +--- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile ++++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +@@ -1,3 +1,5 @@ ++# ignore-test ++ + include ../tools.mk + + all: +diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +index 30c33c5c13d..d733bb1c557 100644 +--- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile ++++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile +@@ -1,3 +1,5 @@ ++# ignore-test ++ + -include ../tools.mk + + all: +diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs +index 4548d333947..00dd85244d8 100644 +--- a/src/test/ui/env-funky-keys.rs ++++ b/src/test/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 +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0012-Link-stage-2-tools-dynamically-to-libstd.patch b/bootstrap/rust-1.66/0012-Link-stage-2-tools-dynamically-to-libstd.patch new file mode 100644 index 000000000..9821568f8 --- /dev/null +++ b/bootstrap/rust-1.66/0012-Link-stage-2-tools-dynamically-to-libstd.patch @@ -0,0 +1,25 @@ +From 74767e8d9cad131d8fb67054df8110065649e6dd Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 24 Sep 2018 23:42:23 +0000 +Subject: [PATCH 12/14] Link stage 2 tools dynamically to libstd + +--- + src/bootstrap/builder.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index 0d387ff1e37..f3ecd9067d3 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -2077,7 +2077,7 @@ pub fn cargo( + // 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"); + } + +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0013-Move-debugger-scripts-to-usr-share-rust.patch b/bootstrap/rust-1.66/0013-Move-debugger-scripts-to-usr-share-rust.patch new file mode 100644 index 000000000..63f5d9fc8 --- /dev/null +++ b/bootstrap/rust-1.66/0013-Move-debugger-scripts-to-usr-share-rust.patch @@ -0,0 +1,69 @@ +From 137de7f431c116721de728a121f0c38aa24f58b6 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 17 Sep 2018 02:09:10 +0000 +Subject: [PATCH 13/14] 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 f5ae8103cb0..28c9f3c05bc 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -501,7 +501,7 @@ fn make_run(run: RunConfig<'_>) { + 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 b950cea79ed..559bfe3f1f9 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" + + # Run GDB with the additional arguments that load the pretty printers + # Set the environment variable `RUST_GDB` to overwrite the call to a +diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui +index 9744913b686..8722acdcc52 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" + + # Set the environment variable `RUST_GDB` to overwrite the call to a + # different/specific command (defaults to `gdb`). +diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb +index bce72f1bad6..8abb0124527 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" "$@" +-- +2.35.1 + diff --git a/bootstrap/rust-1.66/0014-Add-foxkit-target-specs.patch b/bootstrap/rust-1.66/0014-Add-foxkit-target-specs.patch new file mode 100644 index 000000000..dc224894d --- /dev/null +++ b/bootstrap/rust-1.66/0014-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 14/14] Add foxkit target specs + +--- + .../src/spec/aarch64_foxkit_linux_musl.rs | 11 +++++++++++ + .../src/spec/armv7_foxkit_linux_musleabihf.rs | 11 +++++++++++ + .../rustc_target/src/spec/i586_foxkit_linux_musl.rs | 11 +++++++++++ + compiler/rustc_target/src/spec/mod.rs | 7 +++++++ + .../src/spec/powerpc64_foxkit_linux_musl.rs | 11 +++++++++++ + .../src/spec/powerpc_foxkit_linux_musl.rs | 11 +++++++++++ + .../rustc_target/src/spec/x86_64_foxkit_linux_musl.rs | 11 +++++++++++ + 7 files changed, 73 insertions(+) + create mode 100644 compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/armv7_foxkit_linux_musleabihf.rs + create mode 100644 compiler/rustc_target/src/spec/i586_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/powerpc64_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/powerpc_foxkit_linux_musl.rs + create mode 100644 compiler/rustc_target/src/spec/x86_64_foxkit_linux_musl.rs + +diff --git a/compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..4bdd51af4fe +--- /dev/null ++++ b/compiler/rustc_target/src/spec/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/armv7_foxkit_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_foxkit_linux_musleabihf.rs +new file mode 100644 +index 00000000000..994f3c39e7c +--- /dev/null ++++ b/compiler/rustc_target/src/spec/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/i586_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/i586_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..028e4b5e930 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/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 +@@ -1011,6 +1011,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/powerpc64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..04a50f84b60 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/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/powerpc_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..7bca52c4299 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/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/x86_64_foxkit_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_foxkit_linux_musl.rs +new file mode 100644 +index 00000000000..1ff73687c00 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/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.66/0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch b/bootstrap/rust-1.66/0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch new file mode 100644 index 000000000..6a65b8f35 --- /dev/null +++ b/bootstrap/rust-1.66/0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch @@ -0,0 +1,25 @@ +From fc0cf16ce6bdf46929c91a4826b93370ba08a970 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sun, 3 Jul 2022 18:24:44 -0500 +Subject: [PATCH] psm: Use OpenPOWER ABI on BE PowerPC 64/musl + +The musl libc uses ELFv2 (OpenPOWER ABI) on both big and little endian +64-bit PowerPC targets. Before this change, running `cargo test` on a +powerpc64-foxkit-linux-musl host showed a SIGSEGV. Now all tests pass. + +--- rustc-1.60.0-src/vendor/psm/build.rs.old 2022-04-04 06:10:56.000000000 -0500 ++++ rustc-1.60.0-src/vendor/psm/build.rs 2022-07-03 18:52:46.829357810 -0500 +@@ -41,6 +41,7 @@ + ("arm", _, _, _) => Some(("src/arch/arm_aapcs.s", true)), + ("aarch64", _, _, _) => Some(("src/arch/aarch_aapcs64.s", true)), + ("powerpc", _, _, _) => Some(("src/arch/powerpc32.s", true)), ++ ("powerpc64", _, _, "musl") => Some(("src/arch/powerpc64_openpower.s", true)), + ("powerpc64", "little", _, _) => Some(("src/arch/powerpc64_openpower.s", true)), + ("powerpc64", _, _, _) => Some(("src/arch/powerpc64.s", true)), + ("s390x", _, _, _) => Some(("src/arch/zseries_linux.s", true)), +--- rustc-1.60.0-src/vendor/psm/.cargo-checksum.json.old 2022-04-04 06:10:56.000000000 -0500 ++++ rustc-1.60.0-src/vendor/psm/.cargo-checksum.json 2022-07-03 18:53:10.636824874 -0500 +@@ -1 +1 @@ +-{"files":{"Cargo.lock":"2928b712f89aee2b62581df1e552b7cb8288d999ba180291b4900b86a05c6d8d","Cargo.toml":"c2c5a0154a80cffc82349cd98f819ea1259c92f195c5878ceefb66e06b14d28c","LICENSE-APACHE":"965a63a81d9a2fbeb5f9096954dabb49690f9dffcdac9825f675b25c807252a2","LICENSE-MIT":"3e3714aa69bd874601741fd7d7ad5298740cece37778e279fc1ab4451c5a11af","README.mkd":"6385ecaced99b0a29a5b40166d34ef9312f322c1b8ad002bef3b08cd6c3e29b2","build.rs":"1d7872546e6924bbb2947edc055ddd01f48683cc80d9d75a846adb65540345f0","examples/info.rs":"8ffb89912304ecbf3d714dcc094f42e86fdd0738625b2e76be2e7d59ab0736cf","examples/on_stack_fibo.rs":"287f0a08b177a97366a5da39e24e33e1f4bbe30a1f2473956721c8a9d93926a4","examples/on_stack_fibo_alloc_each_frame.rs":"e084041bbb81d51b195a4db539a765409272916df29c83a62213a93de4b6fca3","examples/panics.rs":"6791fe0dda9456b3becf989cbc89bc45ae27302e633572a57bbf10a57b830076","examples/replace_stack_1.rs":"374a28881f5e5dbf9db9b9e34929fb7a7e6f3910d782a6718f53ac269807b990","examples/thread.rs":"3cf92882aff96151608584d63535701cc8e5ae953d7ecf706d77371180bff025","src/arch/aarch64_armasm.asm":"1c737338287f3de981fbae97f104ac5e49425ba7fbcb4f7d80120afae47a86d5","src/arch/aarch_aapcs64.s":"459b8cd5a96104893e8f849ac83369101d7204c933841672df162104bebd2375","src/arch/arm_aapcs.s":"4ada635e8528279bd0326654f5203b6bdc94dd68c94fdef5de551384ba1b1747","src/arch/arm_armasm.asm":"e3b514169f19368b0b49374412de38bd9f50576e7b93b64d685a0f84fa8f4c91","src/arch/mips64_eabi.s":"4e6f95f89ba72fc4dd1a9a547920764f66d98251d236941cee4d227010484520","src/arch/mips_eabi.s":"8b7927fd63660eb276e2951f28df6b11920f04be4dc17a16b66ad386da12c4c3","src/arch/powerpc32.s":"0b508a65dec7254ba2e0dc65a2c9e86c21069fe62f5d7c41f5190415a4885912","src/arch/powerpc64.s":"c1602d09d12ba1df48fc96af0f827f8679fc93cee728813527fb1b817a788911","src/arch/powerpc64_openpower.s":"421b11cc7381427d1e2acb4e681c9836ccfea0b79930492f0a99ec4d27495e58","src/arch/psm.h":"2cebda3740aa73b167b8ec18e3d2202ca46e400a081a46329b86051abd1a872a","src/arch/riscv.s":"a81d2af4bcc9c29db304730697e52a89a7376b51d2735185c67be8910d0cdf39","src/arch/riscv64.s":"a51da67ce569e2442ff487b062bb8fdfe7c769f3f05a88de480bd5ab214d9a4f","src/arch/sparc64.s":"6250acbd938aea2e440061663a79fbb2dac0592b3a193f027b6b910e2a8e3af1","src/arch/sparc_sysv.s":"c2da7576e1fbe2234cc8a5cf937f7676e125435295f8c32089bfa0b0f27fde5e","src/arch/wasm32.o":"d7279f419cb7e169cae2af2463507652e0393b801c2f4580244de70d3def58b6","src/arch/wasm32.s":"1ebdc90de48f13e6474ee17c406578fc090ff61e57c1f560ecf6e6b75c7ef10a","src/arch/x86.s":"1919a4af1474895f904ed4281a4a8fcdd0428dab257bff4ea262db83ed63b445","src/arch/x86_64.s":"c80f1a3e22db61fd62b5ef2e1b6663185403bdcbcfbfe7ff0f8e0831ff0cafcf","src/arch/x86_64_msvc.asm":"85683bc65a03371ea7d8d79dcbe487f690cc2460c359817fc63c30d575ad8957","src/arch/x86_64_windows_gnu.s":"44637034e094ec0ad76dbe1232e97271c8155eb93bcb1dd86fe825acd05978a0","src/arch/x86_msvc.asm":"1735d4b19f8e46d0699fc9538baa7ab0885d27531ef7d9960e2027ad8137769b","src/arch/x86_windows_gnu.s":"b94d907a86f230c5c8ca1c708ede173f73c5269496f3959e08e4a92155e160d7","src/arch/zseries_linux.s":"5c3379a76e31bf13abf240efda12596fabce108cf63f60f9d0495e82ab8f1717","src/lib.rs":"18774ee37630bc6c7a36273014f80f6afa3f73bf34f4c49f5795d2eb5df1c195","tests/stack_direction.rs":"77d8f9dee196e99e70d569f59fef82bc2f88a8ec17bfe07ebe2f005fcb815c8b","tests/stack_direction_2.rs":"f9191394de5b6381af6ba8223e7717230059dc335f639238c0ddbc7eb87bfc0e"},"package":"cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"} +\ No newline at end of file ++{"files":{"Cargo.lock":"2928b712f89aee2b62581df1e552b7cb8288d999ba180291b4900b86a05c6d8d","Cargo.toml":"c2c5a0154a80cffc82349cd98f819ea1259c92f195c5878ceefb66e06b14d28c","LICENSE-APACHE":"965a63a81d9a2fbeb5f9096954dabb49690f9dffcdac9825f675b25c807252a2","LICENSE-MIT":"3e3714aa69bd874601741fd7d7ad5298740cece37778e279fc1ab4451c5a11af","README.mkd":"6385ecaced99b0a29a5b40166d34ef9312f322c1b8ad002bef3b08cd6c3e29b2","build.rs":"1720311de1fd3ffb442697d68a9f1522996de80daf9db44b2635d31e7b3ffbc0","examples/info.rs":"8ffb89912304ecbf3d714dcc094f42e86fdd0738625b2e76be2e7d59ab0736cf","examples/on_stack_fibo.rs":"287f0a08b177a97366a5da39e24e33e1f4bbe30a1f2473956721c8a9d93926a4","examples/on_stack_fibo_alloc_each_frame.rs":"e084041bbb81d51b195a4db539a765409272916df29c83a62213a93de4b6fca3","examples/panics.rs":"6791fe0dda9456b3becf989cbc89bc45ae27302e633572a57bbf10a57b830076","examples/replace_stack_1.rs":"374a28881f5e5dbf9db9b9e34929fb7a7e6f3910d782a6718f53ac269807b990","examples/thread.rs":"3cf92882aff96151608584d63535701cc8e5ae953d7ecf706d77371180bff025","src/arch/aarch64_armasm.asm":"1c737338287f3de981fbae97f104ac5e49425ba7fbcb4f7d80120afae47a86d5","src/arch/aarch_aapcs64.s":"459b8cd5a96104893e8f849ac83369101d7204c933841672df162104bebd2375","src/arch/arm_aapcs.s":"4ada635e8528279bd0326654f5203b6bdc94dd68c94fdef5de551384ba1b1747","src/arch/arm_armasm.asm":"e3b514169f19368b0b49374412de38bd9f50576e7b93b64d685a0f84fa8f4c91","src/arch/mips64_eabi.s":"4e6f95f89ba72fc4dd1a9a547920764f66d98251d236941cee4d227010484520","src/arch/mips_eabi.s":"8b7927fd63660eb276e2951f28df6b11920f04be4dc17a16b66ad386da12c4c3","src/arch/powerpc32.s":"0b508a65dec7254ba2e0dc65a2c9e86c21069fe62f5d7c41f5190415a4885912","src/arch/powerpc64.s":"c1602d09d12ba1df48fc96af0f827f8679fc93cee728813527fb1b817a788911","src/arch/powerpc64_openpower.s":"421b11cc7381427d1e2acb4e681c9836ccfea0b79930492f0a99ec4d27495e58","src/arch/psm.h":"2cebda3740aa73b167b8ec18e3d2202ca46e400a081a46329b86051abd1a872a","src/arch/riscv.s":"a81d2af4bcc9c29db304730697e52a89a7376b51d2735185c67be8910d0cdf39","src/arch/riscv64.s":"a51da67ce569e2442ff487b062bb8fdfe7c769f3f05a88de480bd5ab214d9a4f","src/arch/sparc64.s":"6250acbd938aea2e440061663a79fbb2dac0592b3a193f027b6b910e2a8e3af1","src/arch/sparc_sysv.s":"c2da7576e1fbe2234cc8a5cf937f7676e125435295f8c32089bfa0b0f27fde5e","src/arch/wasm32.o":"d7279f419cb7e169cae2af2463507652e0393b801c2f4580244de70d3def58b6","src/arch/wasm32.s":"1ebdc90de48f13e6474ee17c406578fc090ff61e57c1f560ecf6e6b75c7ef10a","src/arch/x86.s":"1919a4af1474895f904ed4281a4a8fcdd0428dab257bff4ea262db83ed63b445","src/arch/x86_64.s":"c80f1a3e22db61fd62b5ef2e1b6663185403bdcbcfbfe7ff0f8e0831ff0cafcf","src/arch/x86_64_msvc.asm":"85683bc65a03371ea7d8d79dcbe487f690cc2460c359817fc63c30d575ad8957","src/arch/x86_64_windows_gnu.s":"44637034e094ec0ad76dbe1232e97271c8155eb93bcb1dd86fe825acd05978a0","src/arch/x86_msvc.asm":"1735d4b19f8e46d0699fc9538baa7ab0885d27531ef7d9960e2027ad8137769b","src/arch/x86_windows_gnu.s":"b94d907a86f230c5c8ca1c708ede173f73c5269496f3959e08e4a92155e160d7","src/arch/zseries_linux.s":"5c3379a76e31bf13abf240efda12596fabce108cf63f60f9d0495e82ab8f1717","src/lib.rs":"18774ee37630bc6c7a36273014f80f6afa3f73bf34f4c49f5795d2eb5df1c195","tests/stack_direction.rs":"77d8f9dee196e99e70d569f59fef82bc2f88a8ec17bfe07ebe2f005fcb815c8b","tests/stack_direction_2.rs":"f9191394de5b6381af6ba8223e7717230059dc335f639238c0ddbc7eb87bfc0e"},"package":"cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"} diff --git a/bootstrap/rust-1.66/0040-rls-atomics.patch b/bootstrap/rust-1.66/0040-rls-atomics.patch new file mode 100644 index 000000000..e084217ba --- /dev/null +++ b/bootstrap/rust-1.66/0040-rls-atomics.patch @@ -0,0 +1,58 @@ +--- rustc-1.58.1-src/src/tools/rls/rls/src/cmd.rs ++++ rustc-1.58.1-src/src/tools/rls/rls/src/cmd.rs +@@ -7,7 +7,7 @@ use crate::config::Config; + use crate::server::{self, LsService, Notification, Request, RequestId}; + use rls_analysis::{AnalysisHost, Target}; + use rls_vfs::Vfs; +-use std::sync::atomic::{AtomicU64, Ordering}; ++use std::sync::atomic::{AtomicU32, Ordering}; + + use lsp_types::{ + ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, +@@ -316,8 +316,8 @@ fn url(file_name: &str) -> Url { + } + + fn next_id() -> RequestId { +- static ID: AtomicU64 = AtomicU64::new(1); +- RequestId::Num(ID.fetch_add(1, Ordering::SeqCst)) ++ static ID: AtomicU32 = AtomicU32::new(1); ++ RequestId::Num(ID.fetch_add(1, Ordering::SeqCst).into()) + } + + // Custom reader and output for the RLS server. +--- rustc-1.58.1-src/src/tools/rls/rls/src/server/io.rs ++++ rustc-1.58.1-src/src/tools/rls/rls/src/server/io.rs +@@ -5,7 +5,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; + + use std::fmt; + use std::io::{self, BufRead, Write}; +-use std::sync::atomic::{AtomicU64, Ordering}; ++use std::sync::atomic::{AtomicU32, Ordering}; + use std::sync::Arc; + + use jsonrpc_core::{self as jsonrpc, response, version, Id}; +@@ -169,13 +169,13 @@ pub trait Output: Sync + Send + Clone + 'static { + /// An output that sends notifications and responses on `stdout`. + #[derive(Clone)] + pub(super) struct StdioOutput { +- next_id: Arc<AtomicU64>, ++ next_id: Arc<AtomicU32>, + } + + impl StdioOutput { + /// Constructs a new `stdout` output. + pub(crate) fn new() -> StdioOutput { +- StdioOutput { next_id: Arc::new(AtomicU64::new(1)) } ++ StdioOutput { next_id: Arc::new(AtomicU32::new(1).into()) } + } + } + +@@ -192,7 +192,7 @@ impl Output for StdioOutput { + } + + fn provide_id(&self) -> RequestId { +- RequestId::Num(self.next_id.fetch_add(1, Ordering::SeqCst)) ++ RequestId::Num(self.next_id.fetch_add(1, Ordering::SeqCst).into()) + } + } + diff --git a/bootstrap/rust-1.66/APKBUILD b/bootstrap/rust-1.66/APKBUILD new file mode 100644 index 000000000..b2dd0e083 --- /dev/null +++ b/bootstrap/rust-1.66/APKBUILD @@ -0,0 +1,296 @@ +# Maintainer: Samuel Holland <samuel@sholland.org> +pkgname=rust +pkgver=1.66.1 +_bootver=1.65.0-r0 +_llvmver=14 +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-Use-static-native-libraries-when-linking-static-exec.patch + 0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch + 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch + 0007-Link-libssp_nonshared.a-on-all-musl-targets.patch + 0008-test-failed-doctest-output-Fix-normalization.patch + 0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch + 0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch + 0011-Ignore-broken-and-non-applicable-tests.patch + 0012-Link-stage-2-tools-dynamically-to-libstd.patch + 0013-Move-debugger-scripts-to-usr-share-rust.patch + 0014-Add-foxkit-target-specs.patch + 0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.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="1944c024c603140d0a9236043a3bd1d0d211dd8d368d6d82a3a620f1ff43b29624755b0943f2b38b40a188c7eee77a840238ea757eaf435e2a3fa6a0e6b82832 rustc-1.66.1-src.tar.xz +0a7aaa6ca26da162c6522ec0b44adbe4279222a65d7d5deef141c54ae1e8ebc1e135efe812f5ea72850005b2763a41e74e734bfa8d323038a0ac3c9cf8cdc4b6 0001-Fix-LLVM-build.patch +c97cb96fb4889e6cc5c86ffa1cc6f67db91466204f010aba9f2f2e72914f24939e52c68dbe135b84fcecb01529110fa03e9fa134e824875406dbaa45ef3929c0 0002-Fix-linking-to-zlib-when-cross-compiling.patch +2c04869bd83a0dfa77e26404db36088bab14afda0ba27eee726760f5ea9de40cf16018accdf80b5d4c86ab5e1fb91c5c7f67e8dc4c0734d984f330bfd4b52fed 0003-Fix-rustdoc-when-cross-compiling-on-musl.patch +37f3db44b57b3fb306a4ea8f65c0f282d8e3b359e03350703f476b41c0ad7582d0235ea18720bd8801c38aaf15dd325070d82807c339cbe817711c4df85bca67 0004-Use-static-native-libraries-when-linking-static-exec.patch +5b65d0f22781d575d2cf18b8f648f6cbd1282a7ad37fb49f735b39eaf33ca25a577340b842cd4a80f0eb99acd28389606a9699c08023a853976f4a400cd390f6 0005-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch +56d12d6f04e67f1c4fc0e0ef3f7a05172e3476db0112b64152c13c929649387a47c14c70e01b9e3805820d5a1f093ee38f7c4931db27f7a751f558451a02d54a 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +a65da19facab6c9fbe73aa82ef54dfa61768b58556f3d5ff0b810d5480bf4fd9d40485d64b66714d85769c134d11cd1907c3316199c944e7dca45eb126ca01a5 0007-Link-libssp_nonshared.a-on-all-musl-targets.patch +801caf594b5df06c2540542947622f9e98db79c8f0c43733a3b4532b2917b2192c81431d8d2bff2bc77c271bf257b59965b279ee52ff3cba67d8037a066b737f 0008-test-failed-doctest-output-Fix-normalization.patch +45bcce759138df475f8fbeb8089420bd38a399f5a018ebdf6d5a79e7c714c9ec770c765c32dda0ab4e368c5dd226f474b6894d70b14e41bea57284eeeb1a2f58 0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +23f622841ba2030b02f52ed560c4be6800469e8021aa71842a702860c97b90edadf5de593ea4f6b9a158d7d0e4c83b52b419f770a8dac2b69633d643468c54d5 0010-test-use-extern-for-plugins-Don-t-assume-multilib.patch +47f79fee22e163d71e1c4f1817cdb408dd821f241d7c0cc8ee4d401ab63c09ec1851ad5df3224cd62e6d6f0a7c74b206191bcba0af3d8089f692d1b742bfc998 0011-Ignore-broken-and-non-applicable-tests.patch +9b611e37e36b4a1b6ef2355bbca1cff5ca7d0123d6895576674b766fc49c94bed66a50e2c31f0a738ceb3f4fc513c064087709c181f7e81a520801f890c2cbd9 0012-Link-stage-2-tools-dynamically-to-libstd.patch +2e1c72732f6b365239c15825ee2b9d41b36caff5fff8ff28576c10aa71bf59cf1e6ac232ce221424e0986d23fa32f190d96b67aee37d030a61fca795ed77e037 0013-Move-debugger-scripts-to-usr-share-rust.patch +f047f7b938e4bc1e608111c59eecec44eefe1cfb2edad6cc7f2b425a224b5c9ec643a975c7586b8950f217f9e342cd131d556b9688329f8531b2492394ba2873 0014-Add-foxkit-target-specs.patch +7fee0667793d5d5ee5cb600e24129c81de50511814e8f1a2f16bb47350087c5f42a01671415b10b01e414e9ff03008892a35c6cb616737175217bdccd1fa3f1e 0015-Use-OpenPOWER-ABI-on-BE-PowerPC-64-musl.patch +52968467df3adde55a47d26823dea23370e6fca08589e74429bbb8f9990d86f210aa4cafeb49b63858bac214fad585f3799a73c9c3fec682d84e6c88bf5cb0c4 powerpc-atomics.patch" diff --git a/bootstrap/rust-1.66/powerpc-atomics.patch b/bootstrap/rust-1.66/powerpc-atomics.patch new file mode 100644 index 000000000..b591eedd5 --- /dev/null +++ b/bootstrap/rust-1.66/powerpc-atomics.patch @@ -0,0 +1,64 @@ +--- rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 ++++ rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/no_atomic.rs 2022-11-23 07:34:18.412044423 +0000 +@@ -33,6 +33,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/crossbeam-epoch-0.9.6/.cargo-checksum.json.old 2022-04-04 11:10:55.000000000 +0000 ++++ rustc-1.60.0-src/vendor/crossbeam-epoch-0.9.6/.cargo-checksum.json 2022-11-23 07:34:44.339249221 +0000 +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"3529c0833bcd1e09a352d3bd1696d3666850c9b09fe2111bf1a783ec16a5f467","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"7f3c7198f2e33ba93bb8270e1c1e8dc6d70c343987acd9d0706e3632cbb9e0ad","Cargo.lock":"10e3899295e7e8ce93d3f0b597efbec844bdda40f78ae717f5995341d41ee937","Cargo.toml":"d7e7ab87ca4a4e8cc4ae9644e1537eedc46473ff5f89399b4733c4bdf59058db","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"f946b25082979595d3851d90c4e76424be921a779e88e982f8455d44d46057ec","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"58a36da8f9ca3a9206d31a0d6e7548f200fe8746ebca5edca48679b0d29a8043","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"9414a8b6357e7c09f0d3d27e7738c96e1de8f5123a9183a90d463887ad3d91fb","src/atomic.rs":"63843b5ecd51b3fc98336247abe8efa824d826f142e40a761636e530d06f3b41","src/collector.rs":"e2d9780d8707e49360b3c33f2f829f29f70e6929307e65e23449b8ba6def6358","src/default.rs":"e1449bd6e61d7c19e9cbdf183f81c67c3487775fcc55572947874ca535d3d54f","src/deferred.rs":"ea532517c8ca22010ed9a624b059471c8a57b25e7925f6a5dfb391be7646a1fa","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"55c56ca1b2fbc067ae21108f0f7de4be91e5b41df2492055b635ed436782dd52","src/internal.rs":"67a6811b8c58e1152fd1dc17e389884025a0d99d79ab03dee26efcd0d6896690","src/lib.rs":"bcaa7c8dc9f9eb1ef6f56b4c0705db348d00b21325b6c0c1544cd7aec0613dc9","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"cbc6334460d73761c3dea7f99ed2ccbf267d5da3bc76c812e94f85c9f4565c6a","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"} +--- rustc-1.60.0-src/vendor/crossbeam-epoch/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 ++++ rustc-1.60.0-src/vendor/crossbeam-epoch/no_atomic.rs 2022-11-23 07:36:20.388894146 +0000 +@@ -44,6 +44,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.66.1-src/vendor/crossbeam-epoch/.cargo-checksum.json.old 2023-01-10 16:11:59.000000000 -0600 ++++ rustc-1.66.1-src/vendor/crossbeam-epoch/.cargo-checksum.json 2024-07-25 23:25:30.461226300 -0500 +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"930bdf6d05b1fae72bb844f6c26e0a35cc83b810a987baaf5d279044d3b3f74d","Cargo.lock":"ce25f4d162a39d180e7369954bc512ab2ab1ab3b04f6f071cb2212bd43b3bbc3","Cargo.toml":"f2a34cbd48fff1346070f503da83c9149db91c7a098a0b486007fd6a39ba6a1b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d67d0cf57751a019707dd95785345ee181a10ea80237789bc3c19bf28c0d45ca","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"89e236e4e22dd748720129dcd02edfc08adccf708a7f0b03e41780e5bafb39cc","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic.rs":"1bd4275c1411852024533e8a70959dfedf72029e3253544d1fbb0cc18b6fd519","src/collector.rs":"29e5911f61510247659b0090517bd1a38d11e1ed86e35811603cb599962d9a58","src/default.rs":"62edf5e1f934eb82d8d7f010d6f25366e6851145a6f0a162372202bb63da1f3a","src/deferred.rs":"0c87df5797212778edd3c2d5fcf0cc04e8b9ed100261ecf9522f74a90804a3d5","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":"f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"930bdf6d05b1fae72bb844f6c26e0a35cc83b810a987baaf5d279044d3b3f74d","Cargo.lock":"ce25f4d162a39d180e7369954bc512ab2ab1ab3b04f6f071cb2212bd43b3bbc3","Cargo.toml":"f2a34cbd48fff1346070f503da83c9149db91c7a098a0b486007fd6a39ba6a1b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d67d0cf57751a019707dd95785345ee181a10ea80237789bc3c19bf28c0d45ca","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build.rs":"89e236e4e22dd748720129dcd02edfc08adccf708a7f0b03e41780e5bafb39cc","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"836afe5879e9582c5e1bc553b51b62458bb092332ba60afba685041633b99489","src/atomic.rs":"1bd4275c1411852024533e8a70959dfedf72029e3253544d1fbb0cc18b6fd519","src/collector.rs":"29e5911f61510247659b0090517bd1a38d11e1ed86e35811603cb599962d9a58","src/default.rs":"62edf5e1f934eb82d8d7f010d6f25366e6851145a6f0a162372202bb63da1f3a","src/deferred.rs":"0c87df5797212778edd3c2d5fcf0cc04e8b9ed100261ecf9522f74a90804a3d5","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":"f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"} +--- 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.60.0-src/vendor/crossbeam-utils/no_atomic.rs.old 2022-04-04 11:10:55.000000000 +0000 ++++ rustc-1.60.0-src/vendor/crossbeam-utils/no_atomic.rs 2022-11-23 07:36:50.575639725 +0000 +@@ -44,6 +44,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.66.1-src/vendor/crossbeam-utils/.cargo-checksum.json.old 2023-01-10 16:11:59.000000000 -0600 ++++ rustc-1.66.1-src/vendor/crossbeam-utils/.cargo-checksum.json 2024-07-25 23:26:12.086766121 -0500 +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"4859f9c926c230023e861bf01c4b225b460035faf8cf6240108530efedbb747f","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","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":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"4859f9c926c230023e861bf01c4b225b460035faf8cf6240108530efedbb747f","no_atomic.rs":"836afe5879e9582c5e1bc553b51b62458bb092332ba60afba685041633b99489","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":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} |