[PATCH 0/1] MR6967: include: Use inline assembly on Clang MSVC mode in exception helpers.

[Jacek Caban (＠jacek)]

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

[PATCH 1/1] include: Use inline assembly on Clang MSVC mode in exception helpers.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 include/wine/exception.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/wine/exception.h b/include/wine/exception.h
index 8c91e02e17e..25c6f2af16d 100644
--- a/include/wine/exception.h
+++ b/include/wine/exception.h
@@ -251,7 +251,7 @@ typedef struct __tagWINE_FRAME
 
 static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame )
 {
-#if defined(__GNUC__) && defined(__i386__)
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)
     EXCEPTION_REGISTRATION_RECORD *prev;
     __asm__ __volatile__("movl %%fs:0,%0"
                          "\n\tmovl %0,(%1)"
@@ -268,7 +268,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGIST
 
 static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame )
 {
-#if defined(__GNUC__) && defined(__i386__)
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)
     __asm__ __volatile__("movl %0,%%fs:0"
                          : : "r" (frame->Prev) : "memory" );
     return frame->Prev;
@@ -282,7 +282,7 @@ static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTR
 
 static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void)
 {
-#if defined(__GNUC__) && defined(__i386__)
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__)
     EXCEPTION_REGISTRATION_RECORD *ret;
     __asm__ __volatile__("movl %%fs:0,%0" : "=r" (ret) );
     return ret;
-- 
GitLab

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

[PATCH 1/1] include: Use inline assembly on Clang MSVC mode in exception helpers.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=150255

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000009C0108, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032