diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-11-07 22:48:22 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-01-06 11:14:23 +0100 |
| commit | f4868c99213c2b67d84e4506571216d23aa2d9fb (patch) | |
| tree | a5d8110ec3da4406da7226db1d7b8ce3b8e7ec12 /crypto/evp | |
| parent | 4aaf1e493cb86efa64f6a486a27d38da6bce23af (diff) | |
Remove inconsistency in ARM support.
This facilitates "universal" builds, ones that target multiple
architectures, e.g. ARMv5 through ARMv7. See commentary in
Configure for details.
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit c1669e1c205dc8e695fb0c10a655f434e758b9f7)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 2a18a562ee..36091e4b4d 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -911,7 +911,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \ #if defined(OPENSSL_CPUID_OBJ) && (defined(__arm__) || defined(__arm) || defined(__aarch64__)) #include "arm_arch.h" -#if __ARM_ARCH__>=7 +#if __ARM_MAX_ARCH__>=7 # if defined(BSAES_ASM) # define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON) # endif |