Merge branch 'rust' into 'master'

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



See merge request !85

1 files changed, 0 insertions, 38 deletions

diff --git a/user/rust/0027-Add-foxkit-target-specs-for-OpenSSL.patch b/user/rust/0027-Add-foxkit-target-specs-for-OpenSSL.patch
deleted file mode 100644
index 69e8584ba..000000000
--- a/user/rust/0027-Add-foxkit-target-specs-for-OpenSSL.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7eba02678b9a00bc6d38281795422663bca3fcc1 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Tue, 18 Sep 2018 00:02:46 +0000
-Subject: [PATCH 27/28] Add foxkit target specs for OpenSSL
-
----
- src/bootstrap/native.rs | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
-index 186ef75189..406c76b95c 100644
---- a/src/bootstrap/native.rs
-+++ b/src/bootstrap/native.rs
-@@ -652,6 +652,12 @@ impl Step for Openssl {
-             "x86_64-unknown-linux-gnux32" => "linux-x32",
-             "x86_64-unknown-linux-musl" => "linux-x86_64",
-             "x86_64-unknown-netbsd" => "BSD-x86_64",
-+            "aarch64-foxkit-linux-musl" => "linux-aarch64",
-+            "armv7-foxkit-linux-musleabihf" => "linux-armv4",
-+            "i586-foxkit-linux-musl" => "linux-elf",
-+            "powerpc-foxkit-linux-musl" => "linux-ppc",
-+            "powerpc64-foxkit-linux-musl" => "linux-ppc64",
-+            "x86_64-foxkit-linux-musl" => "linux-x86_64",
-             _ => panic!("don't know how to configure OpenSSL for {}", target),
-         };
-         configure.arg(os);
-@@ -666,7 +672,7 @@ impl Step for Openssl {
-             configure.arg("-fomit-frame-pointer");
-         }
-         // OpenSSL ships incompatible ELFv1 ABI assembly code
--        if target == "powerpc64-unknown-linux-musl" {
-+        if target == "powerpc64-unknown-linux-musl" || target == "powerpc64-foxkit-linux-musl" {
-             configure.arg("no-asm");
-         }
-         if target == "sparc64-unknown-netbsd" {
--- 
-2.18.0
-