about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-14 19:25:54 +0000
committerbors <bors@rust-lang.org>2018-11-14 19:25:54 +0000
commit6f93e93af6f823948cc13d2938957757c6486d88 (patch)
treebbebd6a85cf4cc14cc9cbade82188e6f0edec50c
parent6f244c9011eb01ae4d167b631ba5e3e163bafa72 (diff)
parent4cfc97924f3712cd8f40e498fc949bfb02d74992 (diff)
downloadrust-6f93e93af6f823948cc13d2938957757c6486d88.tar.gz
rust-6f93e93af6f823948cc13d2938957757c6486d88.zip
Auto merge of #55947 - michaelwoerister:xlto-fix-lld-opt, r=Mark-Simulacrum
xLTO: Don't pass --plugin-opt=thin to LLD. That's not supported anymore.

It seems that `-plugin-opt=thin` is not needed anymore when invoking LLD for ThinLTO. Unfortunately, still passing the option makes LLD crash instead of giving a deprecation warning or something.
-rw-r--r--src/librustc_codegen_utils/linker.rs11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/librustc_codegen_utils/linker.rs b/src/librustc_codegen_utils/linker.rs
index e9ac92da684..219bf256638 100644
--- a/src/librustc_codegen_utils/linker.rs
+++ b/src/librustc_codegen_utils/linker.rs
@@ -209,17 +209,6 @@ impl<'a> GccLinker<'a> {
         self.linker_arg(&format!("-plugin-opt={}", opt_level));
         let target_cpu = self.target_cpu;
         self.linker_arg(&format!("-plugin-opt=mcpu={}", target_cpu));
-
-        match self.sess.lto() {
-            config::Lto::Thin |
-            config::Lto::ThinLocal => {
-                self.linker_arg("-plugin-opt=thin");
-            }
-            config::Lto::Fat |
-            config::Lto::No => {
-                // default to regular LTO
-            }
-        }
     }
 }