highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-15 19:31:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24262: upstream: Update minisketch subtree

Browse Source 
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
This commit is contained in:
MarcoFalke 2022-02-04 16:28:26 +01:00
commit b2a8371913
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/minisketch/src/minisketch.cpp
View File

@ -63,9 +63,9 @@ enum class FieldImpl {
#endif #endif
}; };
#ifdef HAVE_CLMUL
static inline bool EnableClmul() static inline bool EnableClmul()
{ {
#ifdef HAVE_CLMUL
#ifdef _MSC_VER #ifdef _MSC_VER
int regs[4]; int regs[4];
__cpuid(regs, 1); __cpuid(regs, 1);
@ -74,10 +74,8 @@ static inline bool EnableClmul()
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2)); return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2));
#endif #endif
#else
return false;
#endif
} }
#endif
Sketch* Construct(int bits, int impl) Sketch* Construct(int bits, int impl)
{ {