Draft: Introduce new Linker-driver flavors

Signed-off-by: Jonathan Schwender <[email protected]>

Author: jschwe

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -23,7 +23,7 @@ use rustc_session::utils::NativeLibKind;
 use rustc_session::{filesearch, Session};
 use rustc_span::symbol::Symbol;
 use rustc_target::spec::crt_objects::{CrtObjects, LinkSelfContainedDefault};
-use rustc_target::spec::{Cc, LinkOutputKind, LinkerFlavor, Lld, PanicStrategy};
+use rustc_target::spec::{Cc, CcFlavor, LinkOutputKind, LinkerFlavor, Lld, PanicStrategy};
 use rustc_target::spec::{RelocModel, RelroLevel, SanitizerSet, SplitDebuginfo};
 
 use super::archive::{ArchiveBuilder, ArchiveBuilderBuilder};
@@ -782,7 +782,7 @@ fn link_natively<'a>(
         // then it should not default to linking executables as pie. Different
         // versions of gcc seem to use different quotes in the error message so
         // don't check for them.
-        if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
+        if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes(_), _))
             && unknown_arg_regex.is_match(&out)
             && out.contains("-no-pie")
             && cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
@@ -800,7 +800,7 @@ fn link_natively<'a>(
 
         // Detect '-static-pie' used with an older version of gcc or clang not supporting it.
         // Fallback from '-static-pie' to '-static' in that case.
-        if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
+        if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes(_), _))
             && unknown_arg_regex.is_match(&out)
             && (out.contains("-static-pie") || out.contains("--no-dynamic-linker"))
             && cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
