Skip to content

Commit be7196a

Browse files
committed
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.
2 parents 37c6f28 + 8ddd86a commit be7196a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mk/cfg/armv7-unknown-linux-gnueabihf.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ CFG_UNIXY_armv7-unknown-linux-gnueabihf := 1
2121
CFG_LDPATH_armv7-unknown-linux-gnueabihf :=
2222
CFG_RUN_armv7-unknown-linux-gnueabihf=$(2)
2323
CFG_RUN_TARG_armv7-unknown-linux-gnueabihf=$(call CFG_RUN_armv7-unknown-linux-gnueabihf,,$(2))
24-
RUSTC_FLAGS_armv7-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp2,+neon
24+
RUSTC_FLAGS_armv7-unknown-linux-gnueabihf :=
2525
RUSTC_CROSS_FLAGS_armv7-unknown-linux-gnueabihf :=
2626
CFG_GNU_TRIPLE_armv7-unknown-linux-gnueabihf := armv7-unknown-linux-gnueabihf

src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn target() -> Target {
2222
target_vendor: "unknown".to_string(),
2323

2424
options: TargetOptions {
25-
features: "+v7,+vfp2,+neon".to_string(),
25+
features: "+v7,+vfp3,+neon".to_string(),
2626
cpu: "cortex-a8".to_string(),
2727
.. base
2828
}

0 commit comments

Comments
 (0)