Cleanup headers after Microsoft ARM64 port
parent
02f7fda54b
commit
822ca11579
|
|
@ -14,12 +14,11 @@
|
||||||
# include <tmmintrin.h>
|
# include <tmmintrin.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
|
||||||
|
|
||||||
// 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>
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,6 @@
|
||||||
# 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>
|
||||||
|
|
|
||||||
|
|
@ -54,8 +54,6 @@
|
||||||
# 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>
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,6 @@
|
||||||
# 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>
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
|
|
||||||
#if (CRYPTOPP_AESNI_AVAILABLE)
|
#if (CRYPTOPP_AESNI_AVAILABLE)
|
||||||
# include "adv_simd.h"
|
# include "adv_simd.h"
|
||||||
|
# include <emmintrin.h>
|
||||||
# include <smmintrin.h>
|
# include <smmintrin.h>
|
||||||
# include <wmmintrin.h>
|
# include <wmmintrin.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -39,7 +40,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
|
#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
|
||||||
# include "adv_simd.h"
|
|
||||||
# include <stdint.h>
|
# include <stdint.h>
|
||||||
# include <arm_acle.h>
|
# include <arm_acle.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,6 @@
|
||||||
# endif
|
# 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>
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,6 @@
|
||||||
# endif
|
# 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>
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,6 @@
|
||||||
# endif
|
# 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>
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,6 @@
|
||||||
# endif
|
# 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>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue