From 8e2a9364a7a3f1deed3e9218517b1c8871a77856 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 13 Oct 2021 05:15:57 +0100 Subject: [PATCH] Do not try to use VMULL in Android/ARM. --- arm_vmull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arm_vmull.c b/arm_vmull.c index 5cb0829..cf1f252 100644 --- a/arm_vmull.c +++ b/arm_vmull.c @@ -32,7 +32,7 @@ #include "arm_vmull.h" #include "simd.h" -#if !defined(_WIN32) +#if !defined(_WIN32) && (!defined(__ANDROID__) || !defined(__arm__)) TARGET_WITH_CRYPTO static uint64x2_t sse2neon_vmull_p64_crypto(uint64x1_t _a, uint64x1_t _b) { poly64_t a = vget_lane_p64(vreinterpret_p64_u64(_a), 0); @@ -43,7 +43,7 @@ TARGET_WITH_CRYPTO static uint64x2_t sse2neon_vmull_p64_crypto(uint64x1_t _a, ui TARGET_WITH_SIMD uint64x2_t sse2neon_vmull_p64(uint64x1_t _a, uint64x1_t _b) { -#if !defined(_WIN32) +#if !defined(_WIN32) && (!defined(__ANDROID__) || !defined(__arm__)) // Wraps vmull_p64 if(have_arm_crypto()) return sse2neon_vmull_p64_crypto(_a, _b); #endif @@ -163,4 +163,4 @@ TARGET_WITH_SIMD uint64x2_t mm_slli_si128(uint64x2_t a, int imm) return vreinterpretq_u64_u8(vld1q_u8(((uint8_t const*)tmp) + (16 - imm))); } -#endif \ No newline at end of file +#endif