diff options
| author | merge-script <fanquake@gmail.com> | 2024-07-17 16:58:54 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-07-17 16:58:54 +0100 |
| commit | 3679fa167f7d198d9287f05f210f03e83b76f3b8 (patch) | |
| tree | 4c421f1fe94fba7c5f0ca7ce7b68a7ed8edd36f3 /src/wallet/coincontrol.h | |
| parent | 5f5862f3820a7618522970e32d4011a57a5cc87b (diff) | |
| parent | d440f13db02c82c842000abe4fe4d0c721a4ad3b (diff) | |
Merge bitcoin/bitcoin#28893: Fix SSE4.1-related issues
d440f13db02c82c842000abe4fe4d0c721a4ad3b crypto: Guard code with `ENABLE_SSE41` macro (Hennadii Stepanov)
6ec1ca7c85a4009b77e149a798a331592b96ea42 build: Fix test for SSE4.1 intrinsics (Hennadii Stepanov)
Pull request description:
1. Fix the test for SSE4.1 intrinsics during build system configuration, which currently can be false positive, for example, when `CXXFLAGS="-mno-sse4.1"` provided.
This PR fixes the test by adding the `_mm_blend_epi16` SSE4.1 function used in our codebase.
2. Guard `sha_x86_shani.cpp` code with `ENABLE_SSE41` macro as it uses the `_mm_blend_epi16` function from
the SSE4.1 instruction set.
It is possible that SHA-NI is enabled even when SSE4.1 is disabled, which causes compile errors in the master branch.
Closes https://github.com/bitcoin/bitcoin/issues/28864.
ACKs for top commit:
sipa:
utACK d440f13db02c82c842000abe4fe4d0c721a4ad3b
willcl-ark:
tACK d440f13db02c82c842000abe4fe4d0c721a4ad3b
theuni:
utACK d440f13db02c82c842000abe4fe4d0c721a4ad3b
Tree-SHA512: a6e1e8c94e1b94874ff51846815ef445e6135cbdb01b08eb695b3548115f2340dd835ebe53673ae46a553fe6be4815e68d8642c34235dd7af5106c4b7c9ea6f3
Diffstat (limited to 'src/wallet/coincontrol.h')
0 files changed, 0 insertions, 0 deletions