Merge branch 'rust' into 'master'

user/rust: Bump to 1.29.1 plus fixes for i586, ppc32



See merge request !85

1 files changed, 92 insertions, 0 deletions

diff --git a/user/rust/0016-Add-powerpc-unknown-linux-musl-target.patch b/user/rust/0016-Add-powerpc-unknown-linux-musl-target.patch
new file mode 100644
index 000000000..1bafb8dd5
--- /dev/null
+++ b/user/rust/0016-Add-powerpc-unknown-linux-musl-target.patch
@@ -0,0 +1,92 @@
+From 763b30d1e146fc04f7de2a8b1d6b17dcd94e3e0f Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Mon, 10 Sep 2018 01:35:35 +0000
+Subject: [PATCH 16/29] Add powerpc-unknown-linux-musl target
+
+---
+ src/bootstrap/native.rs                       |  1 +
+ src/librustc_target/spec/mod.rs               |  1 +
+ .../spec/powerpc_unknown_linux_musl.rs        | 34 +++++++++++++++++++
+ src/tools/build-manifest/src/main.rs          |  1 +
+ 4 files changed, 37 insertions(+)
+ create mode 100644 src/librustc_target/spec/powerpc_unknown_linux_musl.rs
+
+diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
+index 18c3dba233..7c32b8b546 100644
+--- a/src/bootstrap/native.rs
++++ b/src/bootstrap/native.rs
+@@ -634,6 +634,7 @@ impl Step for Openssl {
+             "mipsel-unknown-linux-musl" => "linux-mips32",
+             "powerpc-unknown-linux-gnu" => "linux-ppc",
+             "powerpc-unknown-linux-gnuspe" => "linux-ppc",
++            "powerpc-unknown-linux-musl" => "linux-ppc",
+             "powerpc-unknown-netbsd" => "BSD-generic32",
+             "powerpc64-unknown-linux-gnu" => "linux-ppc64",
+             "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
+index c5d21cdc46..f09e5a7465 100644
+--- a/src/librustc_target/spec/mod.rs
++++ b/src/librustc_target/spec/mod.rs
+@@ -272,6 +272,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,
++    })
++}
+diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
+index 83b2895e1d..7659d24f47 100644
+--- a/src/tools/build-manifest/src/main.rs
++++ b/src/tools/build-manifest/src/main.rs
+@@ -86,6 +86,7 @@ static TARGETS: &'static [&'static str] = &[
+     "mipsel-unknown-linux-musl",
+     "powerpc-unknown-linux-gnu",
+     "powerpc-unknown-linux-gnuspe",
++    "powerpc-unknown-linux-musl",
+     "powerpc64-unknown-linux-gnu",
+     "powerpc64le-unknown-linux-gnu",
+     "powerpc64le-unknown-linux-musl",
+-- 
+2.18.0
+