From 0394bb10be5bd7c7f80b6a36a3a6df05101be4d7 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 2 Sep 2025 07:45:17 +1000
Subject: [PATCH] Rebase against a3385359f06e291a46364381b2a4ddea81d7cc45.

---
 ...-ntdll-Support-x86_64-syscall-emulation.patch | 16 ++++++++--------
 staging/upstream-commit                          |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch b/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
index 49f96741..5e8fcb6c 100644
--- a/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
+++ b/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
@@ -1,4 +1,4 @@
-From e941585d942942f7b97b73ae24b9a0a486a855e4 Mon Sep 17 00:00:00 2001
+From fb6f79e3b34c0798cebe330a15a64363172fe898 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 14 Jul 2020 15:00:34 +0300
 Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
@@ -9,19 +9,19 @@ Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
  2 files changed, 204 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 8192c067e4c..d4abbdb3f37 100644
+index 751e6acda99..67b432faca8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -391,6 +391,7 @@ AC_CHECK_HEADERS(\
- 	linux/ioctl.h \
+@@ -684,6 +684,7 @@ AC_CHECK_HEADERS(\
  	linux/major.h \
+ 	linux/ntsync.h \
  	linux/param.h \
 +	linux/seccomp.h \
  	linux/serial.h \
  	linux/types.h \
  	linux/ucdrom.h \
 diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
-index fb5259d8714..93020158d0b 100644
+index f55726801c7..a6be9f9aab4 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
 @@ -27,6 +27,7 @@
@@ -56,7 +56,7 @@ index fb5259d8714..93020158d0b 100644
  #include "ntstatus.h"
  #define WIN32_NO_STATUS
  #include "windef.h"
-@@ -1857,6 +1868,194 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+@@ -1897,6 +1908,194 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
      return 0;
  }
  
@@ -251,7 +251,7 @@ index fb5259d8714..93020158d0b 100644
  
  /***********************************************************************
   *           handle_interrupt
-@@ -2567,10 +2766,14 @@ void signal_init_process(void)
+@@ -2686,10 +2885,14 @@ void signal_init_process(void)
      if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error;
@@ -267,5 +267,5 @@ index fb5259d8714..93020158d0b 100644
  
   error:
 -- 
-2.47.2
+2.50.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index ecef5d9d..9b59e387 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-1d1e5fb3e51b2acb0143e86c16463dfed1bc90aa
+a3385359f06e291a46364381b2a4ddea81d7cc45