bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #41657 - malbarbo:android-armv7-linker, r=alexcrichton

Browse source 
Add -march=armv7-a parameter to armv7 android linker

Without this option, the linker fails to link any library that uses `std::future`. The error points some undefined references, like `std::__future_base::_Result_base`.

For example, it fails to link rustc because llvm 4.0 uses `std::future`.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64735
This commit is contained in:
Corey Farwell 2017-05-02 21:21:22 -04:00 • committed by GitHub
commit a4761639e8
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_back/target/armv7_linux_androideabi.rs
View file

@ -18,6 +18,8 @@ pub fn target() -> TargetResult {
let mut base = super::android_base::opts(); let mut base = super::android_base::opts();
base.features = "+v7,+thumb2,+vfp3,+d16,-neon".to_string(); base.features = "+v7,+thumb2,+vfp3,+d16,-neon".to_string();
base.max_atomic_width = Some(64); base.max_atomic_width = Some(64);
base.pre_link_args
.get_mut(&LinkerFlavor::Gcc).unwrap().push("-march=armv7-a".to_string());
Ok(Target { Ok(Target {
llvm_target: "armv7-none-linux-android".to_string(), llvm_target: "armv7-none-linux-android".to_string(),