diff options
| author | Jordan Rhee <jordanrh@microsoft.com> | 2018-09-07 08:34:24 -0700 |
|---|---|---|
| committer | Jordan Rhee <jordanrh@microsoft.com> | 2018-09-07 08:34:24 -0700 |
| commit | b081a49a0701e6d95bc868a526138bc7a3cf6d46 (patch) | |
| tree | b4bc9850ec7514b7bb1e99d98fad7956802f8c53 | |
| parent | f7fa67cea13efdacfc82389f6f592bb4bda86a2e (diff) | |
Removed hardcoded paths and unnecessary LLVM features
| -rw-r--r-- | src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs b/src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs index 2da975a21a2..a699e15d417 100644 --- a/src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs +++ b/src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs @@ -1,4 +1,4 @@ -// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -13,21 +13,6 @@ use spec::{LinkerFlavor, Target, TargetOptions, TargetResult, PanicStrategy}; pub fn target() -> TargetResult { let mut base = super::windows_msvc_base::opts(); - base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push( - "/LIBPATH:C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.11.25503\\lib\\arm".to_string()); - - base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push( - "/LIBPATH:C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17134.0\\ucrt\\arm".to_string()); - - base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push( - "/LIBPATH:C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17134.0\\um\\arm".to_string()); - - base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push( - "/MACHINE:ARM".to_string()); - - base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push( - "/INCREMENTAL:NO".to_string()); - // Prevent error LNK2013: BRANCH24(T) fixup overflow base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push( "/OPT:NOLBR".to_string()); @@ -47,7 +32,7 @@ pub fn target() -> TargetResult { linker_flavor: LinkerFlavor::Msvc, options: TargetOptions { - features: "+v7,+thumb-mode,+vfp3,+d16,+thumb2,+neon".to_string(), + features: "+vfp3,+neon".to_string(), cpu: "generic".to_string(), max_atomic_width: Some(64), abi_blacklist: super::arm_base::abi_blacklist(), |