Merge 7973cc5a37 into 0816badf3a

fix Windows ARM64 build and detect ARM64EC as ARM64
2024-05-20 10:06:08 +02:00 · 2024-04-24 13:23:30 +03:00 · 2024-04-07 11:48:02 -04:00
2 changed files with 6 additions and 3 deletions
--- a/c/blake3_dispatch.c
+++ b/c/blake3_dispatch.c
@ -6,9 +6,12 @@
 #include "blake3_impl.h"
 #include "blake3_thread.h"

-#if defined(IS_X86)
 #if defined(_MSC_VER)
 #include <Windows.h>
+#endif
+
+#if defined(IS_X86)
+#if defined(_MSC_VER)
 #include <intrin.h>
 #elif defined(__GNUC__)
 #include <immintrin.h>
--- a/c/blake3_impl.h
+++ b/c/blake3_impl.h
@ -29,7 +29,7 @@ enum blake3_flags {
 #define INLINE static inline __attribute__((always_inline))
 #endif

-#if defined(__x86_64__) || defined(_M_X64) 
+#if (defined(__x86_64__) || defined(_M_X64)) && !defined(_M_ARM64EC)
 #define IS_X86
 #define IS_X86_64
 #endif
@ -39,7 +39,7 @@ enum blake3_flags {
 #define IS_X86_32
 #endif

-#if defined(__aarch64__) || defined(_M_ARM64)
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #define IS_AARCH64
 #endif
Author	SHA1	Message	Date
Pantelis Antoniou	a0470de252	Merge `7973cc5a37` into `0816badf3a`	2024-04-24 13:23:30 +03:00
Javier Blazquez	0816badf3a	fix Windows ARM64 build and detect ARM64EC as ARM64	2024-04-07 11:48:02 -04:00