diff options
| author | bors <bors@rust-lang.org> | 2016-02-23 05:17:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-23 05:17:08 +0000 |
| commit | be7196a793a185355efb7ec8801102ddec95483d (patch) | |
| tree | 57c1e45cea5c64f7d0663946549df7cdf1e26ddb | |
| parent | 37c6f2881c634fe72dc98b846037dc1237270659 (diff) | |
| parent | 8ddd86a2abf0d286aa562455fa3ebff3a8985757 (diff) | |
| download | rust-be7196a793a185355efb7ec8801102ddec95483d.tar.gz rust-be7196a793a185355efb7ec8801102ddec95483d.zip | |
Auto merge of #31814 - petevine:master, r=alexcrichton
The `vfp2` option was a leftover from `armv6` compatibility features of the original armhf target. Gcc defaults to `vfp3`on `armv7` hard-float linux systems so we should make it the default for rustc too.
| -rw-r--r-- | mk/cfg/armv7-unknown-linux-gnueabihf.mk | 2 | ||||
| -rw-r--r-- | src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/cfg/armv7-unknown-linux-gnueabihf.mk b/mk/cfg/armv7-unknown-linux-gnueabihf.mk index 3efbad8642b..a8e39668ded 100644 --- a/mk/cfg/armv7-unknown-linux-gnueabihf.mk +++ b/mk/cfg/armv7-unknown-linux-gnueabihf.mk @@ -21,6 +21,6 @@ CFG_UNIXY_armv7-unknown-linux-gnueabihf := 1 CFG_LDPATH_armv7-unknown-linux-gnueabihf := CFG_RUN_armv7-unknown-linux-gnueabihf=$(2) CFG_RUN_TARG_armv7-unknown-linux-gnueabihf=$(call CFG_RUN_armv7-unknown-linux-gnueabihf,,$(2)) -RUSTC_FLAGS_armv7-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp2,+neon +RUSTC_FLAGS_armv7-unknown-linux-gnueabihf := RUSTC_CROSS_FLAGS_armv7-unknown-linux-gnueabihf := CFG_GNU_TRIPLE_armv7-unknown-linux-gnueabihf := armv7-unknown-linux-gnueabihf diff --git a/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs b/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs index dd61bd87573..d7dcd714a10 100644 --- a/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs +++ b/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs @@ -22,7 +22,7 @@ pub fn target() -> Target { target_vendor: "unknown".to_string(), options: TargetOptions { - features: "+v7,+vfp2,+neon".to_string(), + features: "+v7,+vfp3,+neon".to_string(), cpu: "cortex-a8".to_string(), .. base } |