Skip to content

Commit 70a03c6

Browse files
laanwjlaanwj
committed
Merge #13408: crypto: cleanup sha256 build
f68049d crypto: cleanup sha256 build (Cory Fields) Pull request description: Requested by @sipa in #13386. Rather than appending all possible cpu variants to all targets, create a convenience variable that encompasses all. Tree-SHA512: 8e9ab2185515672b79bb7925afa4f3fbfe921bfcbe61456833d15457de4feba95290de17514344ce42ee81cc38b252476cd0c29432ac48c737c2225ed515a4bd
2 parents 531a033 + f68049d commit 70a03c6

File tree

5 files changed

+20
-26
lines changed

5 files changed

+20
-26
lines changed

‎src/Makefile.am

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ LIBBITCOIN_COMMON=libbitcoin_common.a
2929
LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a
3030
LIBBITCOIN_CLI=libbitcoin_cli.a
3131
LIBBITCOIN_UTIL=libbitcoin_util.a
32-
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
33-
LIBBITCOIN_CRYPTO_SSE41=crypto/libbitcoin_crypto_sse41.a
34-
LIBBITCOIN_CRYPTO_AVX2=crypto/libbitcoin_crypto_avx2.a
32+
LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.a
3533
LIBBITCOINQT=qt/libbitcoinqt.a
3634
LIBSECP256K1=secp256k1/libsecp256k1.la
3735

@@ -45,15 +43,23 @@ if ENABLE_WALLET
4543
LIBBITCOIN_WALLET=libbitcoin_wallet.a
4644
endif
4745

46+
LIBBITCOIN_CRYPTO= $(LIBBITCOIN_CRYPTO_BASE)
47+
if ENABLE_SSE41
48+
LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.a
49+
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_SSE41)
50+
endif
51+
if ENABLE_AVX2
52+
LIBBITCOIN_CRYPTO_AVX2 = crypto/libbitcoin_crypto_avx2.a
53+
LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_AVX2)
54+
endif
55+
4856
$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
4957
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
5058

5159
# Make is not made aware of per-object dependencies to avoid limiting building parallelization
5260
# But to build the less dependent modules first, we manually select their order here:
5361
EXTRA_LIBRARIES += \
5462
$(LIBBITCOIN_CRYPTO) \
55-
$(LIBBITCOIN_CRYPTO_SSE41) \
56-
$(LIBBITCOIN_CRYPTO_AVX2) \
5763
$(LIBBITCOIN_UTIL) \
5864
$(LIBBITCOIN_COMMON) \
5965
$(LIBBITCOIN_CONSENSUS) \
@@ -270,9 +276,9 @@ libbitcoin_wallet_a_SOURCES = \
270276
$(BITCOIN_CORE_H)
271277

272278
# crypto primitives library
273-
crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS)
274-
crypto_libbitcoin_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
275-
crypto_libbitcoin_crypto_a_SOURCES = \
279+
crypto_libbitcoin_crypto_base_a_CPPFLAGS = $(AM_CPPFLAGS)
280+
crypto_libbitcoin_crypto_base_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
281+
crypto_libbitcoin_crypto_base_a_SOURCES = \
276282
crypto/aes.cpp \
277283
crypto/aes.h \
278284
crypto/chacha20.h \
@@ -292,23 +298,19 @@ crypto_libbitcoin_crypto_a_SOURCES = \
292298
crypto/sha512.h
293299

294300
if USE_ASM
295-
crypto_libbitcoin_crypto_a_SOURCES += crypto/sha256_sse4.cpp
301+
crypto_libbitcoin_crypto_base_a_SOURCES += crypto/sha256_sse4.cpp
296302
endif
297303

298304
crypto_libbitcoin_crypto_sse41_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
299305
crypto_libbitcoin_crypto_sse41_a_CPPFLAGS = $(AM_CPPFLAGS)
300-
if ENABLE_SSE41
301306
crypto_libbitcoin_crypto_sse41_a_CXXFLAGS += $(SSE41_CXXFLAGS)
302307
crypto_libbitcoin_crypto_sse41_a_CPPFLAGS += -DENABLE_SSE41
303-
endif
304308
crypto_libbitcoin_crypto_sse41_a_SOURCES = crypto/sha256_sse41.cpp
305309

