kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iOS builds use the static ARM CPU configuration.

Browse Source 
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>
This commit is contained in:
David Benjamin 2015-10-28 12:40:12 -04:00 committed by Adam Langley
parent d84b5aec7e
commit f8e9dcaeea
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/openssl/cpu.h
View File

@ -95,6 +95,11 @@ extern uint32_t OPENSSL_ia32cap_P[4];
#if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) #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) #if !defined(OPENSSL_STATIC_ARMCAP)
/* CRYPTO_is_NEON_capable returns true if the current CPU has a NEON unit. Note /* CRYPTO_is_NEON_capable returns true if the current CPU has a NEON unit. Note