Skip to content

Commit ea6cfe3

Browse files
authored
Rollup merge of rust-lang#54290 - michaelwoerister:aarch64-back-to-msvc, r=alexcrichton
Switch linker for aarch64-pc-windows-msvc from LLD to MSVC The MSVC linker does not seem to have the same problems with Rust symbols that LLD currently has on Windows (see rust-lang#54190 (comment)). This PR makes MSVC the default linker for `aarch64-pc-windows-msvc`. r? @alexcrichton
2 parents 9c2dfb4 + 73b3c28 commit ea6cfe3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/librustc_target/spec/aarch64_pc_windows_msvc.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy, LldFlavor};
11+
use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy};
1212

1313
pub fn target() -> TargetResult {
1414
let mut base = super::windows_msvc_base::opts();
@@ -17,7 +17,6 @@ pub fn target() -> TargetResult {
1717

1818
// FIXME: this shouldn't be panic=abort, it should be panic=unwind
1919
base.panic_strategy = PanicStrategy::Abort;
20-
base.linker = Some("rust-lld".to_owned());
2120

2221
Ok(Target {
2322
llvm_target: "aarch64-pc-windows-msvc".to_string(),
@@ -29,7 +28,7 @@ pub fn target() -> TargetResult {
2928
target_os: "windows".to_string(),
3029
target_env: "msvc".to_string(),
3130
target_vendor: "pc".to_string(),
32-
linker_flavor: LinkerFlavor::Lld(LldFlavor::Link),
31+
linker_flavor: LinkerFlavor::Msvc,
3332
options: base,
3433
})
3534
}

0 commit comments

Comments
 (0)