about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-08-11 22:11:43 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-08-11 22:42:21 -0700
commitd4f2ef9b3024e2f32d6425095b08625338d8d1f9 (patch)
treeeb812d69845f93e134348999a07932426393a06a
parentd493659d7bbc04c35ec541b141679bf5aa3aa9db (diff)
parent155689b699e50ab29675db3b006e305dfc06bd39 (diff)
downloadrust-d4f2ef9b3024e2f32d6425095b08625338d8d1f9.tar.gz
rust-d4f2ef9b3024e2f32d6425095b08625338d8d1f9.zip
rollup merge of #27672: eefriedman/ios-target-cpu
This matches the behavior of clang.

See also discussion on #27307.
-rw-r--r--src/librustc_back/target/apple_ios_base.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_back/target/apple_ios_base.rs b/src/librustc_back/target/apple_ios_base.rs
index 74c4183cfa3..77030f5d768 100644
--- a/src/librustc_back/target/apple_ios_base.rs
+++ b/src/librustc_back/target/apple_ios_base.rs
@@ -77,8 +77,8 @@ fn target_cpu(arch: Arch) -> String {
         Armv7 => "cortex-a8", // iOS7 is supported on iPhone 4 and higher
         Armv7s => "cortex-a9",
         Arm64 => "cyclone",
-        I386 => "generic",
-        X86_64 => "x86-64",
+        I386 => "yonah",
+        X86_64 => "core2",
     }.to_string()
 }