cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #418 from Jan-E/vs2010x64

Browse Source 
Fix x64 builds for MSVC < vc11
This commit is contained in:
Frank Denis 2016-07-24 19:57:14 +02:00 committed by GitHub
commit 5497ca1fad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-avx2.c
View File

@ -7,7 +7,7 @@
#include <string.h> #include <string.h>
#if (defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \ #if (defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \
(defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64)) && _MSC_VER > 1600)
#pragma GCC target("sse2") #pragma GCC target("sse2")
#pragma GCC target("ssse3") #pragma GCC target("ssse3")

2
src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c
View File

@ -429,7 +429,7 @@ blake2b_pick_best_implementation(void)
{ {
/* LCOV_EXCL_START */ /* LCOV_EXCL_START */
#if (defined(HAVE_AVX2INTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \ #if (defined(HAVE_AVX2INTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \
(defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64)) && _MSC_VER > 1600)
if (sodium_runtime_has_avx2()) { if (sodium_runtime_has_avx2()) {
blake2b_compress = blake2b_compress_avx2; blake2b_compress = blake2b_compress_avx2;
return 0; return 0;