Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-lang/rust/files/, dev-lang/rust/
Date: Fri, 30 Apr 2021 15:10:11
Message-Id: 1619795354.d45387dbdba0fff1fdbf5401c499e7279ca55911.anarchy@gentoo
1 commit: d45387dbdba0fff1fdbf5401c499e7279ca55911
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 15:09:14 2021 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 15:09:14 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d45387db
7
8 dev-lang/rust: move large patches to dev space
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
12
13 dev-lang/rust/Manifest | 2 +
14 ...l_root-and-CRT-fallback-from-musl-targets.patch | 486 ---------------------
15 dev-lang/rust/files/0030-libc-linkage.patch | 34 --
16 dev-lang/rust/rust-1.47.0-r1.ebuild | 6 +-
17 4 files changed, 6 insertions(+), 522 deletions(-)
18
19 diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
20 index eaa5797..a958eb9 100644
21 --- a/dev-lang/rust/Manifest
22 +++ b/dev-lang/rust/Manifest
23 @@ -1,3 +1,5 @@
24 +DIST 0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch 21313 BLAKE2B 0b73d172d01507cc30f29766c605dc2b771f4bd555c337e11a99ba78abd912d9dc4179f5ca07f5346e97dead7b39964832a2c33610ee1735315141bf6f0e0004 SHA512 001d0b99507cd6c25713f0a6ea6bc4b9fb762083b84085f4abb8c3544f1c2d153a1d2c35e03969d2d789f4b6b84d6dae92dd0b5d9d73fea5eb75aa266c31a05b
25 +DIST 0030-libc-linkage.patch 37284 BLAKE2B b1e9f36bea6c6bba46b65967e49d3f0e0084da3a02a3a253d425a6e1534e7362b91a04bb975f08d347a57e16f4fef4662cb8c0cbe0821e1cdb90ab442276ef77 SHA512 8818c4ef45ddc537ba6930f83d503beffad8d80e6f51d3d1742ac4c5943f12b91951182aa06fd90cdbf8cb52b43c4fa35ed8ec3176f7ab94261b655b27fcb789
26 DIST rust-1.46.0-aarch64-gentoo-linux-musl.tar.xz 101117048 BLAKE2B ef9fafab60b24d5896f1d2c66718945946c0178c3434b1993add6056e3c88fab7d51923942d398bf2d0fbc0a1a9220dcef37ac289a421c3a1f6bcc6b7c755a46 SHA512 764f909849f91d3cbd071d96d6947b08b45f08b3bbd523fcea4310abc807957b0bb3b696e955182ab888c400b6c830442610d3bc510583afe0c910141514d438
27 DIST rust-1.46.0-armv7a-unknown-linux-musleabihf.tar.xz 100547468 BLAKE2B 798183dee50e9e35ed2be6d21d89e49265a0764dde904409a5a52a6b0f9856b8ae566daf7651b2071c996930ca9079e39fe246cdce80eea7dc5bee5ce0b3802e SHA512 ad164673320c33a49abfd9e571291beb2394f35b03d913ab70d9da27d38427440efe87a17e0d15b4021c4355be812ab5fe5c02f9ab8f8d6d3d799a872a02ac0f
28 DIST rust-1.46.0-i686-gentoo-linux-musl.tar.xz 113552128 BLAKE2B 994911aa66c8f4e6e36b3037febdf2fe1586f478a127604988858fb6bead13da2e46e6d4e2d91496ca399402db00c153fe0e77a788a7f13847ba0ebfd90dff86 SHA512 c00c7992914c4a02827e3011cad59e454f5778f2fc6224928fb1fdf5f39752474473a41273700350b54de6d940ba0964a77a341a435e8ea8f7b9750f64454dd0
29
30 diff --git a/dev-lang/rust/files/0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch b/dev-lang/rust/files/0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
31 deleted file mode 100644
32 index f241be8..0000000
33 --- a/dev-lang/rust/files/0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
34 +++ /dev/null
35 @@ -1,486 +0,0 @@
36 -From 1e13488d9fc661f8f489609dcfc6ed8b61957ca3 Mon Sep 17 00:00:00 2001
37 -From: Samuel Holland <samuel@××××××××.org>
38 -Date: Fri, 8 Sep 2017 22:11:14 -0500
39 -Subject: [PATCH 06/15] Remove musl_root and CRT fallback from musl targets
40 -
41 ----
42 - config.toml.example | 12 --------
43 - src/bootstrap/cc_detect.rs | 27 ++----------------
44 - src/bootstrap/compile.rs | 28 +------------------
45 - src/bootstrap/config.rs | 10 -------
46 - src/bootstrap/configure.py | 28 -------------------
47 - src/bootstrap/lib.rs | 19 -------------
48 - src/bootstrap/sanity.rs | 22 ---------------
49 - .../dist-i586-gnu-i586-i686-musl/Dockerfile | 2 --
50 - .../host-x86_64/dist-various-1/Dockerfile | 9 ------
51 - .../host-x86_64/dist-various-2/Dockerfile | 3 +-
52 - .../host-x86_64/dist-x86_64-musl/Dockerfile | 1 -
53 - .../host-x86_64/test-various/Dockerfile | 1 -
54 - src/librustc_codegen_ssa/back/link.rs | 6 +---
55 - src/librustc_target/spec/crt_objects.rs | 18 ------------
56 - src/librustc_target/spec/linux_musl_base.rs | 5 ----
57 - 15 files changed, 5 insertions(+), 186 deletions(-)
58 -
59 -diff --git a/config.toml.example b/config.toml.example
60 -index 36587cc0784..c74dd740868 100644
61 ---- a/config.toml.example
62 -+++ b/config.toml.example
63 -@@ -385,9 +385,6 @@
64 - # nightly features
65 - #channel = "dev"
66 -
67 --# The root location of the musl installation directory.
68 --#musl-root = "..."
69 --
70 - # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
71 - # platforms to ensure that the compiler is usable by default from the build
72 - # directory (as it links to a number of dynamic libraries). This may not be
73 -@@ -530,15 +527,6 @@
74 - # only use static libraries. If unset, the target's default linkage is used.
75 - #crt-static = false
76 -
77 --# The root location of the musl installation directory. The library directory
78 --# will also need to contain libunwind.a for an unwinding implementation. Note
79 --# that this option only makes sense for musl targets that produce statically
80 --# linked binaries
81 --#musl-root = "..."
82 --
83 --# The full path to the musl libdir.
84 --#musl-libdir = musl-root/lib
85 --
86 - # The root location of the `wasm32-wasi` sysroot.
87 - #wasi-root = "..."
88 -
89 -diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs
90 -index 7ff00d85dd2..ae80d8a5963 100644
91 ---- a/src/bootstrap/cc_detect.rs
92 -+++ b/src/bootstrap/cc_detect.rs
93 -@@ -42,8 +42,6 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> {
94 - Some(PathBuf::from(ar))
95 - } else if target.contains("msvc") {
96 - None
97 -- } else if target.contains("musl") {
98 -- Some(PathBuf::from("ar"))
99 - } else if target.contains("openbsd") {
100 - Some(PathBuf::from("ar"))
101 - } else if target.contains("vxworks") {
102 -@@ -98,7 +96,7 @@ pub fn find(build: &mut Build) {
103 - if let Some(cc) = config.and_then(|c| c.cc.as_ref()) {
104 - cfg.compiler(cc);
105 - } else {
106 -- set_compiler(&mut cfg, Language::C, target, config, build);
107 -+ set_compiler(&mut cfg, Language::C, target, config);
108 - }
109 -
110 - let compiler = cfg.get_compiler();
111 -@@ -126,7 +124,7 @@ pub fn find(build: &mut Build) {
112 - cfg.compiler(cxx);
113 - true
114 - } else if build.hosts.contains(&target) || build.build == target {
115 -- set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
116 -+ set_compiler(&mut cfg, Language::CPlusPlus, target, config);
117 - true
118 - } else {
119 - false
120 -@@ -155,7 +153,6 @@ fn set_compiler(
121 - compiler: Language,
122 - target: TargetSelection,
123 - config: Option<&Target>,
124 -- build: &Build,
125 - ) {
126 - match &*target.triple {
127 - // When compiling for android we may have the NDK configured in the
128 -@@ -198,26 +195,6 @@ fn set_compiler(
129 - }
130 - }
131 -
132 -- "mips-unknown-linux-musl" => {
133 -- if cfg.get_compiler().path().to_str() == Some("gcc") {
134 -- cfg.compiler("mips-linux-musl-gcc");
135 -- }
136 -- }
137 -- "mipsel-unknown-linux-musl" => {
138 -- if cfg.get_compiler().path().to_str() == Some("gcc") {
139 -- cfg.compiler("mipsel-linux-musl-gcc");
140 -- }
141 -- }
142 --
143 -- t if t.contains("musl") => {
144 -- if let Some(root) = build.musl_root(target) {
145 -- let guess = root.join("bin/musl-gcc");
146 -- if guess.exists() {
147 -- cfg.compiler(guess);
148 -- }
149 -- }
150 -- }
151 --
152 - _ => {}
153 - }
154 - }
155 -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
156 -index 373e240cb8e..0be09300f7c 100644
157 ---- a/src/bootstrap/compile.rs
158 -+++ b/src/bootstrap/compile.rs
159 -@@ -166,24 +166,7 @@ fn copy_self_contained_objects(
160 -
161 - // Copies the CRT objects.
162 - //
163 -- // rustc historically provides a more self-contained installation for musl targets
164 -- // not requiring the presence of a native musl toolchain. For example, it can fall back
165 -- // to using gcc from a glibc-targeting toolchain for linking.
166 -- // To do that we have to distribute musl startup objects as a part of Rust toolchain
167 -- // and link with them manually in the self-contained mode.
168 -- if target.contains("musl") {
169 -- let srcdir = builder.musl_libdir(target).unwrap();
170 -- for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
171 -- copy_and_stamp(
172 -- builder,
173 -- &libdir_self_contained,
174 -- &srcdir,
175 -- obj,
176 -- &mut target_deps,
177 -- DependencyType::TargetSelfContained,
178 -- );
179 -- }
180 -- } else if target.ends_with("-wasi") {
181 -+ if target.ends_with("-wasi") {
182 - let srcdir = builder.wasi_root(target).unwrap().join("lib/wasm32-wasi");
183 - copy_and_stamp(
184 - builder,
185 -@@ -258,15 +241,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
186 - .arg("--manifest-path")
187 - .arg(builder.src.join("library/test/Cargo.toml"));
188 -
189 -- // Help the libc crate compile by assisting it in finding various
190 -- // sysroot native libraries.
191 -- if target.contains("musl") {
192 -- if let Some(p) = builder.musl_libdir(target) {
193 -- let root = format!("native={}", p.to_str().unwrap());
194 -- cargo.rustflag("-L").rustflag(&root);
195 -- }
196 -- }
197 --
198 - if target.ends_with("-wasi") {
199 - if let Some(p) = builder.wasi_root(target) {
200 - let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap());
201 -diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
202 -index 8b8b01b1153..d4469ed1f96 100644
203 ---- a/src/bootstrap/config.rs
204 -+++ b/src/bootstrap/config.rs
205 -@@ -137,8 +137,6 @@ pub struct Config {
206 - pub print_step_timings: bool,
207 - pub missing_tools: bool,
208 -
209 -- // Fallback musl-root for all targets
210 -- pub musl_root: Option<PathBuf>,
211 - pub prefix: Option<PathBuf>,
212 - pub sysconfdir: Option<PathBuf>,
213 - pub datadir: Option<PathBuf>,
214 -@@ -235,8 +233,6 @@ pub struct Target {
215 - pub linker: Option<PathBuf>,
216 - pub ndk: Option<PathBuf>,
217 - pub crt_static: Option<bool>,
218 -- pub musl_root: Option<PathBuf>,
219 -- pub musl_libdir: Option<PathBuf>,
220 - pub wasi_root: Option<PathBuf>,
221 - pub qemu_rootfs: Option<PathBuf>,
222 - pub no_std: bool,
223 -@@ -390,7 +386,6 @@ struct Rust {
224 - parallel_compiler: Option<bool>,
225 - default_linker: Option<String>,
226 - channel: Option<String>,
227 -- musl_root: Option<String>,
228 - rpath: Option<bool>,
229 - verbose_tests: Option<bool>,
230 - optimize_tests: Option<bool>,
231 -@@ -427,8 +422,6 @@ struct TomlTarget {
232 - llvm_filecheck: Option<String>,
233 - android_ndk: Option<String>,
234 - crt_static: Option<bool>,
235 -- musl_root: Option<String>,
236 -- musl_libdir: Option<String>,
237 - wasi_root: Option<String>,
238 - qemu_rootfs: Option<String>,
239 - no_std: Option<bool>,
240 -@@ -659,7 +652,6 @@ impl Config {
241 - set(&mut config.llvm_tools_enabled, rust.llvm_tools);
242 - config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
243 - config.rustc_default_linker = rust.default_linker.clone();
244 -- config.musl_root = rust.musl_root.clone().map(PathBuf::from);
245 - config.save_toolstates = rust.save_toolstates.clone().map(PathBuf::from);
246 - set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings));
247 - set(&mut config.backtrace_on_ice, rust.backtrace_on_ice);
248 -@@ -699,8 +691,6 @@ impl Config {
249 - target.ranlib = cfg.ranlib.clone().map(PathBuf::from);
250 - target.linker = cfg.linker.clone().map(PathBuf::from);
251 - target.crt_static = cfg.crt_static;
252 -- target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
253 -- target.musl_libdir = cfg.musl_libdir.clone().map(PathBuf::from);
254 - target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from);
255 - target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
256 -
257 -diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
258 -index 47673ce1e87..33004e317ce 100755
259 ---- a/src/bootstrap/configure.py
260 -+++ b/src/bootstrap/configure.py
261 -@@ -109,34 +109,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk",
262 - "aarch64-linux-android NDK standalone path")
263 - v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk",
264 - "x86_64-linux-android NDK standalone path")
265 --v("musl-root", "target.x86_64-unknown-linux-musl.musl-root",
266 -- "MUSL root installation directory (deprecated)")
267 --v("musl-root-x86_64", "target.x86_64-unknown-linux-musl.musl-root",
268 -- "x86_64-unknown-linux-musl install directory")
269 --v("musl-root-i586", "target.i586-unknown-linux-musl.musl-root",
270 -- "i586-unknown-linux-musl install directory")
271 --v("musl-root-i686", "target.i686-unknown-linux-musl.musl-root",
272 -- "i686-unknown-linux-musl install directory")
273 --v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
274 -- "arm-unknown-linux-musleabi install directory")
275 --v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
276 -- "arm-unknown-linux-musleabihf install directory")
277 --v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
278 -- "armv5te-unknown-linux-musleabi install directory")
279 --v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root",
280 -- "armv7-unknown-linux-musleabi install directory")
281 --v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root",
282 -- "armv7-unknown-linux-musleabihf install directory")
283 --v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root",
284 -- "aarch64-unknown-linux-musl install directory")
285 --v("musl-root-mips", "target.mips-unknown-linux-musl.musl-root",
286 -- "mips-unknown-linux-musl install directory")
287 --v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
288 -- "mipsel-unknown-linux-musl install directory")
289 --v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
290 -- "mips64-unknown-linux-muslabi64 install directory")
291 --v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
292 -- "mips64el-unknown-linux-muslabi64 install directory")
293 - v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
294 - "rootfs in qemu testing, you probably don't want to use this")
295 - v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
296 -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
297 -index 77316c734b8..b92da611a51 100644
298 ---- a/src/bootstrap/lib.rs
299 -+++ b/src/bootstrap/lib.rs
300 -@@ -875,25 +875,6 @@ impl Build {
301 - }
302 - }
303 -
304 -- /// Returns the "musl root" for this `target`, if defined
305 -- fn musl_root(&self, target: TargetSelection) -> Option<&Path> {
306 -- self.config
307 -- .target_config
308 -- .get(&target)
309 -- .and_then(|t| t.musl_root.as_ref())
310 -- .or_else(|| self.config.musl_root.as_ref())
311 -- .map(|p| &**p)
312 -- }
313 --
314 -- /// Returns the "musl libdir" for this `target`.
315 -- fn musl_libdir(&self, target: TargetSelection) -> Option<PathBuf> {
316 -- let t = self.config.target_config.get(&target)?;
317 -- if let libdir @ Some(_) = &t.musl_libdir {
318 -- return libdir.clone();
319 -- }
320 -- self.musl_root(target).map(|root| root.join("lib"))
321 -- }
322 --
323 - /// Returns the sysroot for the wasi target, if defined
324 - fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
325 - self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
326 -diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
327 -index f89bef50de9..e22638c533e 100644
328 ---- a/src/bootstrap/sanity.rs
329 -+++ b/src/bootstrap/sanity.rs
330 -@@ -195,28 +195,6 @@ pub fn check(build: &mut Build) {
331 - }
332 - }
333 -
334 -- // Make sure musl-root is valid
335 -- if target.contains("musl") {
336 -- // If this is a native target (host is also musl) and no musl-root is given,
337 -- // fall back to the system toolchain in /usr before giving up
338 -- if build.musl_root(*target).is_none() && build.config.build == *target {
339 -- let target = build.config.target_config.entry(target.clone()).or_default();
340 -- target.musl_root = Some("/usr".into());
341 -- }
342 -- match build.musl_libdir(*target) {
343 -- Some(libdir) => {
344 -- if fs::metadata(libdir.join("libc.a")).is_err() {
345 -- panic!("couldn't find libc.a in musl libdir: {}", libdir.display());
346 -- }
347 -- }
348 -- None => panic!(
349 -- "when targeting MUSL either the rust.musl-root \
350 -- option or the target.$TARGET.musl-root option must \
351 -- be specified in config.toml"
352 -- ),
353 -- }
354 -- }
355 --
356 - if target.contains("msvc") {
357 - // There are three builds of cmake on windows: MSVC, MinGW, and
358 - // Cygwin. The Cygwin build does not have generators for Visual
359 -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
360 -index 162d7a1345c..48f025fd542 100644
361 ---- a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
362 -+++ b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
363 -@@ -30,8 +30,6 @@ COPY scripts/sccache.sh /scripts/
364 - RUN sh /scripts/sccache.sh
365 -
366 - ENV RUST_CONFIGURE_ARGS \
367 -- --musl-root-i586=/musl-i586 \
368 -- --musl-root-i686=/musl-i686 \
369 - --disable-docs
370 -
371 - # Newer binutils broke things on some vms/distros (i.e., linking against
372 -diff --git a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
373 -index fdd777e824b..2b3d090c1ae 100644
374 ---- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
375 -+++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
376 -@@ -180,15 +180,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
377 - CC_riscv64gc_unknown_none_elf=false
378 -
379 - ENV RUST_CONFIGURE_ARGS \
380 -- --musl-root-armv5te=/musl-armv5te \
381 -- --musl-root-arm=/musl-arm \
382 -- --musl-root-armhf=/musl-armhf \
383 -- --musl-root-armv7hf=/musl-armv7hf \
384 -- --musl-root-aarch64=/musl-aarch64 \
385 -- --musl-root-mips=/musl-mips \
386 -- --musl-root-mipsel=/musl-mipsel \
387 -- --musl-root-mips64=/musl-mips64 \
388 -- --musl-root-mips64el=/musl-mips64el \
389 - --disable-docs
390 -
391 - ENV SCRIPT \
392 -diff --git a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile
393 -index 3081f29aef2..223547bf8cd 100644
394 ---- a/src/ci/docker/host-x86_64/dist-various-2/Dockerfile
395 -+++ b/src/ci/docker/host-x86_64/dist-various-2/Dockerfile
396 -@@ -107,7 +107,6 @@ ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabi
397 - RUN ln -s /usr/include/asm-generic /usr/local/include/asm
398 -
399 - ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
400 -- --set target.wasm32-wasi.wasi-root=/wasm32-wasi \
401 -- --musl-root-armv7=/musl-armv7
402 -+ --set target.wasm32-wasi.wasi-root=/wasm32-wasi
403 -
404 - ENV SCRIPT python3 ../x.py dist --target $TARGETS
405 -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
406 -index ab6515cd1fa..5203d604150 100644
407 ---- a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
408 -+++ b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
409 -@@ -31,7 +31,6 @@ RUN sh /scripts/sccache.sh
410 - ENV HOSTS=x86_64-unknown-linux-musl
411 -
412 - ENV RUST_CONFIGURE_ARGS \
413 -- --musl-root-x86_64=/usr/local/x86_64-linux-musl \
414 - --enable-extended \
415 - --enable-lld \
416 - --set target.x86_64-unknown-linux-musl.crt-static=false \
417 -diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile
418 -index c55a284e137..a808a915fcb 100644
419 ---- a/src/ci/docker/host-x86_64/test-various/Dockerfile
420 -+++ b/src/ci/docker/host-x86_64/test-various/Dockerfile
421 -@@ -29,7 +29,6 @@ COPY scripts/sccache.sh /scripts/
422 - RUN sh /scripts/sccache.sh
423 -
424 - ENV RUST_CONFIGURE_ARGS \
425 -- --musl-root-x86_64=/usr/local/x86_64-linux-musl \
426 - --set build.nodejs=/node-v14.4.0-linux-x64/bin/node \
427 - --set rust.lld
428 -
429 -diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
430 -index 70bc9d5e980..b35fe073d26 100644
431 ---- a/src/librustc_codegen_ssa/back/link.rs
432 -+++ b/src/librustc_codegen_ssa/back/link.rs
433 -@@ -1288,16 +1288,12 @@ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
434 -
435 - /// Whether we link to our own CRT objects instead of relying on gcc to pull them.
436 - /// We only provide such support for a very limited number of targets.
437 --fn crt_objects_fallback(sess: &Session, crate_type: CrateType) -> bool {
438 -+fn crt_objects_fallback(sess: &Session, _crate_type: CrateType) -> bool {
439 - if let Some(self_contained) = sess.opts.debugging_opts.link_self_contained {
440 - return self_contained;
441 - }
442 -
443 - match sess.target.target.options.crt_objects_fallback {
444 -- // FIXME: Find a better heuristic for "native musl toolchain is available",
445 -- // based on host and linker path, for example.
446 -- // (https://github.com/rust-lang/rust/pull/71769#issuecomment-626330237).
447 -- Some(CrtObjectsFallback::Musl) => sess.crt_static(Some(crate_type)),
448 - // FIXME: Find some heuristic for "native mingw toolchain is available",
449 - // likely based on `get_crt_libs_path` (https://github.com/rust-lang/rust/pull/67429).
450 - Some(CrtObjectsFallback::Mingw) => {
451 -diff --git a/src/librustc_target/spec/crt_objects.rs b/src/librustc_target/spec/crt_objects.rs
452 -index 8991691a9a3..b7e47afd942 100644
453 ---- a/src/librustc_target/spec/crt_objects.rs
454 -+++ b/src/librustc_target/spec/crt_objects.rs
455 -@@ -61,21 +61,6 @@ pub(super) fn all(obj: &str) -> CrtObjects {
456 - ])
457 - }
458 -
459 --pub(super) fn pre_musl_fallback() -> CrtObjects {
460 -- new(&[
461 -- (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o"]),
462 -- (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o"]),
463 -- (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o"]),
464 -- (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o"]),
465 -- (LinkOutputKind::DynamicDylib, &["crti.o"]),
466 -- (LinkOutputKind::StaticDylib, &["crti.o"]),
467 -- ])
468 --}
469 --
470 --pub(super) fn post_musl_fallback() -> CrtObjects {
471 -- all("crtn.o")
472 --}
473 --
474 - pub(super) fn pre_mingw_fallback() -> CrtObjects {
475 - new(&[
476 - (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
477 -@@ -115,7 +100,6 @@ pub(super) fn post_wasi_fallback() -> CrtObjects {
478 - /// Which logic to use to determine whether to fall back to the "self-contained" mode or not.
479 - #[derive(Clone, Copy, PartialEq, Hash, Debug)]
480 - pub enum CrtObjectsFallback {
481 -- Musl,
482 - Mingw,
483 - Wasm,
484 - }
485 -@@ -125,7 +109,6 @@ impl FromStr for CrtObjectsFallback {
486 -
487 - fn from_str(s: &str) -> Result<CrtObjectsFallback, ()> {
488 - Ok(match s {
489 -- "musl" => CrtObjectsFallback::Musl,
490 - "mingw" => CrtObjectsFallback::Mingw,
491 - "wasm" => CrtObjectsFallback::Wasm,
492 - _ => return Err(()),
493 -@@ -136,7 +119,6 @@ impl FromStr for CrtObjectsFallback {
494 - impl ToJson for CrtObjectsFallback {
495 - fn to_json(&self) -> Json {
496 - match *self {
497 -- CrtObjectsFallback::Musl => "musl",
498 - CrtObjectsFallback::Mingw => "mingw",
499 - CrtObjectsFallback::Wasm => "wasm",
500 - }
501 -diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs
502 -index b90e91d2901..c5f5f99a96d 100644
503 ---- a/src/librustc_target/spec/linux_musl_base.rs
504 -+++ b/src/librustc_target/spec/linux_musl_base.rs
505 -@@ -1,13 +1,8 @@
506 --use crate::spec::crt_objects::{self, CrtObjectsFallback};
507 - use crate::spec::TargetOptions;
508 -
509 - pub fn opts() -> TargetOptions {
510 - let mut base = super::linux_base::opts();
511 -
512 -- base.pre_link_objects_fallback = crt_objects::pre_musl_fallback();
513 -- base.post_link_objects_fallback = crt_objects::post_musl_fallback();
514 -- base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
515 --
516 - // These targets statically link libc by default
517 - base.crt_static_default = true;
518 - // These targets allow the user to choose between static and dynamic linking.
519 ---
520 -2.26.2
521 -
522
523 diff --git a/dev-lang/rust/files/0030-libc-linkage.patch b/dev-lang/rust/files/0030-libc-linkage.patch
524 deleted file mode 100644
525 index 5a92904..0000000
526 --- a/dev-lang/rust/files/0030-libc-linkage.patch
527 +++ /dev/null
528 @@ -1,34 +0,0 @@
529 ---- rustc-1.47.0-src/vendor/libc-0.2.74/src/lib.rs
530 -+++ rustc-1.47.0-src/vendor/libc-0.2.74/src/lib.rs
531 -@@ -27,6 +27,7 @@
532 - #![deny(missing_copy_implementations, safe_packed_borrows)]
533 - #![no_std]
534 - #![cfg_attr(feature = "rustc-dep-of-std", no_core)]
535 -+#![cfg_attr(target_env = "musl", feature(static_nobundle))]
536 - #![cfg_attr(target_os = "redox", feature(static_nobundle))]
537 - #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))]
538 -
539 ---- rustc-1.47.0-src/vendor/libc-0.2.74/src/unix/mod.rs
540 -+++ rustc-1.47.0-src/vendor/libc-0.2.74/src/unix/mod.rs
541 -@@ -299,11 +299,11 @@ cfg_if! {
542 - // cargo build, don't pull in anything extra as the libstd dep
543 - // already pulls in all libs.
544 - } else if #[cfg(target_env = "musl")] {
545 -+ #[link(name = "c")]
546 -+ extern {}
547 - #[cfg_attr(feature = "rustc-dep-of-std",
548 -- link(name = "c", kind = "static",
549 -+ link(name = "gcc", kind = "static-nobundle",
550 - cfg(target_feature = "crt-static")))]
551 -- #[cfg_attr(feature = "rustc-dep-of-std",
552 -- link(name = "c", cfg(not(target_feature = "crt-static"))))]
553 - extern {}
554 - } else if #[cfg(target_os = "emscripten")] {
555 - #[link(name = "c")]
556 ---- rustc-1.47.0-src/vendor/libc-0.2.74/.cargo-checksum.json
557 -+++ rustc-1.47.0-src/vendor/libc-0.2.74/.cargo-checksum.json
558 -@@ -1 +1 @@
559 --{"files":{"CONTRIBUTING.md":"3a9f0037ad5f1198eada74a9d0363925ef09db664380b0e5a2840f03da260476","Cargo.toml":"128aa804901aaf7c386262cfbba894041bf1b109232d69c3e8b6b01df0a67dd1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"52f1027a072c02e6e9e1f3d9630ec24e4d57507399c6363afcbcceaa106d152b","build.rs":"ab351d7171b14f8032948e843841ebe8518ed95eb1abf0b1e689700c7cef4bf5","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"d5d4488e8c0b8227f516fe13810f550a2a72af3bdfe769200ad8687c8755bdf6","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75
560 fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"61502b3d124759c7c1bae294c1662036a96718fb3bd329cfa2f12e1c61ac10ad","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"d80f0a2f77d485601a218e0707474245636d8b23fb3d6c65c9dbd4302ea6674b","src/macros.rs":"83aed048c5053300345fca843b148928b91ed444188c479315
561 ff6bcabaa0c4e9","src/psp.rs":"a93741ac38660e548eb41b58df39da39944e5c04280a7b09e0be758e79942549","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"6a4ce300da0d2b0db04b18548286603ffe4b47d679a41cf60f1902895894aa1f","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"81254d89be1febc5bb20e787d014a624950d56e2e14973df5bbebfdabc95ae20","src/unix/bsd/apple/mod.rs":"19c8598b72272cc61d7f6a05b7fec78958ce86b11d0f5a655e1e58da0bc2af44","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"ae5e8e6b0f610ec015dfcc2928609037d7ea7b94570c72bcc5bdd588424c6259","src/unix/bsd/freebsdlike/dragonfly/mod.rs"
562 :"0e41b6202c7670ce27201095fc1a2826c9e9ccbbc751e97ae1568871ea481a62","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"14f0bd6693967d4fedec904f7042bd51f2138cb843ec4df18c911b357417cdd2","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"16dd3e1a09f123d0aa544b3fd7c123654b4906cac94838fbed7f34a64413c930","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"c6152ce3db241d99e350d34352f3f3d167953ef0ee08bfbe2685cb9ebde2e83b","src/unix/bsd/freebsdlike/freebsd/mod.rs":"1ed8971b7de3b0435341a9af1366493d0458e4a00507dd824c4c11f4ce2006af","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/un
563 ix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"6132aa0973454379674ea6cbc77e6eace1e1032dd9f38182071388a036f1bc08","src/unix/bsd/freebsdlike/mod.rs":"0046a4083f01ad67511427f1ac37168f31bef3be10c849d304d39f98d61c1267","src/unix/bsd/mod.rs":"4acdbc0148b672fe015ddd7cae952e5d77691df6941a20f8ca40fd996e6a37dd","src/unix/bsd/netbsdlike/mod.rs":"48dd60524119c1e09b255d5472d091e7e7b2b29eab04be51b4b1e740bd022859","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"16a9036b6a8b373cdf0576ae99c95430f3f111b6be906a1e1ecff8047e178a86","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"e
564 e7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"1dd5449dd1fd3d51e30ffdeeaece91d0aaf05c710e0ac699fecc5461cfa2c28e","src/unix/bsd/netbsdlike/openbsd/mod.rs":"a2938e72d1c6e3f32fb51e896b63abd0d79e1e360dc53f9254fdac82b21206b9","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"e59b7fd65f68f8e857eec39e0c03bac1d3af6ddc26c9ba58494336b83659bb9b","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b474450
565 0d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"29863051c296eeb22e7f00a266d6632b6a886b9a791f128e3c554e96213c3a16","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"fb7e14d0f46ffaa989b5ab68c85184efe6aa04b5381e46866299b1f3258ddce3","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"155994121906903a2e0afad895f0b3b7546f6e54d6305a3336ce2c4dfafbfdfa","src/unix/linux_like/android/b32/mod.rs":"0325adf3364fed7157fff5b24fabe1b36d806c39ee04ec82dd29a606d28f91f6","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"5b1e9fcd77ca5f939acb7fb5f5da12f305b0377698d8b8989feb236e26360aa0","src/unix/linux_like/android/b64/aarch64/align.rs":"
566 2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"655116966eb7846b933e5e28b073c329668588cd3c2120cc9ce60c697bd19978","src/unix/linux_like/android/b64/mod.rs":"6a71abfcbbcdae60c916de41cd4688d5f25bdbca83d1d9df49decd56ad726a06","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"e84176d838e663d351450bad218715db1fafbb531e47ea0e262cbb45829dae89","src/unix/linux_like/android/mod.rs":"d414f682fd0d138d440300dc53c6b8b069730e19230dabd4c01173c4578c42b5","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"55fb89f5a965a4ad81ee4d02498c32aaed69e6047ce708c2329a602171862a76","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"dde64
567 8468764a5deef5566b8016290150acf50ee6a0f8c0678cb2078658bc2fa","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"6d9ba242111c7be8173b7a7b8cf8c863ba23d839edc9d026c0fd37a4b64460b4","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"e2d2e51fea73210d9705b7eaa37de8baa7152b71ae3a10a316c277345c529b5c","src/unix/linux_like/linux/gnu/b32/mod.rs":"e224551fa50be726bc8a559da32a96294b18743fb5a5b67cdbee4bb6a9eeb796","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"39aae80d2c4ffa845592e16c0a6c910017de19e2b15c1e507c4df10e79ce3e38","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/lin
568 ux/gnu/b32/sparc/mod.rs":"3b4dd40b288788740d2b030171b21f9d0b076ce26d88e0ff62f5d87f09e7c787","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"927d1bd8cb2f053549fc5acfeb1315b7f80b35d7a1904cd76e99651ff32b141e","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"17e9cd23a14bd19700c05a154568fff5897788c0ae151c21dd3bba67aac829d9","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"0b5d94f3a2361742b6dd9eb3f543ddf675d3f70dab3402ad179faa6ddaae2218","src/unix/linux_like/linux/gnu/b64/mod.rs":"b90d87f76bff37707a1725551fe45d70d0c106e01b1dbbcd5f60460e0a19b4c3","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc7
569 8a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"2f279eb268c0aca9a6bd9b4c84139799cd039a64ca1cd2ded68b04c63397be1b","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"bb01828300f02c11c27689522454439d0d02f22d738df88a97367dc87eecf868","src/unix/linux_like/linux/gnu/b64/s390x.rs":"9c449b64b11cbf55d453b324cf9475acb3253f85cb9692f9873b777ed8978ff4","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"a2667a09e526878683fafa02474f81fbc212d861ceeabade17b0ff4d6d49ff9d","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"e6197537739cb8628cad25827081c8bf6b371c02ad4b2132b30b9ae74143b1ef","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"c1862036556262f076eda2008470b8a351b9c371d70664f54387c46890e8cd18","src/unix/linux_like/
570 linux/gnu/b64/x86_64/x32.rs":"30f88d0fa9e7807ee4cbe89fd274061f810099567d5e68fa829277d7d27ba708","src/unix/linux_like/linux/gnu/mod.rs":"c7924db757cf898c78029ad3772e6168ec99dd0dd1534df4132f8fe9717afed7","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"3dc8b1980062117edd7bdfdf2279065737f8cdcdcb883f57f23f27a1d0bbb8b2","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"45062a178b382ab17341a69d027b5c83325c4e79fecf45729ba9c47b1bcdc3da","src/unix/linux_like/linux/musl/b32/hexagon.rs":"7c6c481f70da1fe6ca759f363784e130041f3d87906c45910fc1142b5ef17970","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"9eb0e4953be5afaa0b9e3ac54c85ed40583cfb8cc0b03264b9bc8f763a8f3254","
571 src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"cf286cbf4d2076aaa82662ace2b5c333480410fa59af5cb4542d59f04da84b31","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"9c3b6e98e7710d6c877a4e31726d36416115a58f53fc469bb173b7fe660b39e5","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"0bf138f84e5327d8339bcd4adf071a6832b516445e597552c82bbd881095e3a8","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"7b3fb85a869e00aae3f6af9c36f82f9c70bf8c2b9cccbd931b923602846ea42c","src/unix/linux_like/linux/musl/b64/mips64.rs":"9d0158ac7a913222d0a62239ec043aa1aee73522a7a1e0e191d0642dde35c083","src/unix/linux_like/linux/musl/b64/mod.rs":"8b76e92a1505ad785d4aa0b7739e0b93647a1e81910949b49cedb6c88468be9c","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"ed9b879bb9cdc526ad838158
572 75edeb4cad4e8829086dfba2578277c265336229","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"cfeb109c732ac6bc7d2be44069d3652e917a0509b8b545270b756ff2d52e27e8","src/unix/linux_like/linux/musl/mod.rs":"243e32b93641df7a77f970a32c0fb8e4fd4a13720e54e0e42a9da321fd169798","src/unix/linux_like/linux/no_align.rs":"c81ccd1942295d423b43a55b4aa19633c2096fb93bb381a6a29acb93e85aab07","src/unix/linux_like/mod.rs":"e2d60b008a30f2d866be2da6372fe8390e246572d8344447615155f642016882","src/unix/mod.rs":"3196eb15b4f9fa88839f401ee5a8a06875f7da7f244e73323f3c4ca7fb5007b1","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/mod.rs":"8ab989
573 db6b21fee81a694c9f9f89014f8e78870d0541368527483c90f07542a7","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/newlib/xtensa/mod.rs":"4c72003c5e692e648c7e798358c49af6901e68850dbba0624af84c40baf208f5","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"89c31827cf348e9a7af387f9e708fc834d04da36cad415d3957d2faa70f2fcbe","src/unix/solarish/compat.rs":"d62a5d3b5bd6adc998cb9bb817a622ef9ec666235bb237bd0f13f8e6a94de576","src/unix/solarish/illumos.rs":"1088c45b238e7d398dbb140d238257d5b5f93aeded98652c3f6747f0c07b4fa7","src/unix/solarish/mod.rs":"ac1d11b1d51649ca1f156d2554951acc2204622bad1e0823cde24328c5fe60aa","src/unix/solarish/solaris.rs":"6000d322ee9f691f38a2cd89b2b8838e51f64c01584143924962b0c598e0985c","src/unix/uclibc/align.rs":"a8540e1cce5913a45bc8d7422b79e86c0b12740e8a679478e0e4d863a31f8cc1","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec725195
574 7315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"d67dd46bc6f417169fc6a23832bde7ccdafc5d1bcb08b10debdd82edaf75d529","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"a045ebc6619f540adf670b88a987abd2d6e42e440a552e8cfe9f8c77f397e873","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/uclibc/mips/mod.rs":"1054d0bfeb506b3346b9a4148564beced8a22da0d9c9a612101f6237756795fb","src/unix/uclibc/mod.rs":"18d6c2628ca458ba75e7
575 43bce75bda6614de99606af4e2e62daf2440d2878f18","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"4e34cebb7955e9c98ae2f310be6f8ed16a861fc3817c08543867554aeec9524e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"188fbaf06a8e23cac72718b1ef7eb4bd98bdfd946aa708151f3f7e3553b65876","src/unix/uclibc/x86_64/no_align.rs":"2ccc0107a6007c70dc49e656095b64a352ca5d8f9f3e65c1dba634effbc15636","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"79077f518d234baf6cb76cb742153d174b3ddd43c6eda9238ebb053e08f9f9c7","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb1
576 81d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"486a00bafb5b6bf0538c4d984dab021835295c431cb2ceb7a9a74b499f78ade6","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"c7ab9793baaa3b6854d25fdf44266b7953533009e4fa722ca717b71d3e5d2c9d","src/windows/mod.rs":"053c4d3d99c6a8b2fba4df0f8c7266cdd9fbbaa6bddc50cd6f747bef1ff59da9","src/windows/msvc.rs":"2c2bfce66027d88021e7289139ebf5b0db258a7b6443f18872c84dbd4ef57131","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4","triagebot.toml":"a135e10c777cd13459559bdf74fb704c1379af7c9b0f70bc49fa6f5a837daa81"},"package":"a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"}
577 -\ No newline at end of file
578 -+{"files":{"CONTRIBUTING.md":"3a9f0037ad5f1198eada74a9d0363925ef09db664380b0e5a2840f03da260476","Cargo.toml":"128aa804901aaf7c386262cfbba894041bf1b109232d69c3e8b6b01df0a67dd1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"a8d47ff51ca256f56a8932dba07660672dbfe3004257ca8de708aac1415937a1","README.md":"52f1027a072c02e6e9e1f3d9630ec24e4d57507399c6363afcbcceaa106d152b","build.rs":"ab351d7171b14f8032948e843841ebe8518ed95eb1abf0b1e689700c7cef4bf5","rustfmt.toml":"8a654d5787585ca8f2c20580737336fc327f411a07b0dbd4870adf6e9bdf624f","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"d5d4488e8c0b8227f516fe13810f550a2a72af3bdfe769200ad8687c8755bdf6","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75
579 fe9e88c4bcf4d836ca9f765c05c9c5be3","src/fixed_width_ints.rs":"34c60f12ec5eeb90f13ec3b954427532111c2446e69617616a97aefc1086a9f1","src/fuchsia/aarch64.rs":"378776a9e40766154a54c94c2a7b4675b5c302a38e6e42da99e67bfbaee60e56","src/fuchsia/align.rs":"ae1cf8f011a99737eabeb14ffff768e60f13b13363d7646744dbb0f443dab3d6","src/fuchsia/mod.rs":"61502b3d124759c7c1bae294c1662036a96718fb3bd329cfa2f12e1c61ac10ad","src/fuchsia/no_align.rs":"303f3f1b255e0088b5715094353cf00476131d8e94e6aebb3f469557771c8b8a","src/fuchsia/x86_64.rs":"93a3632b5cf67d2a6bcb7dc0a558605252d5fe689e0f38d8aa2ec5852255ac87","src/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/hermit/mod.rs":"d3bfce41e4463d4be8020a2d063c9bfa8b665f45f1cc6cbf3163f5d01e7cb21f","src/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/lib.rs":"2c276c0b8441855978c1c5f3b19131bf36e51921bc048fcd22a033d33cb6cc54","src/macros.rs":"83aed048c5053300345fca843b148928b91ed444188c479315
580 ff6bcabaa0c4e9","src/psp.rs":"a93741ac38660e548eb41b58df39da39944e5c04280a7b09e0be758e79942549","src/sgx.rs":"16a95cdefc81c5ee00d8353a60db363c4cc3e0f75abcd5d0144723f2a306ed1b","src/switch.rs":"9da3dd39b3de45a7928789926e8572d00e1e11a39e6f7289a1349aadce90edba","src/unix/align.rs":"2cdc7c826ef7ae61f5171c5ae8c445a743d86f1a7f2d9d7e4ceeec56d6874f65","src/unix/bsd/apple/b32/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b32/mod.rs":"6a4ce300da0d2b0db04b18548286603ffe4b47d679a41cf60f1902895894aa1f","src/unix/bsd/apple/b64/align.rs":"ec833a747866fe19ca2d9b4d3c9ff0385faba5edf4bd0d15fa68884c40b0e26c","src/unix/bsd/apple/b64/mod.rs":"81254d89be1febc5bb20e787d014a624950d56e2e14973df5bbebfdabc95ae20","src/unix/bsd/apple/mod.rs":"19c8598b72272cc61d7f6a05b7fec78958ce86b11d0f5a655e1e58da0bc2af44","src/unix/bsd/freebsdlike/dragonfly/errno.rs":"ae5e8e6b0f610ec015dfcc2928609037d7ea7b94570c72bcc5bdd588424c6259","src/unix/bsd/freebsdlike/dragonfly/mod.rs"
581 :"0e41b6202c7670ce27201095fc1a2826c9e9ccbbc751e97ae1568871ea481a62","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"14f0bd6693967d4fedec904f7042bd51f2138cb843ec4df18c911b357417cdd2","src/unix/bsd/freebsdlike/freebsd/arm.rs":"59d6a670eea562fb87686e243e0a84603d29a2028a3d4b3f99ccc01bd04d2f47","src/unix/bsd/freebsdlike/freebsd/freebsd11/b64.rs":"9808d152c1196aa647f1b0f0cf84dac8c930da7d7f897a44975545e3d9d17681","src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs":"16dd3e1a09f123d0aa544b3fd7c123654b4906cac94838fbed7f34a64413c930","src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs":"61cbe45f8499bedb168106b686d4f8239472f25c7553b069eec2afe197ff2df6","src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs":"c6152ce3db241d99e350d34352f3f3d167953ef0ee08bfbe2685cb9ebde2e83b","src/unix/bsd/freebsdlike/freebsd/mod.rs":"1ed8971b7de3b0435341a9af1366493d0458e4a00507dd824c4c11f4ce2006af","src/unix/bsd/freebsdlike/freebsd/powerpc64.rs":"2dae3ecc87eac3b11657aa98915def55fc4b5c0de11fe26aae23329a54628a9a","src/un
582 ix/bsd/freebsdlike/freebsd/x86.rs":"c5005e3249eb7c93cfbac72a9e9272320d80ce7983da990ceb05a447f59a02c5","src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs":"0e1f69a88fca1c32874b1daf5db3d446fefbe518dca497f096cc9168c39dde70","src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs":"6132aa0973454379674ea6cbc77e6eace1e1032dd9f38182071388a036f1bc08","src/unix/bsd/freebsdlike/mod.rs":"0046a4083f01ad67511427f1ac37168f31bef3be10c849d304d39f98d61c1267","src/unix/bsd/mod.rs":"4acdbc0148b672fe015ddd7cae952e5d77691df6941a20f8ca40fd996e6a37dd","src/unix/bsd/netbsdlike/mod.rs":"48dd60524119c1e09b255d5472d091e7e7b2b29eab04be51b4b1e740bd022859","src/unix/bsd/netbsdlike/netbsd/aarch64.rs":"b38fc046f9a40fea28bd26328b96629f4d5d63d7524936bd6af1865d401a8716","src/unix/bsd/netbsdlike/netbsd/arm.rs":"58cdbb70b0d6f536551f0f3bb3725d2d75c4690db12c26c034e7d6ec4a924452","src/unix/bsd/netbsdlike/netbsd/mod.rs":"16a9036b6a8b373cdf0576ae99c95430f3f111b6be906a1e1ecff8047e178a86","src/unix/bsd/netbsdlike/netbsd/powerpc.rs":"e
583 e7ff5d89d0ed22f531237b5059aa669df93a3b5c489fa641465ace8d405bf41","src/unix/bsd/netbsdlike/netbsd/sparc64.rs":"9489f4b3e4566f43bb12dfb92238960613dac7f6a45cc13068a8d152b902d7d9","src/unix/bsd/netbsdlike/netbsd/x86.rs":"20692320e36bfe028d1a34d16fe12ca77aa909cb02bda167376f98f1a09aefe7","src/unix/bsd/netbsdlike/netbsd/x86_64.rs":"135509edeaf3fb3f102d89d51ff1a8f82323497336a8dc7e1f0f23b5c2434b73","src/unix/bsd/netbsdlike/openbsd/aarch64.rs":"1dd5449dd1fd3d51e30ffdeeaece91d0aaf05c710e0ac699fecc5461cfa2c28e","src/unix/bsd/netbsdlike/openbsd/mod.rs":"a2938e72d1c6e3f32fb51e896b63abd0d79e1e360dc53f9254fdac82b21206b9","src/unix/bsd/netbsdlike/openbsd/sparc64.rs":"d04fd287afbaa2c5df9d48c94e8374a532a3ba491b424ddf018270c7312f4085","src/unix/bsd/netbsdlike/openbsd/x86.rs":"6f7f5c4fde2a2259eb547890cbd86570cea04ef85347d7569e94e679448bec87","src/unix/bsd/netbsdlike/openbsd/x86_64.rs":"e59b7fd65f68f8e857eec39e0c03bac1d3af6ddc26c9ba58494336b83659bb9b","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b474450
584 0d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"29863051c296eeb22e7f00a266d6632b6a886b9a791f128e3c554e96213c3a16","src/unix/hermit/aarch64.rs":"86048676e335944c37a63d0083d0f368ae10ceccefeed9debb3bbe08777fc682","src/unix/hermit/mod.rs":"fb7e14d0f46ffaa989b5ab68c85184efe6aa04b5381e46866299b1f3258ddce3","src/unix/hermit/x86_64.rs":"ab832b7524e5fb15c49ff7431165ab1a37dc4667ae0b58e8306f4c539bfa110c","src/unix/linux_like/android/b32/arm.rs":"155994121906903a2e0afad895f0b3b7546f6e54d6305a3336ce2c4dfafbfdfa","src/unix/linux_like/android/b32/mod.rs":"0325adf3364fed7157fff5b24fabe1b36d806c39ee04ec82dd29a606d28f91f6","src/unix/linux_like/android/b32/x86/align.rs":"812914e4241df82e32b12375ca3374615dc3a4bdd4cf31f0423c5815320c0dab","src/unix/linux_like/android/b32/x86/mod.rs":"5b1e9fcd77ca5f939acb7fb5f5da12f305b0377698d8b8989feb236e26360aa0","src/unix/linux_like/android/b64/aarch64/align.rs":"
585 2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/android/b64/aarch64/mod.rs":"655116966eb7846b933e5e28b073c329668588cd3c2120cc9ce60c697bd19978","src/unix/linux_like/android/b64/mod.rs":"6a71abfcbbcdae60c916de41cd4688d5f25bdbca83d1d9df49decd56ad726a06","src/unix/linux_like/android/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/android/b64/x86_64/mod.rs":"e84176d838e663d351450bad218715db1fafbb531e47ea0e262cbb45829dae89","src/unix/linux_like/android/mod.rs":"d414f682fd0d138d440300dc53c6b8b069730e19230dabd4c01173c4578c42b5","src/unix/linux_like/emscripten/align.rs":"86c95cbed7a7161b1f23ee06843e7b0e2340ad92b2cb86fe2a8ef3e0e8c36216","src/unix/linux_like/emscripten/mod.rs":"55fb89f5a965a4ad81ee4d02498c32aaed69e6047ce708c2329a602171862a76","src/unix/linux_like/emscripten/no_align.rs":"0128e4aa721a9902754828b61b5ec7d8a86619983ed1e0544a85d35b1051fad6","src/unix/linux_like/linux/align.rs":"dde64
586 8468764a5deef5566b8016290150acf50ee6a0f8c0678cb2078658bc2fa","src/unix/linux_like/linux/gnu/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/linux_like/linux/gnu/b32/arm/align.rs":"3fed009dc9af3cc81be7087da9d2d7d1f39845e4497e290259c5cdbae25f039d","src/unix/linux_like/linux/gnu/b32/arm/mod.rs":"6d9ba242111c7be8173b7a7b8cf8c863ba23d839edc9d026c0fd37a4b64460b4","src/unix/linux_like/linux/gnu/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/gnu/b32/mips/mod.rs":"e2d2e51fea73210d9705b7eaa37de8baa7152b71ae3a10a316c277345c529b5c","src/unix/linux_like/linux/gnu/b32/mod.rs":"e224551fa50be726bc8a559da32a96294b18743fb5a5b67cdbee4bb6a9eeb796","src/unix/linux_like/linux/gnu/b32/powerpc.rs":"39aae80d2c4ffa845592e16c0a6c910017de19e2b15c1e507c4df10e79ce3e38","src/unix/linux_like/linux/gnu/b32/sparc/align.rs":"21adbed27df73e2d1ed934aaf733a643003d7baf2bde9c48ea440895bcca6d41","src/unix/linux_like/lin
587 ux/gnu/b32/sparc/mod.rs":"3b4dd40b288788740d2b030171b21f9d0b076ce26d88e0ff62f5d87f09e7c787","src/unix/linux_like/linux/gnu/b32/x86/align.rs":"e4bafdc4a519a7922a81b37a62bbfd1177a2f620890eef8f1fbc47162e9eb413","src/unix/linux_like/linux/gnu/b32/x86/mod.rs":"927d1bd8cb2f053549fc5acfeb1315b7f80b35d7a1904cd76e99651ff32b141e","src/unix/linux_like/linux/gnu/b64/aarch64/align.rs":"2179c3b1608fa4bf68840482bfc2b2fa3ee2faf6fcae3770f9e505cddca35c7b","src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs":"17e9cd23a14bd19700c05a154568fff5897788c0ae151c21dd3bba67aac829d9","src/unix/linux_like/linux/gnu/b64/mips64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/mips64/mod.rs":"0b5d94f3a2361742b6dd9eb3f543ddf675d3f70dab3402ad179faa6ddaae2218","src/unix/linux_like/linux/gnu/b64/mod.rs":"b90d87f76bff37707a1725551fe45d70d0c106e01b1dbbcd5f60460e0a19b4c3","src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc7
588 8a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs":"2f279eb268c0aca9a6bd9b4c84139799cd039a64ca1cd2ded68b04c63397be1b","src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs":"bb01828300f02c11c27689522454439d0d02f22d738df88a97367dc87eecf868","src/unix/linux_like/linux/gnu/b64/s390x.rs":"9c449b64b11cbf55d453b324cf9475acb3253f85cb9692f9873b777ed8978ff4","src/unix/linux_like/linux/gnu/b64/sparc64/align.rs":"e29c4868bbecfa4a6cd8a2ad06193f3bbc78a468cc1dc9df83f002f1268130d9","src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs":"a2667a09e526878683fafa02474f81fbc212d861ceeabade17b0ff4d6d49ff9d","src/unix/linux_like/linux/gnu/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs":"e6197537739cb8628cad25827081c8bf6b371c02ad4b2132b30b9ae74143b1ef","src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs":"c1862036556262f076eda2008470b8a351b9c371d70664f54387c46890e8cd18","src/unix/linux_like/
589 linux/gnu/b64/x86_64/x32.rs":"30f88d0fa9e7807ee4cbe89fd274061f810099567d5e68fa829277d7d27ba708","src/unix/linux_like/linux/gnu/mod.rs":"c7924db757cf898c78029ad3772e6168ec99dd0dd1534df4132f8fe9717afed7","src/unix/linux_like/linux/gnu/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/linux_like/linux/mod.rs":"3dc8b1980062117edd7bdfdf2279065737f8cdcdcb883f57f23f27a1d0bbb8b2","src/unix/linux_like/linux/musl/b32/arm/align.rs":"3e8ac052c1043764776b54c93ba4260e061df998631737a897d9d47d54f7b80c","src/unix/linux_like/linux/musl/b32/arm/mod.rs":"45062a178b382ab17341a69d027b5c83325c4e79fecf45729ba9c47b1bcdc3da","src/unix/linux_like/linux/musl/b32/hexagon.rs":"7c6c481f70da1fe6ca759f363784e130041f3d87906c45910fc1142b5ef17970","src/unix/linux_like/linux/musl/b32/mips/align.rs":"429fb5e005cb7143602d430098b6ebfb7d360685b194f333dfd587472ae954ee","src/unix/linux_like/linux/musl/b32/mips/mod.rs":"9eb0e4953be5afaa0b9e3ac54c85ed40583cfb8cc0b03264b9bc8f763a8f3254","
590 src/unix/linux_like/linux/musl/b32/mod.rs":"8ede3985e6243882814ce91e8ce543e7edbafc0cee5932816072b6f14207a671","src/unix/linux_like/linux/musl/b32/powerpc.rs":"cf286cbf4d2076aaa82662ace2b5c333480410fa59af5cb4542d59f04da84b31","src/unix/linux_like/linux/musl/b32/x86/align.rs":"08e77fbd7435d7dec2ff56932433bece3f02e47ce810f89004a275a86d39cbe1","src/unix/linux_like/linux/musl/b32/x86/mod.rs":"9c3b6e98e7710d6c877a4e31726d36416115a58f53fc469bb173b7fe660b39e5","src/unix/linux_like/linux/musl/b64/aarch64/align.rs":"0bf138f84e5327d8339bcd4adf071a6832b516445e597552c82bbd881095e3a8","src/unix/linux_like/linux/musl/b64/aarch64/mod.rs":"7b3fb85a869e00aae3f6af9c36f82f9c70bf8c2b9cccbd931b923602846ea42c","src/unix/linux_like/linux/musl/b64/mips64.rs":"9d0158ac7a913222d0a62239ec043aa1aee73522a7a1e0e191d0642dde35c083","src/unix/linux_like/linux/musl/b64/mod.rs":"8b76e92a1505ad785d4aa0b7739e0b93647a1e81910949b49cedb6c88468be9c","src/unix/linux_like/linux/musl/b64/powerpc64.rs":"ed9b879bb9cdc526ad838158
591 75edeb4cad4e8829086dfba2578277c265336229","src/unix/linux_like/linux/musl/b64/x86_64/align.rs":"7169d07a9fd4716f7512719aec9fda5d8bed306dc0720ffc1b21696c9951e3c6","src/unix/linux_like/linux/musl/b64/x86_64/mod.rs":"cfeb109c732ac6bc7d2be44069d3652e917a0509b8b545270b756ff2d52e27e8","src/unix/linux_like/linux/musl/mod.rs":"243e32b93641df7a77f970a32c0fb8e4fd4a13720e54e0e42a9da321fd169798","src/unix/linux_like/linux/no_align.rs":"c81ccd1942295d423b43a55b4aa19633c2096fb93bb381a6a29acb93e85aab07","src/unix/linux_like/mod.rs":"e2d60b008a30f2d866be2da6372fe8390e246572d8344447615155f642016882","src/unix/mod.rs":"c34d511e9bdf7504d4c30d6b60c7364085b3fc6feeacfac2ee92267d3c42fd21","src/unix/newlib/aarch64/mod.rs":"bb269c1468a9676442554600e87417079a787fe6220dfc23b3109639259e8710","src/unix/newlib/align.rs":"28aaf87fafbc6b312622719d472d8cf65f9e5467d15339df5f73e66d8502b28a","src/unix/newlib/arm/mod.rs":"c71be856bfd7f576b2db28af9f680211cbe6c1cac7d537bbc8020b39591af07c","src/unix/newlib/mod.rs":"8ab989
592 db6b21fee81a694c9f9f89014f8e78870d0541368527483c90f07542a7","src/unix/newlib/no_align.rs":"7123dcec13604a11b7765c380ff3a4d0da19c39f4b03919de7857723c0cf1502","src/unix/newlib/xtensa/mod.rs":"4c72003c5e692e648c7e798358c49af6901e68850dbba0624af84c40baf208f5","src/unix/no_align.rs":"c06e95373b9088266e0b14bba0954eef95f93fb2b01d951855e382d22de78e53","src/unix/redox/mod.rs":"89c31827cf348e9a7af387f9e708fc834d04da36cad415d3957d2faa70f2fcbe","src/unix/solarish/compat.rs":"d62a5d3b5bd6adc998cb9bb817a622ef9ec666235bb237bd0f13f8e6a94de576","src/unix/solarish/illumos.rs":"1088c45b238e7d398dbb140d238257d5b5f93aeded98652c3f6747f0c07b4fa7","src/unix/solarish/mod.rs":"ac1d11b1d51649ca1f156d2554951acc2204622bad1e0823cde24328c5fe60aa","src/unix/solarish/solaris.rs":"6000d322ee9f691f38a2cd89b2b8838e51f64c01584143924962b0c598e0985c","src/unix/uclibc/align.rs":"a8540e1cce5913a45bc8d7422b79e86c0b12740e8a679478e0e4d863a31f8cc1","src/unix/uclibc/arm/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec725195
593 7315afa53a7b9f936","src/unix/uclibc/arm/mod.rs":"d67dd46bc6f417169fc6a23832bde7ccdafc5d1bcb08b10debdd82edaf75d529","src/unix/uclibc/arm/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips32/align.rs":"e4a3c27fe20a57b8d612c34cb05bc70646edb5cec7251957315afa53a7b9f936","src/unix/uclibc/mips/mips32/mod.rs":"a045ebc6619f540adf670b88a987abd2d6e42e440a552e8cfe9f8c77f397e873","src/unix/uclibc/mips/mips32/no_align.rs":"9cd223135de75315840ff9c3fd5441ba1cb632b96b5c85a76f8316c86653db25","src/unix/uclibc/mips/mips64/align.rs":"a7bdcb18a37a2d91e64d5fad83ea3edc78f5412adb28f77ab077dbb26dd08b2d","src/unix/uclibc/mips/mips64/mod.rs":"e3085ba56cfbc528d7c3c55065880603238c333b6047ef51c58177508a487fcd","src/unix/uclibc/mips/mips64/no_align.rs":"4a18e3875698c85229599225ac3401a2a40da87e77b2ad4ef47c6fcd5a24ed30","src/unix/uclibc/mips/mod.rs":"1054d0bfeb506b3346b9a4148564beced8a22da0d9c9a612101f6237756795fb","src/unix/uclibc/mod.rs":"18d6c2628ca458ba75e7
594 43bce75bda6614de99606af4e2e62daf2440d2878f18","src/unix/uclibc/no_align.rs":"3f28637046524618adaa1012e26cb7ffe94b9396e6b518cccdc69d59f274d709","src/unix/uclibc/x86_64/align.rs":"4e34cebb7955e9c98ae2f310be6f8ed16a861fc3817c08543867554aeec9524e","src/unix/uclibc/x86_64/l4re.rs":"bb31053d6403091e11f95ac2203982f279f8b984a19adf30796878c45fdd8c25","src/unix/uclibc/x86_64/mod.rs":"188fbaf06a8e23cac72718b1ef7eb4bd98bdfd946aa708151f3f7e3553b65876","src/unix/uclibc/x86_64/no_align.rs":"2ccc0107a6007c70dc49e656095b64a352ca5d8f9f3e65c1dba634effbc15636","src/unix/uclibc/x86_64/other.rs":"42c3f71e58cabba373f6a55a623f3c31b85049eb64824c09c2b082b3b2d6a0a8","src/vxworks/aarch64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/arm.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb181d788e88","src/vxworks/mod.rs":"79077f518d234baf6cb76cb742153d174b3ddd43c6eda9238ebb053e08f9f9c7","src/vxworks/powerpc.rs":"acb7968ce99fe3f4abdf39d98f8133d21a4fba435b8ef7084777cb1
595 81d788e88","src/vxworks/powerpc64.rs":"98f0afdc511cd02557e506c21fed6737585490a1dce7a9d4941d08c437762b99","src/vxworks/x86.rs":"552f007f38317620b23889cb7c49d1d115841252439060122f52f434fbc6e5ba","src/vxworks/x86_64.rs":"018d92be3ad628a129eff9f2f5dfbc0883d8b8e5f2fa917b900a7f98ed6b514a","src/wasi.rs":"486a00bafb5b6bf0538c4d984dab021835295c431cb2ceb7a9a74b499f78ade6","src/windows/gnu/align.rs":"b2c13ec1b9f3b39a75c452c80c951dff9d0215e31d77e883b4502afb31794647","src/windows/gnu/mod.rs":"c7ab9793baaa3b6854d25fdf44266b7953533009e4fa722ca717b71d3e5d2c9d","src/windows/mod.rs":"053c4d3d99c6a8b2fba4df0f8c7266cdd9fbbaa6bddc50cd6f747bef1ff59da9","src/windows/msvc.rs":"2c2bfce66027d88021e7289139ebf5b0db258a7b6443f18872c84dbd4ef57131","tests/const_fn.rs":"cb75a1f0864f926aebe79118fc34d51a0d1ade2c20a394e7774c7e545f21f1f4","triagebot.toml":"a135e10c777cd13459559bdf74fb704c1379af7c9b0f70bc49fa6f5a837daa81"},"package":"a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"}
596 -\ No newline at end of file
597
598 diff --git a/dev-lang/rust/rust-1.47.0-r1.ebuild b/dev-lang/rust/rust-1.47.0-r1.ebuild
599 index 577ef66..fb3b774 100644
600 --- a/dev-lang/rust/rust-1.47.0-r1.ebuild
601 +++ b/dev-lang/rust/rust-1.47.0-r1.ebuild
602 @@ -29,6 +29,8 @@ SRC_URI="
603 ppc64? ( $(rust_arch_uri powerpc64-gentoo-linux-musl rust-${RUST_STAGE0_VERSION} ) )
604 x86? ( $(rust_arch_uri i686-gentoo-linux-musl rust-${RUST_STAGE0_VERSION} ) )
605 )
606 + http://dev.gentoo.org/~anarchy/dist/0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
607 + http://dev.gentoo.org/~anarchy/dist/0030-libc-linkage.patch
608 "
609
610 # keep in sync with llvm ebuild of the same version as bundled one.
611 @@ -127,7 +129,7 @@ PATCHES=(
612 "${FILESDIR}"/0003-Fix-linking-to-zlib-when-cross-compiling.patch
613 "${FILESDIR}"/0004-Fix-rustdoc-when-cross-compiling-on-musl.patch
614 "${FILESDIR}"/0005-Use-static-native-libraries-when-linking-static-exec.patch
615 - "${FILESDIR}"/0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
616 + "${DISTDIR}"/0006-Remove-musl_root-and-CRT-fallback-from-musl-targets.patch
617 "${FILESDIR}"/0007-Prefer-libgcc_eh-over-libunwind-for-musl.patch
618 "${FILESDIR}"/0008-Link-libssp_nonshared.a-on-all-musl-targets.patch
619 "${FILESDIR}"/0009-test-failed-doctest-output-Fix-normalization.patch
620 @@ -137,7 +139,7 @@ PATCHES=(
621 "${FILESDIR}"/0013-Link-stage-2-tools-dynamically-to-libstd.patch
622 "${FILESDIR}"/0014-Move-debugger-scripts-to-usr-share-rust.patch
623 "${FILESDIR}"/0015-Add-gentoo-target-specs.patch
624 - "${FILESDIR}"/0030-libc-linkage.patch
625 + "${DISTDIR}"/0030-libc-linkage.patch
626 "${FILESDIR}"/0040-rls-atomics.patch
627 "${FILESDIR}"/0050-llvm.patch
628 "${FILESDIR}"/0051-llvm-powerpc-elfv2.patch