Skip to content

Commit 8d50035

Browse files
authored
Rollup merge of rust-lang#62904 - nikic:arm-d32, r=alexcrichton
Disable d32 on armv6 hf targets We already do this on armv7 targets. It seems that this now gets enabled by default if '+vfp2` is specified, so disable it explicitly. Hopefully fixes rust-lang#62841. r? @alexcrichton
2 parents 48f6f96 + fe4cdd3 commit 8d50035

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/librustc_target/spec/arm_unknown_linux_gnueabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> TargetResult {
1616
linker_flavor: LinkerFlavor::Gcc,
1717

1818
options: TargetOptions {
19-
features: "+strict-align,+v6,+vfp2".to_string(),
19+
features: "+strict-align,+v6,+vfp2,-d32".to_string(),
2020
abi_blacklist: super::arm_base::abi_blacklist(),
2121
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
2222
.. base

src/librustc_target/spec/arm_unknown_linux_musleabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub fn target() -> TargetResult {
55

66
// Most of these settings are copied from the arm_unknown_linux_gnueabihf
77
// target.
8-
base.features = "+strict-align,+v6,+vfp2".to_string();
8+
base.features = "+strict-align,+v6,+vfp2,-d32".to_string();
99
base.max_atomic_width = Some(64);
1010
Ok(Target {
1111
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM

src/librustc_target/spec/armv6_unknown_freebsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> TargetResult {
1515
linker_flavor: LinkerFlavor::Gcc,
1616

1717
options: TargetOptions {
18-
features: "+v6,+vfp2".to_string(),
18+
features: "+v6,+vfp2,-d32".to_string(),
1919
max_atomic_width: Some(64),
2020
abi_blacklist: super::arm_base::abi_blacklist(),
2121
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),

src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> TargetResult {
1616
linker_flavor: LinkerFlavor::Gcc,
1717

1818
options: TargetOptions {
19-
features: "+v6,+vfp2".to_string(),
19+
features: "+v6,+vfp2,-d32".to_string(),
2020
abi_blacklist: super::arm_base::abi_blacklist(),
2121
target_mcount: "__mcount".to_string(),
2222
.. base

0 commit comments

Comments
 (0)