add arm64e slice to arm64 iOS builds
I think this new slice will run on the iPhone11 but
none of the older iOS devices, including the iPad bots.
Bug: skia:10663
Change-Id: I99edeccdd4adc845d3a79d7960b932bff374e77f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/313073
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index dab939c..a6b3ded 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -174,37 +174,52 @@
}
if (is_ios) {
- _target = target_cpu
if (target_cpu == "arm") {
- _target = "armv7"
+ _arch_flags = [
+ "-arch",
+ "armv7",
+ ]
+ } else if (target_cpu == "arm64") {
+ _arch_flags = [
+ "-arch",
+ "arm64",
+ "-arch",
+ "arm64e",
+ ]
} else if (target_cpu == "x86") {
- _target = "i386"
+ _arch_flags = [
+ "-arch",
+ "i386",
+ ]
} else if (target_cpu == "x64") {
- _target = "x86_64"
+ _arch_flags = [
+ "-arch",
+ "x86_64",
+ ]
+ } else {
+ _arch_flags = [
+ "-arch",
+ target_cpu,
+ ]
}
+
asmflags += [
- "-isysroot",
- xcode_sysroot,
- "-arch",
- _target,
- ]
+ "-isysroot",
+ xcode_sysroot,
+ ] + _arch_flags
cflags += [
- "-isysroot",
- xcode_sysroot,
- "-arch",
- _target,
- ]
+ "-isysroot",
+ xcode_sysroot,
+ ] + _arch_flags
cflags_cc += [
"-stdlib=libc++",
"-fno-aligned-allocation",
]
ldflags += [
- "-isysroot",
- xcode_sysroot,
- "-arch",
- _target,
- "-stdlib=libc++",
- ]
+ "-isysroot",
+ xcode_sysroot,
+ "-stdlib=libc++",
+ ] + _arch_flags
libs += [ "objc" ]
}