Cleanup adv_simd.h include for arch flags

pull/769/head
Jeffrey Walton 2018-12-28 14:08:54 -05:00
parent d2cf296d2a
commit 662db8fc87
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 5 additions and 7 deletions

View File

@ -23,23 +23,26 @@
#include "pch.h"
#include "config.h"
#include "misc.h"
#include "adv_simd.h"
#if (CRYPTOPP_AESNI_AVAILABLE)
# include "adv_simd.h"
# include <smmintrin.h>
# include <wmmintrin.h>
#endif
#if (CRYPTOPP_ARM_NEON_AVAILABLE)
# include "adv_simd.h"
# include <arm_neon.h>
#endif
#if (CRYPTOPP_ARM_ACLE_AVAILABLE)
# include "adv_simd.h"
# include <stdint.h>
# include <arm_acle.h>
#endif
#if defined(CRYPTOPP_POWER8_AES_AVAILABLE)
# include "adv_simd.h"
# include "ppc_simd.h"
#endif

View File

@ -15,18 +15,13 @@
#include "sm4.h"
#include "misc.h"
#include "adv_simd.h"
// Uncomment for benchmarking C++ against SSE.
// Do so in both simon.cpp and simon-simd.cpp.
// #undef CRYPTOPP_AESNI_AVAILABLE
#if (CRYPTOPP_SSE2_INTRIN_AVAILABLE)
# include <xmmintrin.h>
# include <emmintrin.h>
#endif
#if (CRYPTOPP_AESNI_AVAILABLE)
# include "adv_simd.h"
# include <tmmintrin.h>
# include <wmmintrin.h>
#endif