Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crypto: cleanup sha256 build #13408

Merged
merged 1 commit into from Jun 11, 2018

Conversation

Projects
None yet
6 participants
@theuni
Copy link
Member

theuni commented Jun 6, 2018

Requested by @sipa in #13386.

Rather than appending all possible cpu variants to all targets, create a convenience variable that encompasses all.

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

LIBBITCOIN_CRYPTO= $(LIBBITCOIN_CRYPTO_BASE)
if ENABLE_SSE41
LIBBITCOIN_CRYPTO_SSE41 = crypto/libbitcoin_crypto_sse41.a

This comment has been minimized.

@Empact

Empact Jun 6, 2018

Member

Given this and LIBBITCOIN_CRYPTO_AVX2 aren't referenced elsewhere, they could be inlined.

This comment has been minimized.

@theuni

theuni Jun 6, 2018

Author Member

Sure, but I'd prefer to stick with our convention of naming everything for easier re-use down the road.

crypto: cleanup sha256 build
Rather than appending all possible cpu variants to all targets, create a
convenience variable that encompasses all.

@theuni theuni force-pushed the theuni:sha2-cleanup branch from 1d86e17 to f68049d Jun 6, 2018

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Jun 7, 2018

utACK f68049d

@DrahtBot

This comment has been minimized.

Copy link
Contributor

DrahtBot commented Jun 7, 2018

Note to reviewers: This pull request conflicts with the following ones:
  • #13386 (SHA256 implementations based on Intel SHA Extensions by sipa)
  • #13203 (Add POWER8 ASM for 4-way SHA256 by TheBlueMatt)
  • #12788 ([build] Tune wildcards for LIBSECP256K1 target by kallewoof)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@sipa

This comment has been minimized.

Copy link
Member

sipa commented Jun 7, 2018

utACK f68049d

@laanwj laanwj merged commit f68049d into bitcoin:master Jun 11, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jun 11, 2018

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.