File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -53,15 +53,15 @@ LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE)
53
53
if ENABLE_SSE41
54
54
LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.la
55
55
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41 )
56
+ if ENABLE_X86_SHANI
57
+ LIBBITCOIN_CRYPTO_X86_SHANI = crypto/libbitcoin_crypto_x86_shani.la
58
+ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_X86_SHANI )
59
+ endif
56
60
endif
57
61
if ENABLE_AVX2
58
62
LIBBITCOIN_CRYPTO_AVX2 = crypto/libbitcoin_crypto_avx2.la
59
63
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_AVX2 )
60
64
endif
61
- if ENABLE_X86_SHANI
62
- LIBBITCOIN_CRYPTO_X86_SHANI = crypto/libbitcoin_crypto_x86_shani.la
63
- LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_X86_SHANI )
64
- endif
65
65
if ENABLE_ARM_SHANI
66
66
LIBBITCOIN_CRYPTO_ARM_SHANI = crypto/libbitcoin_crypto_arm_shani.la
67
67
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI )
@@ -612,7 +612,7 @@ crypto_libbitcoin_crypto_x86_shani_la_LDFLAGS = $(AM_LDFLAGS) -static
612
612
crypto_libbitcoin_crypto_x86_shani_la_CXXFLAGS = $(AM_CXXFLAGS ) $(PIE_FLAGS ) -static
613
613
crypto_libbitcoin_crypto_x86_shani_la_CPPFLAGS = $(AM_CPPFLAGS )
614
614
crypto_libbitcoin_crypto_x86_shani_la_CXXFLAGS += $(X86_SHANI_CXXFLAGS )
615
- crypto_libbitcoin_crypto_x86_shani_la_CPPFLAGS += -DENABLE_X86_SHANI
615
+ crypto_libbitcoin_crypto_x86_shani_la_CPPFLAGS += -DENABLE_SSE41 - DENABLE_X86_SHANI
616
616
crypto_libbitcoin_crypto_x86_shani_la_SOURCES = crypto/sha256_x86_shani.cpp
617
617
618
618
# See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and
Original file line number Diff line number Diff line change @@ -623,7 +623,7 @@ std::string SHA256AutoDetect(sha256_implementation::UseImplementation use_implem
623
623
}
624
624
}
625
625
626
- #if defined(ENABLE_X86_SHANI)
626
+ #if defined(ENABLE_SSE41) && defined( ENABLE_X86_SHANI)
627
627
if (have_x86_shani) {
628
628
Transform = sha256_x86_shani::Transform;
629
629
TransformD64 = TransformD64Wrapper<sha256_x86_shani::Transform>;
Original file line number Diff line number Diff line change 6
6
// Written and placed in public domain by Jeffrey Walton.
7
7
// Based on code from Intel, and by Sean Gulley for the miTLS project.
8
8
9
- #ifdef ENABLE_X86_SHANI
9
+ #if defined(ENABLE_SSE41) && defined( ENABLE_X86_SHANI)
10
10
11
11
#include < stdint.h>
12
12
#include < immintrin.h>
You can’t perform that action at this time.
0 commit comments