Skip to content

Commit

Permalink
Merge #24262: upstream: Update minisketch subtree
Browse files Browse the repository at this point in the history
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 sipa/minisketch#58.

ACKs for top commit:
  MarcoFalke:
    cr ACK 4382d09

Tree-SHA512: 8dbb2d8a4269e187987a9e6084c6265ed8256859b0776474c2d332df64427cd55608932e1e2053dcc3d8d1699a82c667afae20c3db7a35407bea662ada65a5f7
  • Loading branch information
MarcoFalke committed Feb 4, 2022
2 parents a5edd19 + 4382d09 commit b2a8371
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/minisketch/src/minisketch.cpp
Expand Up @@ -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);
Expand All @@ -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)
{
Expand Down

0 comments on commit b2a8371

Please sign in to comment.