commit f8e9dcaeea342292bb5ffb27554187d66318ed0f
author David Benjamin <davidben@chromium.org> Wed Oct 28 12:40:12 2015 -0400
committer Adam Langley <agl@google.com> Wed Oct 28 17:25:25 2015 +0000
tree 3bb35830d16c22f595bb7e78a5a4fd537e36ade2
parent d84b5aec7eca5771f78ce3b57706688b1c1d0657

iOS builds use the static ARM CPU configuration.

The other codepath is Linux-specific. This should get tidied up a bit but, in
the meantime, fix the Chromium iOS (NO_ASM) build. Even when the assembly gets
working, it seems iOS prefers you make fat binaries rather than detect features
at runtime, so this is what we want anyway.

BUG=548539

Change-Id: If19b2e380a96918b07bacc300a3a27b885697b99
Reviewed-on: https://boringssl-review.googlesource.com/6380
Reviewed-by: Adam Langley <agl@google.com>

include/openssl/cpu.h

diff --git a/include/openssl/cpu.h b/include/openssl/cpu.h
index bda5347..19e11d0 100644
--- a/include/openssl/cpu.h
+++ b/include/openssl/cpu.h
@@ -95,6 +95,11 @@
 
 #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
 
+#if defined(OPENSSL_APPLE)
+/* iOS builds use the static ARM configuration. */
+#define OPENSSL_STATIC_ARMCAP
+#endif
+
 #if !defined(OPENSSL_STATIC_ARMCAP)
 
 /* CRYPTO_is_NEON_capable returns true if the current CPU has a NEON unit. Note