phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 03:47:29 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge bitcoin/bitcoin#29528: build: move sha256_sse4 into libbitcoin_crypto_base

Browse source 
521693378b 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 521693378b.
  hebasto:
    ACK 521693378b.
  TheCharlatan:
    ACK 521693378b

Tree-SHA512: 44889340b7647409a439ebe97012f66383e0e5f3d99200ffd55c124e91d3ed164f02b736ff9dafca2d9ba7e365fcdc79aff054471d4bc240d035b58659407420
This commit is contained in:
fanquake 2024-03-02 10:00:04 -05:00
commit fce53f132e
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Makefile.am
View file

@ -50,8 +50,6 @@ LIBBITCOIN_WALLET_TOOL=libbitcoin_wallet_tool.a
endif endif
LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE) LIBBITCOIN_CRYPTO = $(LIBBITCOIN_CRYPTO_BASE)
LIBBITCOIN_CRYPTO_SSE4 = crypto/libbitcoin_crypto_sse4.la
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE4)
if ENABLE_SSE41 if ENABLE_SSE41
LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.la LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.la
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41) LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41)
@ -582,6 +580,7 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \
crypto/sha1.h \ crypto/sha1.h \
crypto/sha256.cpp \ crypto/sha256.cpp \
crypto/sha256.h \ crypto/sha256.h \
crypto/sha256_sse4.cpp \
crypto/sha3.cpp \ crypto/sha3.cpp \
crypto/sha3.h \ crypto/sha3.h \
crypto/sha512.cpp \ crypto/sha512.cpp \
@ -589,13 +588,6 @@ crypto_libbitcoin_crypto_base_la_SOURCES = \
crypto/siphash.cpp \ crypto/siphash.cpp \
crypto/siphash.h crypto/siphash.h
# 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 # See explanation for -static in crypto_libbitcoin_crypto_base_la's LDFLAGS and
# CXXFLAGS above # CXXFLAGS above
crypto_libbitcoin_crypto_sse41_la_LDFLAGS = $(AM_LDFLAGS) -static crypto_libbitcoin_crypto_sse41_la_LDFLAGS = $(AM_LDFLAGS) -static