From 822ca11579facd6cd7107f4b709405c025ed9e0b Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 4 Jan 2019 11:33:28 -0500
Subject: [PATCH] Cleanup headers after Microsoft ARM64 port

---
 aria_simd.cpp     | 5 ++---
 blake2b_simd.cpp  | 2 --
 blake2s_simd.cpp  | 2 --
 chacha_simd.cpp   | 2 --
 rijndael_simd.cpp | 2 +-
 simon128_simd.cpp | 2 --
 simon64_simd.cpp  | 2 --
 speck128_simd.cpp | 2 --
 speck64_simd.cpp  | 2 --
 9 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/aria_simd.cpp b/aria_simd.cpp
index 6222439b..ecdc9a65 100644
--- a/aria_simd.cpp
+++ b/aria_simd.cpp
@@ -14,12 +14,11 @@
 # include <tmmintrin.h>
 #endif
 
-#if (CRYPTOPP_ARM_NEON_AVAILABLE)
+// C1189: error: This header is specific to ARM targets
+#if (CRYPTOPP_ARM_NEON_AVAILABLE) && !defined(_M_ARM64)
 # include <arm_neon.h>
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
index 932be73b..9a220bd1 100644
--- a/blake2b_simd.cpp
+++ b/blake2b_simd.cpp
@@ -43,8 +43,6 @@
 # include <arm_neon.h>
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/blake2s_simd.cpp b/blake2s_simd.cpp
index 327e15d6..c2715d24 100644
--- a/blake2s_simd.cpp
+++ b/blake2s_simd.cpp
@@ -54,8 +54,6 @@
 # include <arm_neon.h>
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/chacha_simd.cpp b/chacha_simd.cpp
index 90f7f6e5..93b16aeb 100644
--- a/chacha_simd.cpp
+++ b/chacha_simd.cpp
@@ -53,8 +53,6 @@
 # include <arm_neon.h>
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/rijndael_simd.cpp b/rijndael_simd.cpp
index 227b3fb5..6887c6c9 100644
--- a/rijndael_simd.cpp
+++ b/rijndael_simd.cpp
@@ -26,6 +26,7 @@
 
 #if (CRYPTOPP_AESNI_AVAILABLE)
 # include "adv_simd.h"
+# include <emmintrin.h>
 # include <smmintrin.h>
 # include <wmmintrin.h>
 #endif
@@ -39,7 +40,6 @@
 #endif
 
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
-# include "adv_simd.h"
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
diff --git a/simon128_simd.cpp b/simon128_simd.cpp
index af9e6e97..99a03e1d 100644
--- a/simon128_simd.cpp
+++ b/simon128_simd.cpp
@@ -39,8 +39,6 @@
 # endif
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/simon64_simd.cpp b/simon64_simd.cpp
index 233203d5..3ad26bcd 100644
--- a/simon64_simd.cpp
+++ b/simon64_simd.cpp
@@ -43,8 +43,6 @@
 # endif
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/speck128_simd.cpp b/speck128_simd.cpp
index 3b748c8f..8506c3e1 100644
--- a/speck128_simd.cpp
+++ b/speck128_simd.cpp
@@ -39,8 +39,6 @@
 # endif
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>
diff --git a/speck64_simd.cpp b/speck64_simd.cpp
index cfcf7335..885acad4 100644
--- a/speck64_simd.cpp
+++ b/speck64_simd.cpp
@@ -43,8 +43,6 @@
 # endif
 #endif
 
-// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
-// compilers don't follow ACLE conventions for the include.
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
 # include <stdint.h>
 # include <arm_acle.h>