Merge pull request #28 from mittyorz/aarch64/arm_neon

use __ARM_NEON along with __ARM_NEON__ to detect NEON availability
This commit is contained in:
stz2012 2021-09-10 13:38:43 +09:00 committed by GitHub
commit 0bcf17a3df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -194,7 +194,7 @@ inline void decrypt_cbc_ofb(uint8_t *buf, size_t n, const iv_type &iv, const wor
decrypt_block<x86::xmm>(buf, n, state, key, round);
}
#elif defined(__ARM_NEON__)
#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
if (MULTI2_LIKELY(n == 184)) {
decrypt_block<arm::neon2<7> >(buf, n, state, key, round);
decrypt_block<arm::neon2<8> >(buf, n, state, key, round);

View File

@ -1,6 +1,6 @@
#pragma once
#if defined(__ARM_NEON__)
#if defined(__ARM_NEON__) || defined(__ARM_NEON)
#if !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) || (__BYTE_ORDER__) != (__ORDER_LITTLE_ENDIAN__)
#error "Currently, USE_NEON is only for little-endian."
@ -110,4 +110,4 @@ inline arm::neon rot1_add_dec<arm::neon>(const arm::neon &v) {
}
#endif /* __ARM_NEON__ */
#endif /* __ARM_NEON__ || __ARM_NEON */

View File

@ -1,6 +1,6 @@
#pragma once
#if defined(__ARM_NEON__)
#if defined(__ARM_NEON__) || defined(__ARM_NEON)
#include <utility>
#include <arm_neon.h>
@ -198,4 +198,4 @@ inline arm::neon2<S> rot1_add_dec(const arm::neon2<S> &v) {
}
#endif /* __ARM_NEON__ */
#endif /* __ARM_NEON__ || __ARM_NEON */