diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-12-29 00:48:12 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-12-29 00:48:12 -0500 |
| commit | 58772f3491a5507d2da4d9c0c1b5db57d8524655 (patch) | |
| tree | 5b4d073c833d8b515a93871ea3612cafe746abec /simon128_simd.cpp | |
| parent | a9bd504b2f125d47c2ebf731c16ab6f2ab4e58e9 (diff) | |
| download | cryptopp-git-58772f3491a5507d2da4d9c0c1b5db57d8524655.tar.gz | |
Fix SIMON build when SSSE3 not available
Diffstat (limited to 'simon128_simd.cpp')
| -rw-r--r-- | simon128_simd.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/simon128_simd.cpp b/simon128_simd.cpp index c3006547..a6cdf0d8 100644 --- a/simon128_simd.cpp +++ b/simon128_simd.cpp @@ -10,7 +10,6 @@ #include "simon.h"
#include "misc.h"
-#include "adv_simd.h"
// Uncomment for benchmarking C++ against SSE or NEON.
// Do so in both simon.cpp and simon-simd.cpp.
@@ -18,6 +17,7 @@ // #undef CRYPTOPP_ARM_NEON_AVAILABLE
#if (CRYPTOPP_SSSE3_AVAILABLE)
+# include "adv_simd.h"
# include <pmmintrin.h>
# include <tmmintrin.h>
#endif
@@ -26,12 +26,13 @@ # include <ammintrin.h>
#endif
-#if defined(__AVX512F__) && defined(__AVX512VL__)
+#if defined(__AVX512F__)
# define CRYPTOPP_AVX512_ROTATE 1
# include <immintrin.h>
#endif
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
+# include "adv_simd.h"
# include <arm_neon.h>
#endif
@@ -43,6 +44,7 @@ #endif
#if defined(CRYPTOPP_POWER7_AVAILABLE)
+# include "adv_simd.h"
# include "ppc_simd.h"
#endif
|