[PATCH v4 0/1] MR9768: include: Disable compiler exceptions for ARM64EC MSVC targets before Clang 21

[André Zwing]

Alternative to !9762 as suggested by Jacek

--
  v4: include: Disable compiler exceptions for ARM64EC MSVC targets before Clang 21
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9768

[PATCH v4 1/1] include: Disable compiler exceptions for ARM64EC MSVC targets before Clang 21

[André Zwing]

From: André Zwing <[e-mail]>

---
 include/excpt.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/excpt.h b/include/excpt.h
index 17c7409c636..f32977bc919 100644
--- a/include/excpt.h
+++ b/include/excpt.h
@@ -37,10 +37,14 @@ typedef enum _EXCEPTION_DISPOSITION
 #define EXCEPTION_CONTINUE_SEARCH        0
 #define EXCEPTION_CONTINUE_EXECUTION    -1
 
-
-#if !defined(USE_COMPILER_EXCEPTIONS) && defined(_MSC_VER) && !defined(__i386__) && !defined(__arm__) && (!defined(__clang_major__) || __clang_major__ >= 19)
+#if !defined(USE_COMPILER_EXCEPTIONS) && defined(_MSC_VER)
+#if !defined(__clang_major__) || \
+    (defined(__x86_64__) && !defined(__arm64ec__) && __clang_major__ >= 19) || \
+    (defined(__aarch64__) && !defined(__arm64ec__) && __clang_major__ >= 19) || \
+    (defined(__arm64ec__) && __clang_major__ >= 21)
 #define USE_COMPILER_EXCEPTIONS
 #endif
+#endif
 
 #ifdef USE_COMPILER_EXCEPTIONS
 #define GetExceptionCode    _exception_code
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9768

[Jacek Caban (＠jacek)]

Jacek Caban (@jacek) commented about include/excpt.h:
> #define EXCEPTION_CONTINUE_SEARCH        0
>  #define EXCEPTION_CONTINUE_EXECUTION    -1
>
> -
> -#if !defined(USE_COMPILER_EXCEPTIONS) && defined(_MSC_VER) && !defined(__i386__) && !defined(__arm__) && (!defined(__clang_major__) || __clang_major__ >= 19)
> +#if !defined(USE_COMPILER_EXCEPTIONS) && defined(_MSC_VER)
> +#if !defined(__clang_major__) || \
> +    (defined(__x86_64__) && !defined(__arm64ec__) && __clang_major__ >= 19) || \
> +    (defined(__aarch64__) && !defined(__arm64ec__) && __clang_major__ >= 19) || \
> ARM64EC target doesn't define `__aarch64__` anyway.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9768#note_126064