yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge BoringSSL 2745ef9: Also accept __ARM_NEON

Browse Source
This commit is contained in:
Brian Smith 2018-11-27 23:10:52 -10:00
commit d05bdd5856
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/crypto.c
View File

@ -65,7 +65,8 @@ HIDDEN uint32_t GFp_ia32cap_P[4] = {0};
#if defined(OPENSSL_STATIC_ARMCAP) #if defined(OPENSSL_STATIC_ARMCAP)
HIDDEN uint32_t GFp_armcap_P = HIDDEN uint32_t GFp_armcap_P =
#if defined(OPENSSL_STATIC_ARMCAP_NEON) || defined(__ARM_NEON__) #if defined(OPENSSL_STATIC_ARMCAP_NEON) || \
(defined(__ARM_NEON__) || defined(__ARM_NEON))
ARMV7_NEON | ARMV7_NEON |
#endif #endif
#if defined(OPENSSL_STATIC_ARMCAP_AES) || defined(__ARM_FEATURE_CRYPTO) #if defined(OPENSSL_STATIC_ARMCAP_AES) || defined(__ARM_FEATURE_CRYPTO)

6
include/GFp/cpu.h
View File

@ -111,7 +111,8 @@ static inline int GFp_is_NEON_capable(void) {
// applications will not use that buggy CPU but still support Android users // applications will not use that buggy CPU but still support Android users
// that do, even when the compiler is instructed to freely emit NEON code. // that do, even when the compiler is instructed to freely emit NEON code.
// See https://crbug.com/341598 and https://crbug.com/606629. // See https://crbug.com/341598 and https://crbug.com/606629.
#if defined(__ARM_NEON__) && (!defined(OPENSSL_ARM) || !defined(__ANDROID__)) #if (defined(__ARM_NEON__) || defined(__ARM_NEON)) \
&& (!defined(OPENSSL_ARM) || !defined(__ANDROID__))
return 1; return 1;
#else #else
return GFp_is_NEON_capable_at_runtime(); return GFp_is_NEON_capable_at_runtime();
@ -135,7 +136,8 @@ int GFp_is_ARMv8_PMULL_capable(void);
#else #else
static inline int GFp_is_NEON_capable(void) { static inline int GFp_is_NEON_capable(void) {
#if defined(OPENSSL_STATIC_ARMCAP_NEON) || defined(__ARM_NEON__) #if defined(OPENSSL_STATIC_ARMCAP_NEON) || \
(defined(__ARM_NEON__) || defined(__ARM_NEON))
return 1; return 1;
#else #else
return 0; return 0;