From 60eedb97ba67956f6ae5a406bd386cc61f304898 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 16 Oct 2019 21:00:45 -0400
Subject: Fix ARM headers and Android compile (PR #896)

* Test fix ARM headers
This problem has been festering for some time. The header file includes are slightly different than the ISA options. Some platforms need an include, others don't.

* Fix cryptest-android.sh and cryptest-ios.sh

* Fix MSVC ARM32 and ARM64 compile

* Split ARM32 and ARM64 recipes in GNUmakefile
---
 lea_simd.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lea_simd.cpp')

diff --git a/lea_simd.cpp b/lea_simd.cpp
index 85ff6a3a..af7ffcfa 100644
--- a/lea_simd.cpp
+++ b/lea_simd.cpp
@@ -34,15 +34,12 @@
 # include <immintrin.h>
 #endif
 
-// C1189: error: This header is specific to ARM targets
-#if (CRYPTOPP_ARM_NEON_AVAILABLE)
+#if (CRYPTOPP_ARM_NEON_HEADER)
 # include "adv_simd.h"
-# ifndef _M_ARM64
-#  include <arm_neon.h>
-# endif
+# include <arm_neon.h>
 #endif
 
-#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
+#if (CRYPTOPP_ARM_ACLE_HEADER)
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
-- 
cgit v1.2.1