only stabilize -Clink-self-contained=-linker on x64 linux

Some combinations of opt-ins and other flags need more work to be
stabilized, so we can only stabilize the opt-outs.

Author: lqd

compiler/rustc_session/src/config.rs

@@ -377,28 +377,22 @@ impl LinkSelfContained {
             return Ok(());
         }
 
-        // `-C link-self-contained=[-+]linker` is only stable on x64 linux.
-        let check_linker = |components: LinkSelfContainedComponents, polarity: &str| {
-            let has_linker = components.is_linker_enabled();
-            if has_linker && target_tuple.tuple() != "x86_64-unknown-linux-gnu" {
-                return Err(format!(
-                    "`-C link-self-contained={polarity}linker` is unstable on the `{target_tuple}` \
+        // `-C link-self-contained=-linker` is only stable on x64 linux.
+        let has_minus_linker = self.disabled_components.is_linker_enabled();
+        if has_minus_linker && target_tuple.tuple() != "x86_64-unknown-linux-gnu" {
+            return Err(format!(
+                "`-C link-self-contained=-linker` is unstable on the `{target_tuple}` \
                     target. The `-Z unstable-options` flag must also be passed to use it on this target",
-                ));
-            }
-            Ok(())
-        };
-        check_linker(self.enabled_components, "+")?;
-        check_linker(self.disabled_components, "-")?;
+            ));
+        }
 
-        // Since only the linker component is stable, any other component used is unstable, and
-        // that's an error.
-        let unstable_enabled = self.enabled_components - LinkSelfContainedComponents::LINKER;
+        // Any `+linker` or other component used is unstable, and that's an error.
+        let unstable_enabled = self.enabled_components;
         let unstable_disabled = self.disabled_components - LinkSelfContainedComponents::LINKER;
         if !unstable_enabled.union(unstable_disabled).is_empty() {
             return Err(String::from(
-                "only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker`\
-                /`+linker` are stable, the `-Z unstable-options` flag must also be passed to use \
+                "only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` \
+                are stable, the `-Z unstable-options` flag must also be passed to use \
                 the unstable values",
             ));
         }

tests/run-make/rust-lld/rmake.rs

@@ -14,7 +14,7 @@ fn main() {
         rustc()
             .arg("-Clinker-features=+lld")
             .arg("-Clink-self-contained=+linker")
-            .arg("-Zunstable-options") // needed for targets other than `x86_64-unknown-linux-gnu`
+            .arg("-Zunstable-options") // the opt-ins are unstable
             .input("main.rs"),
     );
 

tests/ui/linking/link-self-contained-linker-disallowed-target.positive.stderr

@@ -0,0 +1,19 @@
+// Check that only `-C link-self-contained=-linker` is stable on x64 linux. Any other value or
+// target, needs `-Z unstable-options`.
+
+// ignore-tidy-linelength
+
+//@ revisions: unstable_target_positive unstable_target_negative unstable_positive
+//@ [unstable_target_negative] compile-flags: --target=x86_64-unknown-linux-musl -C link-self-contained=-linker --crate-type=rlib
+//@ [unstable_target_negative] needs-llvm-components: x86
+//@ [unstable_target_positive] compile-flags: --target=x86_64-unknown-linux-musl -C link-self-contained=+linker --crate-type=rlib
+//@ [unstable_target_positive] needs-llvm-components: x86
+//@ [unstable_positive] compile-flags: --target=x86_64-unknown-linux-gnu -C link-self-contained=+linker --crate-type=rlib
+//@ [unstable_positive] needs-llvm-components: x86
+
+#![feature(no_core)]
+#![no_core]
+
+//[unstable_target_negative]~? ERROR `-C link-self-contained=-linker` is unstable on the `x86_64-unknown-linux-musl` target
+//[unstable_target_positive]~? ERROR only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` are stable
+//[unstable_positive]~? ERROR only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` are stable

tests/ui/linking/link-self-contained-linker-disallowed-target.rs

@@ -0,0 +1,2 @@
+error: only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` are stable, the `-Z unstable-options` flag must also be passed to use the unstable values
+

tests/ui/linking/link-self-contained-linker-disallowed.rs

@@ -0,0 +1,2 @@
+error: only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` are stable, the `-Z unstable-options` flag must also be passed to use the unstable values
+

tests/ui/linking/link-self-contained-linker-disallowed.unstable_positive.stderr

@@ -1,2 +1,2 @@
-error: only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker`/`+linker` are stable, the `-Z unstable-options` flag must also be passed to use the unstable values
+error: only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` are stable, the `-Z unstable-options` flag must also be passed to use the unstable values
 

tests/ui/linking/link-self-contained-linker-disallowed-target.negative.stderr renamed to tests/ui/linking/link-self-contained-linker-disallowed.unstable_target_negative.stderr

@@ -1,2 +1,2 @@
-error: only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker`/`+linker` are stable, the `-Z unstable-options` flag must also be passed to use the unstable values
+error: only `-C link-self-contained` values `y`/`yes`/`on`/`n`/`no`/`off`/`-linker` are stable, the `-Z unstable-options` flag must also be passed to use the unstable values