From 74ba5cf885448b4878a674a63506f62dadc1dcc0 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Fri, 28 Jun 2024 12:10:02 -0700
Subject: [PATCH] blake3: fix Windows ARM64 build and detect ARM64EC as ARM64

Cherry-picked upstream 0816badf3ada3ec48e712dd4f4cbc2cd60828278

Reviewed-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29971>
---
 src/util/blake3/blake3_dispatch.c | 5 ++++-
 src/util/blake3/blake3_impl.h     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/util/blake3/blake3_dispatch.c b/src/util/blake3/blake3_dispatch.c
index af6c3dadc7b..c9abc13fdc4 100644
--- a/src/util/blake3/blake3_dispatch.c
+++ b/src/util/blake3/blake3_dispatch.c
@@ -4,9 +4,12 @@
 
 #include "blake3_impl.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>
diff --git a/src/util/blake3/blake3_impl.h b/src/util/blake3/blake3_impl.h
index beab5cf53c6..94bbc91784f 100644
--- a/src/util/blake3/blake3_impl.h
+++ b/src/util/blake3/blake3_impl.h
@@ -28,7 +28,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
@@ -38,7 +38,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