diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
| commit | 097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch) | |
| tree | daa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0007-Add-powerpc-unknown-linux-musl-target.patch | |
| parent | 950827890cca5caf633480047da6115f43b1a529 (diff) | |
| parent | 18b490b7953735328501c6f7e54522a91220caf3 (diff) | |
| download | packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2 packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1
See merge request !105
Diffstat (limited to 'user/rust/0007-Add-powerpc-unknown-linux-musl-target.patch')
| -rw-r--r-- | user/rust/0007-Add-powerpc-unknown-linux-musl-target.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/user/rust/0007-Add-powerpc-unknown-linux-musl-target.patch b/user/rust/0007-Add-powerpc-unknown-linux-musl-target.patch new file mode 100644 index 000000000..71efb1715 --- /dev/null +++ b/user/rust/0007-Add-powerpc-unknown-linux-musl-target.patch @@ -0,0 +1,66 @@ +From c83f072f61eb7034f415eab21b094c6936bed2a4 Mon Sep 17 00:00:00 2001 +From: Samuel Holland <samuel@sholland.org> +Date: Mon, 10 Sep 2018 01:35:35 +0000 +Subject: [PATCH 07/24] Add powerpc-unknown-linux-musl target + +--- + src/librustc_target/spec/mod.rs | 1 + + .../spec/powerpc_unknown_linux_musl.rs | 34 +++++++++++++++++++ + 2 files changed, 35 insertions(+) + create mode 100644 src/librustc_target/spec/powerpc_unknown_linux_musl.rs + +diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs +index 3c68b5a7ab..2e396b99e0 100644 +--- a/src/librustc_target/spec/mod.rs ++++ b/src/librustc_target/spec/mod.rs +@@ -297,6 +297,7 @@ supported_targets! { + ("mipsel-unknown-linux-gnu", mipsel_unknown_linux_gnu), + ("powerpc-unknown-linux-gnu", powerpc_unknown_linux_gnu), + ("powerpc-unknown-linux-gnuspe", powerpc_unknown_linux_gnuspe), ++ ("powerpc-unknown-linux-musl", powerpc_unknown_linux_musl), + ("powerpc64-unknown-linux-gnu", powerpc64_unknown_linux_gnu), + ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu), + ("powerpc64le-unknown-linux-musl", powerpc64le_unknown_linux_musl), +diff --git a/src/librustc_target/spec/powerpc_unknown_linux_musl.rs b/src/librustc_target/spec/powerpc_unknown_linux_musl.rs +new file mode 100644 +index 0000000000..48340da514 +--- /dev/null ++++ b/src/librustc_target/spec/powerpc_unknown_linux_musl.rs +@@ -0,0 +1,34 @@ ++// Copyright 2018 The Rust Project Developers. See the COPYRIGHT ++// file at the top-level directory of this distribution and at ++// http://rust-lang.org/COPYRIGHT. ++// ++// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or ++// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license ++// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your ++// option. This file may not be copied, modified, or distributed ++// except according to those terms. ++ ++use spec::{LinkerFlavor, Target, TargetResult}; ++ ++pub fn target() -> TargetResult { ++ let mut base = super::linux_musl_base::opts(); ++ base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); ++ base.max_atomic_width = Some(32); ++ ++ // see #36994 ++ base.exe_allocation_crate = None; ++ ++ Ok(Target { ++ llvm_target: "powerpc-unknown-linux-musl".to_string(), ++ target_endian: "big".to_string(), ++ target_pointer_width: "32".to_string(), ++ target_c_int_width: "32".to_string(), ++ data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(), ++ arch: "powerpc".to_string(), ++ target_os: "linux".to_string(), ++ target_env: "musl".to_string(), ++ target_vendor: "unknown".to_string(), ++ linker_flavor: LinkerFlavor::Gcc, ++ options: base, ++ }) ++} +-- +2.18.0 + |