diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-02-04 16:28:26 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-02-04 16:28:29 +0100 |
| commit | b2a8371913a85701759b5a2d59d46e15f28ba68f (patch) | |
| tree | c7d36991f441a765db6f301c81d3b6ebc75838f1 | |
| parent | a5edd191be93aff8f9c0f60f04e711e2e78ecc77 (diff) | |
| parent | 4382d098964c4eee09505d74eac9e2d05b2945ce (diff) | |
Merge bitcoin/bitcoin#24262: upstream: Update minisketch subtree
8fcb19fb47ae4629f40cd7ef04b5993855ddb462 Squashed 'src/minisketch/' changes from 89629eb2c7..7eeb778fef (fanquake)
Pull request description:
Marco mentioned issues running the native valgrind job (it sets `-Werror`) on arm64 hardware due to compile errors:
```bash
minisketch/src/minisketch.cpp:66:20: error: unused function 'EnableClmul' [-Werror,-Wunused-function]
```
Pull the subtree to fix this. The only change here is https://github.com/sipa/minisketch/pull/58.
ACKs for top commit:
MarcoFalke:
cr ACK 4382d098964c4eee09505d74eac9e2d05b2945ce
Tree-SHA512: 8dbb2d8a4269e187987a9e6084c6265ed8256859b0776474c2d332df64427cd55608932e1e2053dcc3d8d1699a82c667afae20c3db7a35407bea662ada65a5f7
| -rw-r--r-- | src/minisketch/src/minisketch.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/minisketch/src/minisketch.cpp b/src/minisketch/src/minisketch.cpp index e9a322f139..d003fdf755 100644 --- a/src/minisketch/src/minisketch.cpp +++ b/src/minisketch/src/minisketch.cpp @@ -63,9 +63,9 @@ enum class FieldImpl { #endif }; +#ifdef HAVE_CLMUL static inline bool EnableClmul() { -#ifdef HAVE_CLMUL #ifdef _MSC_VER int regs[4]; __cpuid(regs, 1); @@ -74,10 +74,8 @@ static inline bool EnableClmul() uint32_t eax, ebx, ecx, edx; return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2)); #endif -#else - return false; -#endif } +#endif Sketch* Construct(int bits, int impl) { |