Sync BLAKE3

fcharlie · Dec 31, 2023 · 7ea4348 · 7ea4348
1 parent ce03f29
commit 7ea4348
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/belahash/blake3.lock b/src/belahash/blake3.lock
@@ -1,2 +1,2 @@
 https://github.com/BLAKE3-team/BLAKE3
-12823b87604cbb7bcd0e5cdc347a53f80b2a617c
+4d32708f511fd85c6b0fb131295cc73224246738
diff --git a/src/belahash/blake3/blake3.h b/src/belahash/blake3/blake3.h
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#define BLAKE3_VERSION_STRING "1.4.1"
+#define BLAKE3_VERSION_STRING "1.5.0"
 #define BLAKE3_KEY_LEN 32
 #define BLAKE3_OUT_LEN 32
 #define BLAKE3_BLOCK_LEN 64

diff --git a/src/belahash/blake3/blake3_dispatch.c b/src/belahash/blake3/blake3_dispatch.c
@@ -32,9 +32,9 @@
 #define ATOMIC_LOAD(x) x
 #define ATOMIC_STORE(x, y) x = y
 #elif defined(_MSC_VER)
-#define ATOMIC_INT long
-#define ATOMIC_LOAD(x) _InterlockedOr(&x, 0)
-#define ATOMIC_STORE(x, y) _InterlockedExchange(&x, y)
+#define ATOMIC_INT LONG
+#define ATOMIC_LOAD(x) InterlockedOr(&x, 0)
+#define ATOMIC_STORE(x, y) InterlockedExchange(&x, y)
 #else
 #define ATOMIC_INT int
 #define ATOMIC_LOAD(x) x

diff --git a/src/belahash/blake3/blake3_impl.h b/src/belahash/blake3/blake3_impl.h
@@ -51,7 +51,11 @@ enum blake3_flags {
 #if !defined(BLAKE3_USE_NEON) 
   // If BLAKE3_USE_NEON not manually set, autodetect based on AArch64ness
   #if defined(IS_AARCH64)
-    #define BLAKE3_USE_NEON 1
+    #if defined(__ARM_BIG_ENDIAN)
+      #define BLAKE3_USE_NEON 0
+    #else
+      #define BLAKE3_USE_NEON 1
+    #endif
   #else
     #define BLAKE3_USE_NEON 0
   #endif