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

Merge branch 'master' into hmqv

pull/263/head
Jeffrey Walton 2016-08-19 04:47:31 -04:00
parent 0338347929 90f9d1a9db
commit 074841f50a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpu.h
View File

@ -9,19 +9,18 @@
#include "config.h" #include "config.h"
// ARM32/ARM64 includes
#if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64) #if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64)
# if __GNUC__ # if defined(__GNUC__)
# include <stdint.h> # include <stdint.h>
# endif # endif
# if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE # if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(__ARM_NEON)
# include <arm_neon.h> # include <arm_neon.h>
# endif # endif
# if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE) # if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE) || defined(__ARM_ACLE)
# if (defined(__ARM_ACLE)) # include <arm_acle.h>
# include <arm_acle.h>
# endif
# endif # endif
#endif // ARM-32 or ARM-64 #endif // ARM32 and ARM64
// Applies to both X86/X32/X64 and ARM32/ARM64. And we've got MIPS devices on the way. // Applies to both X86/X32/X64 and ARM32/ARM64. And we've got MIPS devices on the way.
#if defined(_MSC_VER) || defined(__BORLANDC__) #if defined(_MSC_VER) || defined(__BORLANDC__)