diff options
| author | kennytm <kennytm@gmail.com> | 2018-09-20 21:36:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 21:36:25 +0800 |
| commit | ea6cfe32af51c81e1a7e352c43e8d405b07598c5 (patch) | |
| tree | c97517fb421d4a0ae622b258c08b22547b4d5894 | |
| parent | 9c2dfb4aa67f39c56b22e55cb97794349e3d9ccf (diff) | |
| parent | 73b3c28a164a03236d2953b2d45770cc049fa7c5 (diff) | |
| download | rust-ea6cfe32af51c81e1a7e352c43e8d405b07598c5.tar.gz rust-ea6cfe32af51c81e1a7e352c43e8d405b07598c5.zip | |
Rollup merge of #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 https://github.com/rust-lang/rust/issues/54190#issuecomment-421288625). This PR makes MSVC the default linker for `aarch64-pc-windows-msvc`. r? @alexcrichton
| -rw-r--r-- | src/librustc_target/spec/aarch64_pc_windows_msvc.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc_target/spec/aarch64_pc_windows_msvc.rs b/src/librustc_target/spec/aarch64_pc_windows_msvc.rs index 8747f239d34..c71ad5ff21d 100644 --- a/src/librustc_target/spec/aarch64_pc_windows_msvc.rs +++ b/src/librustc_target/spec/aarch64_pc_windows_msvc.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy, LldFlavor}; +use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy}; pub fn target() -> TargetResult { let mut base = super::windows_msvc_base::opts(); @@ -17,7 +17,6 @@ pub fn target() -> TargetResult { // FIXME: this shouldn't be panic=abort, it should be panic=unwind base.panic_strategy = PanicStrategy::Abort; - base.linker = Some("rust-lld".to_owned()); Ok(Target { llvm_target: "aarch64-pc-windows-msvc".to_string(), @@ -29,7 +28,7 @@ pub fn target() -> TargetResult { target_os: "windows".to_string(), target_env: "msvc".to_string(), target_vendor: "pc".to_string(), - linker_flavor: LinkerFlavor::Lld(LldFlavor::Link), + linker_flavor: LinkerFlavor::Msvc, options: base, }) } |