Skip to content

Commit a0f6aaa

Browse files
Rollup merge of rust-lang#44589 - makotokato:thumb2, r=alexcrichton
Require +thumb-mode to generate thumb2 code for Android/armv7-a I am investigating rust's code generation into Gecko by https://bugzilla.mozilla.org/show_bug.cgi?id=1399337. armv7-linux-androideabi target uses `+v7,+thumb2,+vfp3,+d16,-neon` as target-feature. But `+thumb2` only doesn't generate thumb2 code. To generate thumb2 code, it requires `+thumb-mode`. So we should add it for armv7-linux-androideabi. r? @alexcrichton
2 parents 56b3922 + 07494ec commit a0f6aaa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: src/librustc_back/target/armv7_linux_androideabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use target::{Target, TargetOptions, TargetResult};
1616

1717
pub fn target() -> TargetResult {
1818
let mut base = super::android_base::opts();
19-
base.features = "+v7,+thumb2,+vfp3,+d16,-neon".to_string();
19+
base.features = "+v7,+thumb-mode,+thumb2,+vfp3,+d16,-neon".to_string();
2020
base.max_atomic_width = Some(64);
2121
base.pre_link_args
2222
.get_mut(&LinkerFlavor::Gcc).unwrap().push("-march=armv7-a".to_string());

0 commit comments

Comments
 (0)