From 90f9d1a9db0a1a48ebc8255aa3cb7581e1f0ba7a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 3 Aug 2016 19:34:22 -0400 Subject: [PATCH] Fix compile error on Pine64 dev-board under Aarch64 with GCC 4.9 --- cpu.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cpu.h b/cpu.h index 8398e37d..43d64146 100644 --- a/cpu.h +++ b/cpu.h @@ -9,19 +9,18 @@ #include "config.h" +// ARM32/ARM64 includes #if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARM64) -# if __GNUC__ +# if defined(__GNUC__) # include # endif -# if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE +# if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(__ARM_NEON) # include # endif -# if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE) -# if (defined(__ARM_ACLE)) -# include -# endif +# if (CRYPTOPP_BOOL_ARM_CRYPTO_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_ARM_CRC32_INTRINSICS_AVAILABLE) || defined(__ARM_ACLE) +# include # 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. #if defined(_MSC_VER) || defined(__BORLANDC__)