Skip to content

Commit fce53f1

Browse files
committed
Merge bitcoin/bitcoin#29528: build: move sha256_sse4 into libbitcoin_crypto_base
5216933 build: move sha256_sse4 into libbitcoin_crypto_base (fanquake) Pull request description: Followup to discussion in #29407. Drops `LIBBITCOIN_CRYPTO_SSE4`. ACKs for top commit: theuni: utACK 5216933. hebasto: ACK 5216933. TheCharlatan: ACK 5216933 Tree-SHA512: 44889340b7647409a439ebe97012f66383e0e5f3d99200ffd55c124e91d3ed164f02b736ff9dafca2d9ba7e365fcdc79aff054471d4bc240d035b58659407420
2 parents 8da62a1 + 5216933 commit fce53f1

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

src/Makefile.am

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a
5050
endif
5151

5252
LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE)
53-
LIBBITCOIN_CRYPTO_SSE4 = crypto/libbitcoin_crypto_sse4.la
54-
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE4)
5553
if ENABLE_SSE41
5654
LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.la
5755
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41)
@@ -582,20 +580,14 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \
582580
crypto/sha1.h \
583581
crypto/sha256.cpp \
584582
crypto/sha256.h \
583+
crypto/sha256_sse4.cpp \
585584
crypto/sha3.cpp \
586585
crypto/sha3.h \
587586
crypto/sha512.cpp \
588587
crypto/sha512.h \
589588
crypto/siphash.cpp \
590589
crypto/siphash.h
591590

592-
# See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and
593-
# CXXFLAGS above
594-
crypto_libbitcoin_crypto_sse4_la_LDFLAGS = $(AM_LDFLAGS) -static
595-
crypto_libbitcoin_crypto_sse4_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -static
596-
crypto_libbitcoin_crypto_sse4_la_CPPFLAGS = $(AM_CPPFLAGS)
597-
crypto_libbitcoin_crypto_sse4_la_SOURCES = crypto/sha256_sse4.cpp
598-
599591
# See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and
600592
# CXXFLAGS above
601593
crypto_libbitcoin_crypto_sse41_la_LDFLAGS = $(AM_LDFLAGS) -static

0 commit comments

Comments
 (0)