@@ -1286,11 +1286,13 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
             // only the linker flavor is known; use the default linker for the selected flavor
             (None, Some(flavor)) => Some((
                 PathBuf::from(match flavor {
-                    LinkerFlavor::Gnu(Cc::Yes, _)
-                    | LinkerFlavor::Darwin(Cc::Yes, _)
-                    | LinkerFlavor::WasmLld(Cc::Yes)
-                    | LinkerFlavor::Unix(Cc::Yes) => {
-                        if cfg!(any(target_os = "solaris", target_os = "illumos")) {
+                    LinkerFlavor::Gnu(Cc::Yes(cc_flavor), _)
+                    | LinkerFlavor::Darwin(Cc::Yes(cc_flavor), _)
+                    | LinkerFlavor::WasmLld(Cc::Yes(cc_flavor))
+                    | LinkerFlavor::Unix(Cc::Yes(cc_flavor)) => {
+                        if cfg!(any(target_os = "solaris", target_os = "illumos"))
+                            && cc_flavor == CcFlavor::AnyCc
+                        {
                             // On historical Solaris systems, "cc" may have
                             // been Sun Studio, which is not flag-compatible
                             // with "gcc". This history casts a long shadow,
@@ -1299,7 +1301,7 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
                             // available as "cc".
                             "gcc"
                         } else {
-                            "cc"
+                            cc_flavor.default_bin_name()
                         }
                     }
                     LinkerFlavor::Gnu(_, Lld::Yes)
@@ -1745,7 +1747,7 @@ fn add_pre_link_objects(
     let empty = Default::default();
     let objects = if self_contained {
         &opts.pre_link_objects_self_contained
-    } else if !(sess.target.os == "fuchsia" && matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))) {
+    } else if !(sess.target.os == "fuchsia" && matches!(flavor, LinkerFlavor::Gnu(Cc::Yes(_), _))) {
         &opts.pre_link_objects
     } else {
         &empty
@@ -2276,7 +2278,7 @@ fn add_order_independent_options(
 
     if sess.target.os == "fuchsia"
         && crate_type == CrateType::Executable
-        && !matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
+        && !matches!(flavor, LinkerFlavor::Gnu(Cc::Yes(_), _))
     {
         let prefix = if sess.opts.unstable_opts.sanitizer.contains(SanitizerSet::ADDRESS) {
             "asan/"
@@ -2906,7 +2908,7 @@ fn add_apple_sdk(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
     };
 
     match flavor {
-        LinkerFlavor::Darwin(Cc::Yes, _) => {
+        LinkerFlavor::Darwin(Cc::Yes(_), _) => {
             cmd.args(&["-isysroot", &sdk_root, "-Wl,-syslibroot", &sdk_root]);
         }
         LinkerFlavor::Darwin(Cc::No, _) => {

compiler/rustc_target/src/spec/aarch64_apple_ios_macabi.rs

@@ -1,12 +1,15 @@
 use super::apple_base::{opts, Arch};
-use crate::spec::{Cc, FramePointer, LinkerFlavor, Lld, Target, TargetOptions};
+use crate::spec::{Cc, CcFlavor, FramePointer, LinkerFlavor, Lld, Target, TargetOptions};
 
 pub fn target() -> Target {
     let llvm_target = "arm64-apple-ios14.0-macabi";
 
     let arch = Arch::Arm64_macabi;
     let mut base = opts("ios", arch);
-    base.add_pre_link_args(LinkerFlavor::Darwin(Cc::Yes, Lld::No), &["-target", llvm_target]);
+    base.add_pre_link_args(
+        LinkerFlavor::Darwin(Cc::Yes(CcFlavor::AnyCc), Lld::No),
+        &["-target", llvm_target],
+    );
 
     Target {
         llvm_target: llvm_target.into(),

compiler/rustc_target/src/spec/aarch64_unknown_nto_qnx_710.rs

@@ -1,5 +1,5 @@
 use super::nto_qnx_base;
-use crate::spec::{Cc, LinkerFlavor, Lld, Target, TargetOptions};
+use crate::spec::{Cc, CcFlavor, LinkerFlavor, Lld, Target, TargetOptions};
 
 pub fn target() -> Target {
     Target {
@@ -20,7 +20,7 @@ pub fn target() -> Target {
             features: "+v8a".into(),
             max_atomic_width: Some(128),
             pre_link_args: TargetOptions::link_args(
-                LinkerFlavor::Gnu(Cc::Yes, Lld::No),
+                LinkerFlavor::Gnu(Cc::Yes(CcFlavor::AnyCc), Lld::No),
                 &["-Vgcc_ntoaarch64le_cxx"],
             ),
             env: "nto71".into(),

compiler/rustc_target/src/spec/apple_base.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Cow, env};
 
-use crate::spec::{cvs, Cc, DebuginfoKind, FramePointer, LinkArgs};
+use crate::spec::{cvs, Cc, CcFlavor, DebuginfoKind, FramePointer, LinkArgs};
 use crate::spec::{LinkerFlavor, Lld, SplitDebuginfo, StaticCow, Target, TargetOptions};
 
 #[cfg(test)]
@@ -108,7 +108,11 @@ fn pre_link_args(os: &'static str, arch: Arch, abi: &'static str) -> LinkArgs {
         [platform_name, platform_version.clone(), platform_version].into_iter(),
     );
     if abi != "macabi" {
-        super::add_link_args(&mut args, LinkerFlavor::Darwin(Cc::Yes, Lld::No), &["-arch", arch]);
+        super::add_link_args(
+            &mut args,
+            LinkerFlavor::Darwin(Cc::Yes(CcFlavor::AnyCc), Lld::No),
+            &["-arch", arch],
+        );
     }
 
     args
@@ -138,7 +142,7 @@ pub fn opts(os: &'static str, arch: Arch) -> TargetOptions {
         cpu: arch.target_cpu().into(),
         link_env_remove: link_env_remove(arch, os),
         vendor: "apple".into(),
-        linker_flavor: LinkerFlavor::Darwin(Cc::Yes, Lld::No),
+        linker_flavor: LinkerFlavor::Darwin(Cc::Yes(CcFlavor::AnyCc), Lld::No),
         // macOS has -dead_strip, which doesn't rely on function_sections
         function_sections: false,
         dynamic_linking: true,

compiler/rustc_target/src/spec/armv6k_nintendo_3ds.rs

@@ -1,12 +1,12 @@
-use crate::spec::{cvs, Cc, LinkerFlavor, Lld, RelocModel, Target, TargetOptions};
+use crate::spec::{cvs, Cc, CcFlavor, LinkerFlavor, Lld, RelocModel, Target, TargetOptions};
 
 /// A base target for Nintendo 3DS devices using the devkitARM toolchain.
 ///
 /// Requires the devkitARM toolchain for 3DS targets on the host system.
 
 pub fn target() -> Target {
     let pre_link_args = TargetOptions::link_args(
-        LinkerFlavor::Gnu(Cc::Yes, Lld::No),
+        LinkerFlavor::Gnu(Cc::Yes(CcFlavor::Gnu), Lld::No),
         &["-specs=3dsx.specs", "-mtune=mpcore", "-mfloat-abi=hard", "-mtp=soft"],
     );
 

compiler/rustc_target/src/spec/armv7_linux_androideabi.rs

@@ -1,4 +1,4 @@
-use crate::spec::{Cc, LinkerFlavor, Lld, SanitizerSet, Target, TargetOptions};
+use crate::spec::{Cc, CcFlavor, LinkerFlavor, Lld, SanitizerSet, Target, TargetOptions};
 
 // This target if is for the baseline of the Android v7a ABI
 // in thumb mode. It's named armv7-* instead of thumbv7-*
@@ -10,7 +10,10 @@ use crate::spec::{Cc, LinkerFlavor, Lld, SanitizerSet, Target, TargetOptions};
 
 pub fn target() -> Target {
     let mut base = super::android_base::opts();
-    base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-march=armv7-a"]);
+    base.add_pre_link_args(
+        LinkerFlavor::Gnu(Cc::Yes(CcFlavor::AnyCc), Lld::No),
+        &["-march=armv7-a"],
+    );
     Target {
         llvm_target: "armv7-none-linux-android".into(),
         pointer_width: 32,

compiler/rustc_target/src/spec/armv7_sony_vita_newlibeabihf.rs

@@ -1,13 +1,13 @@
 use crate::abi::Endian;
-use crate::spec::{cvs, Cc, LinkerFlavor, Lld, RelocModel, Target, TargetOptions};
+use crate::spec::{cvs, Cc, CcFlavor, LinkerFlavor, Lld, RelocModel, Target, TargetOptions};
 
 /// A base target for PlayStation Vita devices using the VITASDK toolchain (using newlib).
 ///
 /// Requires the VITASDK toolchain on the host system.
 
 pub fn target() -> Target {
     let pre_link_args = TargetOptions::link_args(
-        LinkerFlavor::Gnu(Cc::Yes, Lld::No),
+        LinkerFlavor::Gnu(Cc::Yes(CcFlavor::AnyCc), Lld::No),
         &["-Wl,-q", "-Wl,--pic-veneer"],
     );
 
@@ -24,7 +24,7 @@ pub fn target() -> Target {
             env: "newlib".into(),
             vendor: "sony".into(),
             abi: "eabihf".into(),
-            linker_flavor: LinkerFlavor::Gnu(Cc::Yes, Lld::No),
+            linker_flavor: LinkerFlavor::Gnu(Cc::Yes(CcFlavor::AnyCc), Lld::No),
             no_default_libraries: false,
             cpu: "cortex-a9".into(),
             families: cvs!["unix"],

compiler/rustc_target/src/spec/avr_gnu_base.rs

@@ -1,4 +1,4 @@
-use crate::spec::{Cc, LinkerFlavor, Lld, RelocModel, Target, TargetOptions};
+use crate::spec::{Cc, CcFlavor, LinkerFlavor, Lld, RelocModel, Target, TargetOptions};
 use object::elf;
 
 /// A base target for AVR devices using the GNU toolchain.
@@ -18,9 +18,12 @@ pub fn target(target_cpu: &'static str, mmcu: &'static str) -> Target {
 
             linker: Some("avr-gcc".into()),
             eh_frame_header: false,
-            pre_link_args: TargetOptions::link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &[mmcu]),
+            pre_link_args: TargetOptions::link_args(
+                LinkerFlavor::Gnu(Cc::Yes(CcFlavor::Gnu), Lld::No),
+                &[mmcu],
+            ),
             late_link_args: TargetOptions::link_args(
-                LinkerFlavor::Gnu(Cc::Yes, Lld::No),
+                LinkerFlavor::Gnu(Cc::Yes(CcFlavor::Gnu), Lld::No),
                 &["-lgcc"],
             ),
             max_atomic_width: Some(16),

compiler/rustc_target/src/spec/csky_unknown_linux_gnuabiv2.rs

@@ -1,4 +1,4 @@
-use crate::spec::{Cc, LinkerFlavor, Lld, Target, TargetOptions};
+use crate::spec::{Cc, CcFlavor, LinkerFlavor, Lld, Target, TargetOptions};
 
 // This target is for glibc Linux on Csky
 
@@ -12,7 +12,7 @@ pub fn target() -> Target {
         options: TargetOptions {
             abi: "abiv2".into(),
             features: "+2e3,+3e7,+7e10,+cache,+dsp1e2,+dspe60,+e1,+e2,+edsp,+elrw,+hard-tp,+high-registers,+hwdiv,+mp,+mp1e2,+nvic,+trust".into(),
-            late_link_args_static: TargetOptions::link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-l:libatomic.a"]),
+            late_link_args_static: TargetOptions::link_args(LinkerFlavor::Gnu(Cc::Yes(CcFlavor::AnyCc), Lld::No), &["-l:libatomic.a"]),
             max_atomic_width: Some(32),
             ..super::linux_gnu_base::opts()
         },

compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs

@@ -1,4 +1,4 @@
-use crate::spec::{Cc, LinkerFlavor, Target};
+use crate::spec::{Cc, CcFlavor, LinkerFlavor, Target};
 
 pub fn target() -> Target {
     let mut base = super::linux_musl_base::opts();
@@ -9,7 +9,7 @@ pub fn target() -> Target {
 
     base.crt_static_default = false;
     base.has_rpath = true;
-    base.linker_flavor = LinkerFlavor::Unix(Cc::Yes);
+    base.linker_flavor = LinkerFlavor::Unix(Cc::Yes(CcFlavor::AnyCc));
 
     base.c_enum_min_bits = Some(8);