Auto merge of #45806 - alexcrichton:update-llvm-for-mips, r=michaelwoerister

bors · bors · commit c703ff275fd8 · 2017-11-11T02:11:34.000Z
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
diff --git 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
@@ -1 +1 @@
-Subproject commit 83b72cedfd7800ffc983d2855a85c5d06a545aa7
+Subproject commit 86c7a9985d0855255927d8653ea4d4407de8cc90

Original file line number	Diff line number	Diff line change
`@@ -625,8 +625,7 @@ impl<'a> Builder<'a> {`
`625`	`625`
`626`	`626`	`if mode != Mode::Libstd && // FIXME(#45320)`
`627`	`627`	`self.config.rust_codegen_units.is_none() &&`
`628`		`- self.build.is_rust_llvm(compiler.host) &&`
`629`		`- !target.contains("mips") // FIXME(#45654)`
	`628`	`+ self.build.is_rust_llvm(compiler.host)`
`630`	`629`	`{`
`631`	`630`	`cargo.env("RUSTC_THINLTO", "1");`
`632`	`631`	`}`