Skip to content

Commit b081a49

Browse files
committed
Removed hardcoded paths and unnecessary LLVM features
1 parent f7fa67c commit b081a49

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,21 +13,6 @@ use spec::{LinkerFlavor, Target, TargetOptions, TargetResult, PanicStrategy};
1313
pub fn target() -> TargetResult {
1414
let mut base = super::windows_msvc_base::opts();
1515

16-
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push(
17-
"/LIBPATH:C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.11.25503\\lib\\arm".to_string());
18-
19-
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push(
20-
"/LIBPATH:C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17134.0\\ucrt\\arm".to_string());
21-
22-
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push(
23-
"/LIBPATH:C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.17134.0\\um\\arm".to_string());
24-
25-
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push(
26-
"/MACHINE:ARM".to_string());
27-
28-
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push(
29-
"/INCREMENTAL:NO".to_string());
30-
3116
// Prevent error LNK2013: BRANCH24(T) fixup overflow
3217
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap().push(
3318
"/OPT:NOLBR".to_string());
@@ -47,7 +32,7 @@ pub fn target() -> TargetResult {
4732
linker_flavor: LinkerFlavor::Msvc,
4833

4934
options: TargetOptions {
50-
features: "+v7,+thumb-mode,+vfp3,+d16,+thumb2,+neon".to_string(),
35+
features: "+vfp3,+neon".to_string(),
5136
cpu: "generic".to_string(),
5237
max_atomic_width: Some(64),
5338
abi_blacklist: super::arm_base::abi_blacklist(),

0 commit comments

Comments
 (0)