]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #45806 - alexcrichton:update-llvm-for-mips, r=michaelwoerister
authorbors <bors@rust-lang.org>
Sat, 11 Nov 2017 02:11:34 +0000 (02:11 +0000)
committerbors <bors@rust-lang.org>
Sat, 11 Nov 2017 02:11:34 +0000 (02:11 +0000)
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
src/llvm

index bb3d9dc3f33b1e1d96ea858ff25c2c9f3523d727..c8e808a0188c62dabee3e22ac23d6d404fad24e9 100644 (file)
@@ -625,8 +625,7 @@ pub fn cargo(&self,
 
             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");
             }
index 83b72cedfd7800ffc983d2855a85c5d06a545aa7..86c7a9985d0855255927d8653ea4d4407de8cc90 160000 (submodule)
--- a/src/llvm
+++ b/src/llvm
@@ -1 +1 @@
-Subproject commit 83b72cedfd7800ffc983d2855a85c5d06a545aa7
+Subproject commit 86c7a9985d0855255927d8653ea4d4407de8cc90