about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-16 22:35:00 -0700
committerbors <bors@rust-lang.org>2016-05-16 22:35:00 -0700
commit5743564f2d0139b8249d2ede4e720a6452d9c1d9 (patch)
tree66a66620160c4758ba4d6e13ab3aeb71e7989c42
parent786b26d7b48accffc638f8c2767a6e4a6f1991a5 (diff)
parent148b5e4e108fbcdb033eabc76536f65deb181d4f (diff)
downloadrust-5743564f2d0139b8249d2ede4e720a6452d9c1d9.tar.gz
rust-5743564f2d0139b8249d2ede4e720a6452d9c1d9.zip
Auto merge of #33651 - Nercury:update-i686-android-target-to-match-abi, r=alexcrichton
Update i686-linux-android features to match android x86 ABI.

Based on [android's official x86 ABI info](http://developer.android.com/ndk/guides/abis.html#x86), the x86 baseline CPU can be safely updated to `pentiumpro`, with the addition of `MMX`, `SSE`, `SSE2`, `SSE3`, `SSSE3` features.

r? @alexcrichton
-rw-r--r--src/librustc_back/target/i686_linux_android.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/librustc_back/target/i686_linux_android.rs b/src/librustc_back/target/i686_linux_android.rs
index df746965a92..2376de12398 100644
--- a/src/librustc_back/target/i686_linux_android.rs
+++ b/src/librustc_back/target/i686_linux_android.rs
@@ -12,9 +12,13 @@ use target::Target;
 
 pub fn target() -> Target {
     let mut base = super::android_base::opts();
-    base.cpu = "pentium4".to_string();
+
     base.max_atomic_width = 64;
 
+    // http://developer.android.com/ndk/guides/abis.html#x86
+    base.cpu = "pentiumpro".to_string();
+    base.features = "+mmx,+sse,+sse2,+sse3,+ssse3".to_string();
+
     Target {
         llvm_target: "i686-linux-android".to_string(),
         target_endian: "little".to_string(),