Auto merge of #33500 - Nercury:update-aarch64-android-target-to-match…

…-abi, r=alexcrichton Update aarch64-linux-android target to match android abi. - Changed `target_env` to "gnu" to empty "" for all android targets because it does not matter for android. - The PR #33048 added "max_atomic_width" for arm-android but missed recently added armv7-android. Add it there too. - Added features `+neon,+fp-armv8` because they [must exist on `aarch64` android](http://developer.android.com/ndk/guides/cpu-features.html). - Update libc to include rust-lang/libc#282 so that rust's std lib works on android's aarch64 (the main issue there was incorrect structure alignment on 64-bit arm). r? @alexcrichton
rust-lang · May 16, 2016 · 4fdf2c4 · 4fdf2c4
2 parents 8310de8 + e512abd
commit 4fdf2c4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/src/liblibc b/src/liblibc
diff --git a/src/librustc_back/target/aarch64_linux_android.rs b/src/librustc_back/target/aarch64_linux_android.rs
@@ -13,6 +13,9 @@ use target::Target;
 pub fn target() -> Target {
     let mut base = super::android_base::opts();
     base.max_atomic_width = 128;
+    // As documented in http://developer.android.com/ndk/guides/cpu-features.html
+    // the neon (ASIMD) and FP must exist on all android aarch64 targets.
+    base.features = "+neon,+fp-armv8".to_string();
     Target {
         llvm_target: "aarch64-linux-android".to_string(),
         target_endian: "little".to_string(),

diff --git a/src/librustc_back/target/arm_linux_androideabi.rs b/src/librustc_back/target/arm_linux_androideabi.rs
@@ -22,7 +22,7 @@ pub fn target() -> Target {
         data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
         arch: "arm".to_string(),
         target_os: "android".to_string(),
-        target_env: "gnu".to_string(),
+        target_env: "".to_string(),
         target_vendor: "unknown".to_string(),
         options: base,
     }

diff --git a/src/librustc_back/target/armv7_linux_androideabi.rs b/src/librustc_back/target/armv7_linux_androideabi.rs
@@ -13,6 +13,7 @@ use target::Target;
 pub fn target() -> Target {
     let mut base = super::android_base::opts();
     base.features = "+v7,+thumb2,+vfp3,+d16".to_string();
+    base.max_atomic_width = 64;
 
     Target {
         llvm_target: "armv7-none-linux-android".to_string(),
@@ -21,7 +22,7 @@ pub fn target() -> Target {
         data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
         arch: "arm".to_string(),
         target_os: "android".to_string(),
-        target_env: "gnu".to_string(),
+        target_env: "".to_string(),
         target_vendor: "unknown".to_string(),
         options: base,
     }

diff --git a/src/librustc_back/target/i686_linux_android.rs b/src/librustc_back/target/i686_linux_android.rs
@@ -22,7 +22,7 @@ pub fn target() -> Target {
         data_layout: "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128".to_string(),
         arch: "x86".to_string(),
         target_os: "android".to_string(),
-        target_env: "gnu".to_string(),
+        target_env: "".to_string(),
         target_vendor: "unknown".to_string(),
         options: base,
     }
+2 −2		.travis.yml
+1 −1		Cargo.toml
+12 −3		README.md
+3 −3		ci/run-travis.sh
+11 −19		libc-test/Cargo.lock
+5 −6		libc-test/build.rs
+1 −0		src/lib.rs
+124 −0		src/unix/bsd/apple/mod.rs
+110 −1		src/unix/bsd/freebsdlike/mod.rs
+15 −0		src/unix/bsd/mod.rs
+43 −0		src/unix/bsd/openbsdlike/bitrig.rs
+62 −0		src/unix/bsd/openbsdlike/mod.rs
+21 −0		src/unix/bsd/openbsdlike/netbsd.rs
+1 −0		src/unix/bsd/openbsdlike/openbsd.rs
+60 −5		src/unix/mod.rs
+116 −0		src/unix/notbsd/android/b32.rs
+126 −0		src/unix/notbsd/android/b64.rs
+34 −146		src/unix/notbsd/android/mod.rs
+18 −8		src/unix/notbsd/linux/mips.rs
+103 −29		src/unix/notbsd/linux/mod.rs
+13 −0		src/unix/notbsd/linux/musl/b32/x86.rs
+15 −0		src/unix/notbsd/linux/musl/b64/x86_64.rs
+0 −8		src/unix/notbsd/linux/musl/mod.rs
+22 −1		src/unix/notbsd/linux/other/b32/x86.rs
+28 −1		src/unix/notbsd/linux/other/b64/x86_64.rs
+18 −8		src/unix/notbsd/linux/other/mod.rs
+55 −4		src/unix/notbsd/mod.rs
+126 −0		src/unix/solaris/mod.rs