306310
crypto_libbitcoin_crypto_avx2_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
307311
crypto_libbitcoin_crypto_avx2_a_CPPFLAGS = $(AM_CPPFLAGS)
308-
if ENABLE_AVX2
309312
crypto_libbitcoin_crypto_avx2_a_CXXFLAGS += $(AVX2_CXXFLAGS)
310313
crypto_libbitcoin_crypto_avx2_a_CPPFLAGS += -DENABLE_AVX2
311-
endif
312314
crypto_libbitcoin_crypto_avx2_a_SOURCES = crypto/sha256_avx2.cpp
313315

314316
# consensus: shared between all executables that validate any consensus rules.
@@ -433,8 +435,6 @@ bitcoind_LDADD = \
433435
$(LIBBITCOIN_ZMQ) \
434436
$(LIBBITCOIN_CONSENSUS) \
435437
$(LIBBITCOIN_CRYPTO) \
436-
$(LIBBITCOIN_CRYPTO_SSE41) \
437-
$(LIBBITCOIN_CRYPTO_AVX2) \
438438
$(LIBLEVELDB) \
439439
$(LIBLEVELDB_SSE42) \
440440
$(LIBMEMENV) \
@@ -456,9 +456,7 @@ bitcoin_cli_LDADD = \
456456
$(LIBBITCOIN_CLI) \
457457
$(LIBUNIVALUE) \
458458
$(LIBBITCOIN_UTIL) \
459-
$(LIBBITCOIN_CRYPTO) \
460-
$(LIBBITCOIN_CRYPTO_SSE41) \
461-
$(LIBBITCOIN_CRYPTO_AVX2)
459+
$(LIBBITCOIN_CRYPTO)
462460

463461
bitcoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS)
464462
#
@@ -479,8 +477,6 @@ bitcoin_tx_LDADD = \
479477
$(LIBBITCOIN_UTIL) \
480478
$(LIBBITCOIN_CONSENSUS) \
481479
$(LIBBITCOIN_CRYPTO) \
482-
$(LIBBITCOIN_CRYPTO_SSE41) \
483-
$(LIBBITCOIN_CRYPTO_AVX2) \
484480
$(LIBSECP256K1)
485481

486482
bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
@@ -489,7 +485,7 @@ bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
489485
# bitcoinconsensus library #
490486
if BUILD_BITCOIN_LIBS
491487
include_HEADERS = script/bitcoinconsensus.h
492-
libbitcoinconsensus_la_SOURCES = $(crypto_libbitcoin_crypto_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
488+
libbitcoinconsensus_la_SOURCES = $(crypto_libbitcoin_crypto_base_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
493489

494490
if GLIBC_BACK_COMPAT
495491
libbitcoinconsensus_la_SOURCES += compat/glibc_compat.cpp

‎src/Makefile.bench.include

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ bench_bench_bitcoin_LDADD = \
3939
$(LIBBITCOIN_UTIL) \
4040
$(LIBBITCOIN_CONSENSUS) \
4141
$(LIBBITCOIN_CRYPTO) \
42-
$(LIBBITCOIN_CRYPTO_SSE41) \
43-
$(LIBBITCOIN_CRYPTO_AVX2) \
4442
$(LIBLEVELDB) \
4543
$(LIBLEVELDB_SSE42) \
4644
$(LIBMEMENV) \

‎src/Makefile.qt.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ endif
408408
if ENABLE_ZMQ
409409
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
410410
endif
411-
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_CRYPTO_SSE41) $(LIBBITCOIN_CRYPTO_AVX2) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
411+
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
412412
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
413413
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
414414
qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

‎src/Makefile.qttest.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ endif
6262
if ENABLE_ZMQ
6363
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
6464
endif
65-
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_CRYPTO_SSE41) $(LIBBITCOIN_CRYPTO_AVX2) $(LIBUNIVALUE) $(LIBLEVELDB) \
65+
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
6666
$(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
6767
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
6868
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)

‎src/Makefile.test.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ if ENABLE_WALLET
110110
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
111111
endif
112112

113-
test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_CRYPTO_SSE41) $(LIBBITCOIN_CRYPTO_AVX2) $(LIBUNIVALUE) \
113+
test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \
114114
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
115115
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
116116

0 commit comments

Comments
 (0)