diff options
| author | Adam Langley <alangley@gmail.com> | 2018-11-12 11:57:32 -0800 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2018-11-12 22:12:08 +0000 |
| commit | 2745ef908283e38bd1695ae226e63b140dc805f8 (patch) | |
| tree | 237654630b3054e8dacc32ecd7cf64005a814c70 /crypto/crypto.c | |
| parent | 76e441bd6639f83bfc138b5dccbe4ba9d3389cd4 (diff) | |
| download | boringssl-2745ef908283e38bd1695ae226e63b140dc805f8.zip boringssl-2745ef908283e38bd1695ae226e63b140dc805f8.tar.gz boringssl-2745ef908283e38bd1695ae226e63b140dc805f8.tar.bz2 | |
Also accept __ARM_NEON
The Clang used in the Android SDK, at least, defines both __ARM_NEON__
and __ARM_NEON for ARMv7, but only the latter for AArch64.
This change switches each use of __ARM_NEON__ to accept either.
Change-Id: I3b5d5badc9ff0210888fd456e9329dc53a2b9b09
Reviewed-on: https://boringssl-review.googlesource.com/c/33104
Commit-Queue: Adam Langley <alangley@gmail.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'crypto/crypto.c')
| -rw-r--r-- | crypto/crypto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/crypto.c b/crypto/crypto.c index 783d7d9..5f1a69a 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -82,7 +82,8 @@ HIDDEN unsigned long OPENSSL_ppc64le_hwcap2 = 0; #if defined(OPENSSL_STATIC_ARMCAP) HIDDEN uint32_t OPENSSL_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 | #endif #if defined(OPENSSL_STATIC_ARMCAP_AES) || defined(__ARM_FEATURE_CRYPTO) |