mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #54290 - michaelwoerister:aarch64-back-to-msvc, r=alexcrichton

Browse Source 
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
This commit is contained in:
kennytm 2018-09-20 21:36:25 +08:00 committed by GitHub
commit ea6cfe32af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_target/spec/aarch64_pc_windows_msvc.rs
View File

@ -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,
})
}