From f8e9dcaeea342292bb5ffb27554187d66318ed0f Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 28 Oct 2015 12:40:12 -0400 Subject: [PATCH] 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 --- include/openssl/cpu.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/openssl/cpu.h b/include/openssl/cpu.h index bda5347a..19e11d04 100644 --- a/include/openssl/cpu.h +++ b/include/openssl/cpu.h @@ -95,6 +95,11 @@ extern uint32_t OPENSSL_ia32cap_P[4]; #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