Generic linker flavors

Author: petrochenkov

compiler/rustc_target/src/spec/mod.rs

@@ -144,6 +144,9 @@ pub enum LinkerFlavorCli {
     Bpf,
     Ptx,
 
+    // Generic (unstable) flavors.
+    Any(Cc, Lld),
+
     // Legacy stable values
     Gcc,
     Ld,
@@ -162,7 +165,8 @@ impl LinkerFlavorCli {
             | LinkerFlavorCli::Msvc(Lld::Yes)
             | LinkerFlavorCli::EmCc
             | LinkerFlavorCli::Bpf
-            | LinkerFlavorCli::Ptx => true,
+            | LinkerFlavorCli::Ptx
+            | LinkerFlavorCli::Any(..) => true,
             LinkerFlavorCli::Gcc
             | LinkerFlavorCli::Ld
             | LinkerFlavorCli::Lld(..)
@@ -223,6 +227,15 @@ impl LinkerFlavor {
             LinkerFlavorCli::Bpf => LinkerFlavor::Bpf,
             LinkerFlavorCli::Ptx => LinkerFlavor::Ptx,
 
+            // Generic flavors
+            LinkerFlavorCli::Any(cc, lld) => match lld_flavor {
+                LldFlavor::Ld if is_gnu => LinkerFlavor::Gnu(cc, lld),
+                LldFlavor::Ld64 => LinkerFlavor::Darwin(cc, lld),
+                LldFlavor::Wasm => LinkerFlavor::WasmLld(cc),
+                LldFlavor::Ld => LinkerFlavor::Unix(cc),
+                LldFlavor::Link => LinkerFlavor::Msvc(lld),
+            },
+
             // Below: legacy stable values
             LinkerFlavorCli::Gcc => match lld_flavor {
                 LldFlavor::Ld if is_gnu => LinkerFlavor::Gnu(Cc::Yes, Lld::No),
@@ -289,6 +302,9 @@ impl LinkerFlavor {
             LinkerFlavorCli::EmCc => (Some(Cc::Yes), Some(Lld::Yes)),
             LinkerFlavorCli::Bpf | LinkerFlavorCli::Ptx => (None, None),
 
+            // Generic flavors
+            LinkerFlavorCli::Any(cc, lld) => (Some(cc), Some(lld)),
+
             // Below: legacy stable values
             LinkerFlavorCli::Gcc => (Some(Cc::Yes), None),
             LinkerFlavorCli::Ld => (Some(Cc::No), Some(Lld::No)),
@@ -503,6 +519,14 @@ linker_flavor_cli_impls! {
     (LinkerFlavorCli::Bpf) "bpf"
     (LinkerFlavorCli::Ptx) "ptx"
 
+    // Generic flavors
+    (LinkerFlavorCli::Any(Cc::No, Lld::No)) "*"
+    (LinkerFlavorCli::Any(Cc::No, Lld::Yes)) "*-lld"
+    (LinkerFlavorCli::Any(Cc::Yes, Lld::No)) "*-cc"
+    (LinkerFlavorCli::Any(Cc::Yes, Lld::Yes)) "*-lld-cc"
+    (LinkerFlavorCli::Any(Cc::Clang, Lld::No)) "*-clang"
+    (LinkerFlavorCli::Any(Cc::Clang, Lld::Yes)) "*-lld-clang"
+
     // Legacy stable flavors
     (LinkerFlavorCli::Gcc) "gcc"
     (LinkerFlavorCli::Ld) "ld"

tests/run-make/rust-lld/Makefile

@@ -4,5 +4,5 @@ include ../tools.mk
 # needs-rust-lld
 # ignore-s390x lld does not yet support s390x as target
 all:
-	RUSTC_LOG=rustc_codegen_ssa::back::link=info $(RUSTC) -Clink-self-contained=+linker -Clinker-flavor=gnu-lld-cc -Zunstable-options -Clink-args=-Wl,-v main.rs 2> $(TMPDIR)/output.txt
+	RUSTC_LOG=rustc_codegen_ssa::back::link=info $(RUSTC) -Clink-self-contained=+linker -Clinker-flavor=*-lld-cc -Zunstable-options -Clink-args=-Wl,-v main.rs 2> $(TMPDIR)/output.txt
 	$(CGREP) -e "^LLD [0-9]+\.[0-9]+\.[0-9]+" < $(TMPDIR)/output.txt