Alexandre Julliard : ntdll: Always fetch the %fs register from the thread data.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 508b8b72797aadb0183d9c58698e7be00b9890b1
URL:    https://gitlab.winehq.org/wine/wine/-/commit/508b8b72797aadb0183d9c58698e7be...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Sep 11 11:18:14 2023 +0200

ntdll: Always fetch the %fs register from the thread data.

---

 dlls/ntdll/unix/signal_x86_64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 0204139631f..e43d84cfe2c 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2734,7 +2734,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
 #ifdef __linux__
                    "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
                    "jz 1f\n\t"
-                   "movw 0x7e(%rcx),%fs\n"
+                   "movw %gs:0x338,%fs\n"          /* amd64_thread_data()->fs */
                    "1:\n\t"
 #endif
                    "testl $0x48,%edx\n\t"          /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */
@@ -2919,7 +2919,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher,
 #ifdef __linux__
                    "testl $12,%r14d\n\t"           /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */
                    "jz 1f\n\t"
-                   "movw 0x7e(%rcx),%fs\n"
+                   "movw %gs:0x338,%fs\n"          /* amd64_thread_data()->fs */
                    "1:\n\t"
 #endif
                    "movq 0x60(%rcx),%r14\n\t"