Skip to content

Commit b2a8371

Browse files
author
MarcoFalke
committed
Merge bitcoin#24262: upstream: Update minisketch subtree
8fcb19f 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 bitcoin-core/minisketch#58. ACKs for top commit: MarcoFalke: cr ACK 4382d09 Tree-SHA512: 8dbb2d8a4269e187987a9e6084c6265ed8256859b0776474c2d332df64427cd55608932e1e2053dcc3d8d1699a82c667afae20c3db7a35407bea662ada65a5f7
2 parents a5edd19 + 4382d09 commit b2a8371

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/minisketch/src/minisketch.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ enum class FieldImpl {
6363
#endif
6464
};
6565

66+
#ifdef HAVE_CLMUL
6667
static inline bool EnableClmul()
6768
{
68-
#ifdef HAVE_CLMUL
6969
#ifdef _MSC_VER
7070
int regs[4];
7171
__cpuid(regs, 1);
@@ -74,10 +74,8 @@ static inline bool EnableClmul()
7474
uint32_t eax, ebx, ecx, edx;
7575
return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2));
7676
#endif
77-
#else
78-
return false;
79-
#endif
8077
}
78+
#endif
8179

8280
Sketch* Construct(int bits, int impl)
8381
{

0 commit comments

Comments
 (0)