Fix compile on Solaris 11.3 under GCC and SunCC
parent
b7c7874d15
commit
69b3a7a664
|
|
@ -11,6 +11,10 @@
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "blake2.h"
|
#include "blake2.h"
|
||||||
|
|
||||||
|
#if (CRYPTOPP_SSE2_AVAILABLE)
|
||||||
|
# include "emmintrin.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if (CRYPTOPP_SSE42_AVAILABLE)
|
#if (CRYPTOPP_SSE42_AVAILABLE)
|
||||||
# include "nmmintrin.h"
|
# include "nmmintrin.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
2
gcm.cpp
2
gcm.cpp
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
NAMESPACE_BEGIN(CryptoPP)
|
NAMESPACE_BEGIN(CryptoPP)
|
||||||
|
|
||||||
#if (CRYPTOPP_CLMUL_AVAILABLE)
|
#if (CRYPTOPP_SSE2_AVAILABLE)
|
||||||
# include "emmintrin.h"
|
# include "emmintrin.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,12 +31,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (CRYPTOPP_SSE41_AVAILABLE)
|
#if (CRYPTOPP_SSE41_AVAILABLE)
|
||||||
// Hack... Clang conflates SSE4.1 and SSE4.2. Without __SSE4_2__,
|
// Hack... GCC 4.8, LLVM Clang 3.5 and Apple Clang 6.0 conflates SSE4.1
|
||||||
// early Apple and LLVM compilers fail with "SSE4.2 instruction
|
// and SSE4.2. Without __SSE4_2__, early compilers fail with "SSE4.2
|
||||||
// set not enabled" when "nmmintrin.h" is included. Its non-trivial
|
// instruction set not enabled" when "nmmintrin.h" is included.
|
||||||
// for us to automatically add -msse4.2 for Apple Clang. We also want
|
# if defined(__clang__) || defined(__GNUC__)
|
||||||
// to avoid problems on low-end Atoms which have AES but lack SSE4.2.
|
|
||||||
# if defined(__clang__)
|
|
||||||
# define __SSE4_2__ 1
|
# define __SSE4_2__ 1
|
||||||
# endif
|
# endif
|
||||||
# include "nmmintrin.h"
|
# include "nmmintrin.h"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue