From ef0d843e6186d189a3b8780ee6daa2eb5c42d2fd Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 6 Nov 2017 06:59:19 -0800
Subject: [PATCH] rustbuild: Re-enable ThinLTO for MIPS

Now that the upstream LLVM bug is now fixed this commit cherry-picks the commit
onto our LLVM and then re-enables the ThinLTO paths for MIPS.

Closes #45654
---
 src/bootstrap/builder.rs | 3 +--
 src/llvm                 | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index bb3d9dc3f33..c8e808a0188 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -625,8 +625,7 @@ impl<'a> Builder<'a> {
 
             if mode != Mode::Libstd && // FIXME(#45320)
                self.config.rust_codegen_units.is_none() &&
-               self.build.is_rust_llvm(compiler.host) &&
-               !target.contains("mips") // FIXME(#45654)
+               self.build.is_rust_llvm(compiler.host)
             {
                 cargo.env("RUSTC_THINLTO", "1");
             }
diff --git a/src/llvm b/src/llvm
index 83b72cedfd7..86c7a9985d0 160000
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit 83b72cedfd7800ffc983d2855a85c5d06a545aa7
+Subproject commit 86c7a9985d0855255927d8653ea4d4407de8cc90