Update for earlier Apple compilers, like Apple Clang 6 and 8

pull/461/head
Jeffrey Walton 2017-08-11 14:24:05 -04:00
parent 8a66353b2c
commit 5b945a5412
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
5 changed files with 12 additions and 3 deletions

View File

@ -574,9 +574,6 @@ NAMESPACE_END
# define CRYPTOPP_ARM_AES_AVAILABLE 1 # define CRYPTOPP_ARM_AES_AVAILABLE 1
# define CRYPTOPP_ARM_SHA_AVAILABLE 1 # define CRYPTOPP_ARM_SHA_AVAILABLE 1
# define CRYPTOPP_ARM_CRYPTO_AVAILABLE 1 # define CRYPTOPP_ARM_CRYPTO_AVAILABLE 1
# if !defined(__apple_build_version__)
# define CRYPTOPP_ARM_PMULL_AVAILABLE 1
# endif
# endif # endif
#endif #endif

View File

@ -29,6 +29,9 @@
# include "nmmintrin.h" # include "nmmintrin.h"
#endif #endif
// Don't include <arm_acle.h> when using Apple Clang. Early Apple compilers
// fail to compile with <arm_acle.h> included. Later Apple compilers compile
// intrinsics without <arm_acle.h> included.
#if (CRYPTOPP_ARM_CRC32_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) #if (CRYPTOPP_ARM_CRC32_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION)
# include "arm_acle.h" # include "arm_acle.h"
#endif #endif

View File

@ -34,6 +34,9 @@
# include "arm_neon.h" # include "arm_neon.h"
#endif #endif
// Don't include <arm_acle.h> when using Apple Clang. Early Apple compilers
// fail to compile with <arm_acle.h> included. Later Apple compilers compile
// intrinsics without <arm_acle.h> included.
#if (CRYPTOPP_ARM_PMULL_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) #if (CRYPTOPP_ARM_PMULL_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION)
# include "arm_acle.h" # include "arm_acle.h"
#endif #endif

View File

@ -46,6 +46,9 @@
# include "arm_neon.h" # include "arm_neon.h"
#endif #endif
// Don't include <arm_acle.h> when using Apple Clang. Early Apple compilers
// fail to compile with <arm_acle.h> included. Later Apple compilers compile
// intrinsics without <arm_acle.h> included.
#if (CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) #if (CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION)
# include "arm_acle.h" # include "arm_acle.h"
#endif #endif

View File

@ -43,6 +43,9 @@
# include "arm_neon.h" # include "arm_neon.h"
#endif #endif
// Don't include <arm_acle.h> when using Apple Clang. Early Apple compilers
// fail to compile with <arm_acle.h> included. Later Apple compilers compile
// intrinsics without <arm_acle.h> included.
#if (CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) #if (CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION)
# include "arm_acle.h" # include "arm_acle.h"
#endif #endif