mirror of
https://github.com/shadps4-emu/ext-cryptopp.git
synced 2024-11-23 09:59:42 +00:00
Fix <arm_neon.h> include for ARM64 with MSVC compiler (GH #776)
This commit is contained in:
parent
9277d115a8
commit
02f7fda54b
@ -49,7 +49,8 @@
|
||||
#include "misc.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>
|
||||
#endif
|
||||
|
||||
|
@ -38,7 +38,8 @@
|
||||
# include <smmintrin.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
|
||||
|
||||
|
@ -49,7 +49,8 @@
|
||||
# include <smmintrin.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
|
||||
|
||||
|
@ -48,7 +48,8 @@
|
||||
# include <ammintrin.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
|
||||
|
||||
|
@ -14,7 +14,8 @@
|
||||
# include <nmmintrin.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
|
||||
|
||||
|
@ -29,7 +29,8 @@
|
||||
# include <wmmintrin.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
|
||||
|
||||
|
@ -31,13 +31,14 @@
|
||||
# include <immintrin.h>
|
||||
#endif
|
||||
|
||||
// C1189: error: This header is specific to ARM targets
|
||||
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
|
||||
# include "adv_simd.h"
|
||||
# include <arm_neon.h>
|
||||
# ifndef _M_ARM64
|
||||
# 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)
|
||||
# include <stdint.h>
|
||||
# include <arm_acle.h>
|
||||
|
@ -11,12 +11,11 @@
|
||||
#include "config.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>
|
||||
#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>
|
||||
|
@ -30,9 +30,12 @@
|
||||
# include <wmmintrin.h>
|
||||
#endif
|
||||
|
||||
// C1189: error: This header is specific to ARM targets
|
||||
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
|
||||
# include "adv_simd.h"
|
||||
# include <arm_neon.h>
|
||||
# ifndef _M_ARM64
|
||||
# include <arm_neon.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
|
||||
|
@ -23,7 +23,8 @@
|
||||
# include <immintrin.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
|
||||
|
||||
|
@ -31,9 +31,12 @@
|
||||
# include <immintrin.h>
|
||||
#endif
|
||||
|
||||
// C1189: error: This header is specific to ARM targets
|
||||
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
|
||||
# include "adv_simd.h"
|
||||
# include <arm_neon.h>
|
||||
# ifndef _M_ARM64
|
||||
# include <arm_neon.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
|
||||
|
@ -35,9 +35,12 @@
|
||||
# include <immintrin.h>
|
||||
#endif
|
||||
|
||||
// C1189: error: This header is specific to ARM targets
|
||||
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
|
||||
# include "adv_simd.h"
|
||||
# include <arm_neon.h>
|
||||
# ifndef _M_ARM64
|
||||
# include <arm_neon.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
|
||||
|
@ -31,9 +31,12 @@
|
||||
# include <immintrin.h>
|
||||
#endif
|
||||
|
||||
// C1189: error: This header is specific to ARM targets
|
||||
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
|
||||
# include "adv_simd.h"
|
||||
# include <arm_neon.h>
|
||||
# ifndef _M_ARM64
|
||||
# include <arm_neon.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
|
||||
|
@ -35,9 +35,12 @@
|
||||
# include <immintrin.h>
|
||||
#endif
|
||||
|
||||
// C1189: error: This header is specific to ARM targets
|
||||
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
|
||||
# include "adv_simd.h"
|
||||
# include <arm_neon.h>
|
||||
# ifndef _M_ARM64
|
||||
# include <arm_neon.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
// Can't use CRYPTOPP_ARM_XXX_AVAILABLE because too many
|
||||
|
Loading…
Reference in New Issue
Block a user