Fix conflicts

Author: Urgau

compiler/rustc_target/src/spec/targets/aarch64_apple_visionos.rs

@@ -1,13 +1,14 @@
-use crate::spec::base::apple::{opts, visionos_llvm_target, Arch};
-use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
+use crate::spec::base::apple::{opts, pre_link_args, visionos_llvm_target, Arch};
+use crate::spec::{FramePointer, MaybeLazy, SanitizerSet, Target, TargetOptions};
 
 pub fn target() -> Target {
-    let arch = Arch::Arm64;
-    let mut base = opts("visionos", arch);
+    const OS: &str = "visionos";
+    const ARCH: Arch = Arch::Arm64;
+    let mut base = opts(OS, ARCH, MaybeLazy::lazy(|| pre_link_args(OS, ARCH)));
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::THREAD;
 
     Target {
-        llvm_target: visionos_llvm_target(arch).into(),
+        llvm_target: MaybeLazy::lazy(|| visionos_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: Some("ARM64 Apple visionOS".into()),
             tier: Some(3),
@@ -16,7 +17,7 @@ pub fn target() -> Target {
         },
         pointer_width: 64,
         data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".into(),
-        arch: arch.target_arch(),
+        arch: ARCH.target_arch(),
         options: TargetOptions {
             features: "+neon,+fp-armv8,+apple-a16".into(),
             max_atomic_width: Some(128),

compiler/rustc_target/src/spec/targets/aarch64_apple_visionos_sim.rs

@@ -1,13 +1,15 @@
-use crate::spec::base::apple::{opts, visionos_sim_llvm_target, Arch};
-use crate::spec::{FramePointer, SanitizerSet, Target, TargetOptions};
+use crate::spec::base::apple::{opts, pre_link_args, visionos_sim_llvm_target, Arch};
+use crate::spec::{FramePointer, MaybeLazy, SanitizerSet, Target, TargetOptions};
 
 pub fn target() -> Target {
-    let arch = Arch::Arm64_sim;
-    let mut base = opts("visionos", arch);
+    const OS: &str = "visionos";
+    const ARCH: Arch = Arch::Arm64_sim;
+
+    let mut base = opts(OS, ARCH, MaybeLazy::lazy(|| pre_link_args(OS, ARCH)));
     base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::THREAD;
 
     Target {
-        llvm_target: visionos_sim_llvm_target(arch).into(),
+        llvm_target: MaybeLazy::lazy(|| visionos_sim_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: Some("ARM64 Apple visionOS simulator".into()),
             tier: Some(3),
@@ -16,7 +18,7 @@ pub fn target() -> Target {
         },
         pointer_width: 64,
         data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".into(),
-        arch: arch.target_arch(),
+        arch: ARCH.target_arch(),
         options: TargetOptions {
             features: "+neon,+fp-armv8,+apple-a16".into(),
             max_atomic_width: Some(128),

compiler/rustc_target/src/spec/targets/arm64_32_apple_watchos.rs

@@ -1,11 +1,13 @@
-use crate::spec::base::apple::{opts, watchos_llvm_target, Arch};
+use crate::spec::base::apple::{opts, pre_link_args, watchos_llvm_target, Arch};
 use crate::spec::{MaybeLazy, Target, TargetOptions};
 
 pub fn target() -> Target {
-    let arch = Arch::Arm64_32;
-    let base = opts("watchos", arch, MaybeLazy::lazy(|| pre_link_args(OS, ARCH)));
+    const OS: &str = "watchos";
+    const ARCH: Arch = Arch::Arm64_32;
+
+    let base = opts(OS, ARCH, MaybeLazy::lazy(|| pre_link_args(OS, ARCH)));
     Target {
-        llvm_target: watchos_llvm_target(arch).into(),
+        llvm_target: MaybeLazy::lazy(|| watchos_llvm_target(ARCH)),
         metadata: crate::spec::TargetMetadata {
             description: None,
             tier: None,

compiler/rustc_target/src/spec/targets/i686_win7_windows_msvc.rs

@@ -6,18 +6,20 @@ pub fn target() -> Target {
     base.max_atomic_width = Some(64);
     base.vendor = "win7".into();
 
-    base.add_pre_link_args(
-        LinkerFlavor::Msvc(Lld::No),
-        &[
-            // Mark all dynamic libraries and executables as compatible with the larger 4GiB address
-            // space available to x86 Windows binaries on x86_64.
-            "/LARGEADDRESSAWARE",
-            // Ensure the linker will only produce an image if it can also produce a table of
-            // the image's safe exception handlers.
-            // https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers
-            "/SAFESEH",
-        ],
-    );
+    base.pre_link_args = MaybeLazy::lazy(|| {
+        TargetOptions::link_args(
+            LinkerFlavor::Msvc(Lld::No),
+            &[
+                // Mark all dynamic libraries and executables as compatible with the larger 4GiB address
+                // space available to x86 Windows binaries on x86_64.
+                "/LARGEADDRESSAWARE",
+                // Ensure the linker will only produce an image if it can also produce a table of
+                // the image's safe exception handlers.
+                // https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers
+                "/SAFESEH",
+            ],
+        )
+    });
 
     Target {
         llvm_target: "i686-pc-windows-msvc".into(),

compiler/rustc_target/src/spec/targets/wasm32_unknown_unknown.rs

@@ -10,7 +10,8 @@
 //! This target is more or less managed by the Rust and WebAssembly Working
 //! Group nowadays at <https://github.com/rustwasm>.
 
-use crate::spec::{base, Cc, LinkerFlavor, MaybeLazy, Target};
+use crate::spec::add_link_args;
+use crate::spec::{base, Cc, LinkerFlavor, MaybeLazy, Target, TargetOptions};
 
 pub fn target() -> Target {
     let mut options = base::wasm::options();