From f801afd3d4e3ec8b219d952d1d3204c4090d87ea Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 1 Nov 2015 16:49:24 +0100 Subject: [PATCH] Use the SSSE3 implementation only on x86_64 --- .../crypto_generichash/blake2/ref/blake2b-compress-sse41.c | 2 +- .../crypto_generichash/blake2/ref/blake2b-compress-ssse3.c | 2 +- src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c index a039b206..64bc5923 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c @@ -6,7 +6,7 @@ #include #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) && \ - (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) + (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) #pragma GCC target("sse2") #pragma GCC target("ssse3") diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ssse3.c b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ssse3.c index a10f5c7e..775cac11 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ssse3.c +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ssse3.c @@ -5,7 +5,7 @@ #include #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)) || \ - (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) + (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) #pragma GCC target("sse2") #pragma GCC target("ssse3") diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c b/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c index b3026b8d..d29e7125 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c @@ -406,14 +406,14 @@ int blake2b_pick_best_implementation(void) { #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \ - (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) + (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) if (sodium_runtime_has_sse41()) { blake2b_compress = blake2b_compress_sse41; return 0; } #endif #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)) || \ - (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) + (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) if (sodium_runtime_has_ssse3()) { blake2b_compress = blake2b_compress_ssse3; return 0;