diff options
author | Samuel Holland <samuel@sholland.org> | 2018-10-06 04:22:05 +0000 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2018-10-09 04:28:15 +0000 |
commit | 2323b0da26e293bb4d5a7a4ad8afed85a599d11d (patch) | |
tree | d67f5276d8d72c2fe2caa2e4e5756c14848d9f91 /user/rust/0016-Use-ELFv2-ABI-on-powerpc64-musl-Rust-half.patch | |
parent | 49cec2be42835f6b4c5ff1bad4710e20db422b87 (diff) | |
download | packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.gz packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.bz2 packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.tar.xz packages-2323b0da26e293bb4d5a7a4ad8afed85a599d11d.zip |
user/rust: Bump to 1.29.1 plus fixes for i586, ppc32
Diffstat (limited to 'user/rust/0016-Use-ELFv2-ABI-on-powerpc64-musl-Rust-half.patch')
-rw-r--r-- | user/rust/0016-Use-ELFv2-ABI-on-powerpc64-musl-Rust-half.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/user/rust/0016-Use-ELFv2-ABI-on-powerpc64-musl-Rust-half.patch b/user/rust/0016-Use-ELFv2-ABI-on-powerpc64-musl-Rust-half.patch deleted file mode 100644 index 5841dfaf5..000000000 --- a/user/rust/0016-Use-ELFv2-ABI-on-powerpc64-musl-Rust-half.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 616f6627b1489fbf87f867cc9b7a2c870c64f06f Mon Sep 17 00:00:00 2001 -From: Samuel Holland <samuel@sholland.org> -Date: Wed, 8 Aug 2018 22:06:18 -0500 -Subject: [PATCH 16/28] Use ELFv2 ABI on powerpc64 musl (Rust half) - ---- - src/librustc_target/abi/call/powerpc64.rs | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/librustc_target/abi/call/powerpc64.rs b/src/librustc_target/abi/call/powerpc64.rs -index 0c5ec77a39..4851b25fe7 100644 ---- a/src/librustc_target/abi/call/powerpc64.rs -+++ b/src/librustc_target/abi/call/powerpc64.rs -@@ -14,6 +14,7 @@ - - use abi::call::{FnType, ArgType, Reg, RegKind, Uniform}; - use abi::{Align, Endian, HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods}; -+use spec::HasTargetSpec; - - #[derive(Debug, Clone, Copy, PartialEq)] - enum ABI { -@@ -136,11 +137,14 @@ fn classify_arg_ty<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>, abi: ABI) - - pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>) - where Ty: TyLayoutMethods<'a, C> + Copy, -- C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout -+ C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout + HasTargetSpec - { -- let abi = match cx.data_layout().endian { -- Endian::Big => ELFv1, -- Endian::Little => ELFv2, -+ let abi = match cx.target_spec().target_env { -+ "musl" => ELFv2, -+ _ => match cx.data_layout().endian { -+ Endian::Big => ELFv1, -+ Endian::Little => ELFv2 -+ } - }; - - if !fty.ret.is_ignore() { --- -2.18.0 - |