diff options
author | Marat Safin <jeizsm@gmail.com> | 2019-01-18 12:37:41 +0300 |
---|---|---|
committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-23 19:38:12 +0000 |
commit | e066018fc40a37267d5cbaed6245382d1215ee15 (patch) | |
tree | bd0999e1e2c390216c7763a4f9788d7025f5ff33 /community/rust/musl-fix-linux_musl_base.patch | |
parent | 59c72398df08141f4177bd93f513451e16d90480 (diff) | |
download | aports-e066018fc40a37267d5cbaed6245382d1215ee15.tar.bz2 aports-e066018fc40a37267d5cbaed6245382d1215ee15.tar.xz |
community/rust: upgrade to 1.32.0
Signed-off-by: Marat Safin <jeizsm@gmail.com>
Closes GH-6071
Diffstat (limited to 'community/rust/musl-fix-linux_musl_base.patch')
-rw-r--r-- | community/rust/musl-fix-linux_musl_base.patch | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/community/rust/musl-fix-linux_musl_base.patch b/community/rust/musl-fix-linux_musl_base.patch index e342f448fc..90314dce62 100644 --- a/community/rust/musl-fix-linux_musl_base.patch +++ b/community/rust/musl-fix-linux_musl_base.patch @@ -6,7 +6,7 @@ See https://github.com/rust-lang/rust/pull/40113 --- a/src/librustc_target/spec/linux_musl_base.rs +++ b/src/librustc_target/spec/linux_musl_base.rs -@@ -13,53 +13,12 @@ +@@ -13,28 +13,12 @@ pub fn opts() -> TargetOptions { let mut base = super::linux_base::opts(); @@ -21,31 +21,6 @@ See https://github.com/rust-lang/rust/pull/40113 // argument is *not* necessary for normal builds, but it can't hurt! base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,--eh-frame-hdr".to_string()); -- // There's a whole bunch of circular dependencies when dealing with MUSL -- // unfortunately. To put this in perspective libc is statically linked to -- // liblibc and libunwind is statically linked to libstd: -- // -- // * libcore depends on `fmod` which is in libc (transitively in liblibc). -- // liblibc, however, depends on libcore. -- // * compiler-rt has personality symbols that depend on libunwind, but -- // libunwind is in libstd which depends on compiler-rt. -- // -- // Recall that linkers discard libraries and object files as much as -- // possible, and with all the static linking and archives flying around with -- // MUSL the linker is super aggressively stripping out objects. For example -- // the first case has fmod stripped from liblibc (it's in its own object -- // file) so it's not there when libcore needs it. In the second example all -- // the unused symbols from libunwind are stripped (each is in its own object -- // file in libstd) before we end up linking compiler-rt which depends on -- // those symbols. -- // -- // To deal with these circular dependencies we just force the compiler to -- // link everything as a group, not stripping anything out until everything -- // is processed. The linker will still perform a pass to strip out object -- // files but it won't do so until all objects/archives have been processed. -- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-Wl,-(".to_string()); -- base.post_link_args.insert(LinkerFlavor::Gcc, vec!["-Wl,-)".to_string()]); -- - // When generating a statically linked executable there's generally some - // small setup needed which is listed in these files. These are provided by - // a musl toolchain and are linked by default by the `musl-gcc` script. Note |