Merge branch 'rust' into 'master'

Rust bump

Builds on pmmx/x86_64/ppc64/aarch64. Successfully builds Firefox.

Still fails 17 tests on ppc32, but the ICE has been fixed:

```
    [run-make] run-make-fulldeps/exit-code
    [run-make] run-make-fulldeps/extern-fn-generic
    [run-make] run-make-fulldeps/extern-fn-struct-passing-abi
    [run-make] run-make-fulldeps/extern-fn-with-packed-struct
    [run-make] run-make-fulldeps/extern-fn-with-union
    [run-make] run-make-fulldeps/issue-25581
    [run-make] run-make-fulldeps/relocation-model
    [run-pass] run-pass/extern/extern-pass-TwoU16s.rs
    [run-pass] run-pass/extern/extern-pass-TwoU32s.rs
    [run-pass] run-pass/extern/extern-pass-TwoU64s.rs
    [run-pass] run-pass/extern/extern-pass-TwoU8s.rs
    [run-pass] run-pass/extern/extern-pass-empty.rs
    [run-pass] run-pass/foreign/foreign-fn-with-byval.rs
    [run-pass] run-pass/issues/issue-28676.rs
    [run-pass] run-pass/structs-enums/struct-return.rs
    [run-pass] run-pass/threads-sendsync/thread-local-extern-static.rs
    [run-pass] run-pass/union/union-c-interop.rs
```

See merge request !232

1 files changed, 10 insertions, 20 deletions

diff --git a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
index bb20cb7b6..f6a0ddb6b 100644
--- a/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
+++ b/user/rust/0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
@@ -1,33 +1,23 @@
-From 6861c8305fc6449fdc019405d501e5740d44b818 Mon Sep 17 00:00:00 2001
+From 600b7bb76d82d2ec180051318d811ad50fd68900 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Wed, 10 Jan 2018 13:36:41 -0600
-Subject: [PATCH 01/14] Don't pass CFLAGS to the C++ compiler
+Subject: [PATCH 01/13] Don't pass CFLAGS to the C++ compiler
 
 ---
- src/bootstrap/builder.rs | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ src/bootstrap/builder.rs | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 9c58f5b179..bbb275c572 100644
+index 522466314d..86f059a202 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -1037,7 +1037,7 @@ impl<'a> Builder<'a> {
-             let cflags = self.cflags(target, GitRepo::Rustc).join(" ");
-             cargo
-                 .env(format!("CFLAGS_{}", target), cflags.clone())
--                .env("CFLAGS", cflags.clone());
-+                .env("CFLAGS", cflags);
- 
-             if let Some(ar) = self.ar(target) {
-                 let ranlib = format!("{} s", ar.display());
-@@ -1052,9 +1052,7 @@ impl<'a> Builder<'a> {
+@@ -1098,8 +1098,7 @@ impl<'a> Builder<'a> {
+             if let Ok(cxx) = self.cxx(target) {
                  let cxx = ccacheify(&cxx);
                  cargo
-                     .env(format!("CXX_{}", target), &cxx)
--                    .env("CXX", &cxx)
--                    .env(format!("CXXFLAGS_{}", target), cflags.clone())
--                    .env("CXXFLAGS", cflags);
-+                    .env("CXX", &cxx);
+-                    .env(format!("CXX_{}", target), &cxx)
+-                    .env(format!("CXXFLAGS_{}", target), cflags);
++                    .env(format!("CXX_{}", target), &cxx);
              }
          }