diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-02 10:00:04 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-03-02 10:00:12 -0500 |
| commit | fce53f132e1b3f2c8bf1530dca18f3da136f08ab (patch) | |
| tree | 5557568435145cc1a0a2a4f9cfd5f782c3731b2d | |
| parent | 8da62a1041bfaf8ce4e40a4b31c7281cbe8bb916 (diff) | |
| parent | 521693378b86aaae5af1646c3a18a902cc835c69 (diff) | |
Merge bitcoin/bitcoin#29528: build: move sha256_sse4 into libbitcoin_crypto_base
521693378b86aaae5af1646c3a18a902cc835c69 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 521693378b86aaae5af1646c3a18a902cc835c69.
hebasto:
ACK 521693378b86aaae5af1646c3a18a902cc835c69.
TheCharlatan:
ACK 521693378b86aaae5af1646c3a18a902cc835c69
Tree-SHA512: 44889340b7647409a439ebe97012f66383e0e5f3d99200ffd55c124e91d3ed164f02b736ff9dafca2d9ba7e365fcdc79aff054471d4bc240d035b58659407420
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3e24ea5a7e..b5d5c4652a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,8 +50,6 @@ LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a endif LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE) -LIBBITCOIN_CRYPTO_SSE4 = crypto/libbitcoin_crypto_sse4.la -LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE4) if ENABLE_SSE41 LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.la LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) @@ -582,6 +580,7 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \ crypto/sha1.h \ crypto/sha256.cpp \ crypto/sha256.h \ + crypto/sha256_sse4.cpp \ crypto/sha3.cpp \ crypto/sha3.h \ crypto/sha512.cpp \ @@ -591,13 +590,6 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \ # See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and # CXXFLAGS above -crypto_libbitcoin_crypto_sse4_la_LDFLAGS = $(AM_LDFLAGS) -static -crypto_libbitcoin_crypto_sse4_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -static -crypto_libbitcoin_crypto_sse4_la_CPPFLAGS = $(AM_CPPFLAGS) -crypto_libbitcoin_crypto_sse4_la_SOURCES = crypto/sha256_sse4.cpp - -# See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and -# CXXFLAGS above crypto_libbitcoin_crypto_sse41_la_LDFLAGS = $(AM_LDFLAGS) -static crypto_libbitcoin_crypto_sse41_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -static crypto_libbitcoin_crypto_sse41_la_CPPFLAGS = $(AM_CPPFLAGS) |