From 4a269642c9c458fe084eebc11f979d49c5fdc1c9 Mon Sep 17 00:00:00 2001
From: Michael Woerister <michaelwoerister@posteo>
Date: Fri, 6 Jul 2018 14:08:40 +0200
Subject: [PATCH] Remove CrossLangLto::NoLink which does not have a use case
 anymore.

---
 src/librustc/session/config.rs           | 9 +++------
 src/librustc_codegen_llvm/back/linker.rs | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index ba1249215cc4..6b21abb72fbc 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -99,7 +99,6 @@ pub enum Lto {
 pub enum CrossLangLto {
     LinkerPlugin(PathBuf),
     LinkerPluginAuto,
-    NoLink,
     Disabled
 }
 
@@ -107,8 +106,7 @@ impl CrossLangLto {
     pub fn enabled(&self) -> bool {
         match *self {
             CrossLangLto::LinkerPlugin(_) |
-            CrossLangLto::LinkerPluginAuto |
-            CrossLangLto::NoLink => true,
+            CrossLangLto::LinkerPluginAuto => true,
             CrossLangLto::Disabled => false,
         }
     }
@@ -1031,8 +1029,7 @@ macro_rules! options {
             }
 
             *slot = match v {
-                None |
-                Some("no-link") => CrossLangLto::NoLink,
+                None => CrossLangLto::LinkerPluginAuto,
                 Some(path) => CrossLangLto::LinkerPlugin(PathBuf::from(path)),
             };
             true
@@ -3147,7 +3144,7 @@ mod tests {
         assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
 
         opts = reference.clone();
-        opts.debugging_opts.cross_lang_lto = CrossLangLto::NoLink;
+        opts.debugging_opts.cross_lang_lto = CrossLangLto::LinkerPluginAuto;
         assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
     }
 
diff --git a/src/librustc_codegen_llvm/back/linker.rs b/src/librustc_codegen_llvm/back/linker.rs
index fffde30d5f60..99249255d276 100644
--- a/src/librustc_codegen_llvm/back/linker.rs
+++ b/src/librustc_codegen_llvm/back/linker.rs
@@ -471,8 +471,7 @@ impl<'a> Linker for GccLinker<'a> {
 
     fn cross_lang_lto(&mut self) {
         match self.sess.opts.debugging_opts.cross_lang_lto {
-            CrossLangLto::Disabled |
-            CrossLangLto::NoLink => {
+            CrossLangLto::Disabled => {
                 // Nothing to do
             }
             CrossLangLto::LinkerPluginAuto => {