arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix <arm_neon.h> include for ARM64 with MSVC compiler (GH #776)

pull/778/head
Jeffrey Walton 2019-01-04 11:25:55 -05:00
parent 9277d115a8
commit 02f7fda54b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
14 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adv_simd.h
View File

@ -49,7 +49,8 @@
#include "misc.h" #include "misc.h"
#include "stdcpp.h" #include "stdcpp.h"
#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> # include <arm_neon.h>
#endif #endif

3
blake2b_simd.cpp
View File

@ -38,7 +38,8 @@
# include <smmintrin.h> # include <smmintrin.h>
#endif #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> # include <arm_neon.h>
#endif #endif

3
blake2s_simd.cpp
View File

@ -49,7 +49,8 @@
# include <smmintrin.h> # include <smmintrin.h>
#endif #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> # include <arm_neon.h>
#endif #endif

3
chacha_simd.cpp
View File

@ -48,7 +48,8 @@
# include <ammintrin.h> # include <ammintrin.h>
#endif #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> # include <arm_neon.h>
#endif #endif

3
crc_simd.cpp
View File

@ -14,7 +14,8 @@
# include <nmmintrin.h> # include <nmmintrin.h>
#endif #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> # include <arm_neon.h>
#endif #endif

3
gcm_simd.cpp
View File

@ -29,7 +29,8 @@
# include <wmmintrin.h> # include <wmmintrin.h>
#endif #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> # include <arm_neon.h>
#endif #endif

5
lea_simd.cpp
View File

@ -31,13 +31,14 @@
# include <immintrin.h> # include <immintrin.h>
#endif #endif
// C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# ifndef _M_ARM64
# include <arm_neon.h> # include <arm_neon.h>
# endif # 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) #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
# include <stdint.h> # include <stdint.h>
# include <arm_acle.h> # include <arm_acle.h>

5
neon_simd.cpp
View File

@ -11,12 +11,11 @@
#include "config.h" #include "config.h"
#include "stdcpp.h" #include "stdcpp.h"
#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> # include <arm_neon.h>
#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) #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
# include <stdint.h> # include <stdint.h>
# include <arm_acle.h> # include <arm_acle.h>

3
rijndael_simd.cpp
View File

@ -30,10 +30,13 @@
# include <wmmintrin.h> # include <wmmintrin.h>
#endif #endif
// C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# ifndef _M_ARM64
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
#endif
#if (CRYPTOPP_ARM_ACLE_AVAILABLE) #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"

3
sha_simd.cpp
View File

@ -23,7 +23,8 @@
# include <immintrin.h> # include <immintrin.h>
#endif #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> # include <arm_neon.h>
#endif #endif

3
simon128_simd.cpp
View File

@ -31,10 +31,13 @@
# include <immintrin.h> # include <immintrin.h>
#endif #endif
// C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# ifndef _M_ARM64
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
#endif
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
// compilers don't follow ACLE conventions for the include. // compilers don't follow ACLE conventions for the include.

3
simon64_simd.cpp
View File

@ -35,10 +35,13 @@
# include <immintrin.h> # include <immintrin.h>
#endif #endif
// C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# ifndef _M_ARM64
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
#endif
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
// compilers don't follow ACLE conventions for the include. // compilers don't follow ACLE conventions for the include.

3
speck128_simd.cpp
View File

@ -31,10 +31,13 @@
# include <immintrin.h> # include <immintrin.h>
#endif #endif
// C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# ifndef _M_ARM64
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
#endif
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
// compilers don't follow ACLE conventions for the include. // compilers don't follow ACLE conventions for the include.

3
speck64_simd.cpp
View File

@ -35,10 +35,13 @@
# include <immintrin.h> # include <immintrin.h>
#endif #endif
// C1189: error: This header is specific to ARM targets
#if (CRYPTOPP_ARM_NEON_AVAILABLE) #if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h" # include "adv_simd.h"
# ifndef _M_ARM64
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
#endif
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many // Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
// compilers don't follow ACLE conventions for the include. // compilers don't follow ACLE conventions for the include.