Rebase against 619e34500fc43f1103fddd91e86d581660d2ae4b.

patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch

@@ -1,4 +1,4 @@
-From a53a38937f258294b4c98b3de57f8734158f5b6b Mon Sep 17 00:00:00 2001
+From a20d7bb78dc0d2d134cfe6461c117fea1a5753ed 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,10 +9,10 @@ Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
  2 files changed, 186 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index db7753959d7..08dd970506e 100644
+index a8c1d1522fe..2fd9f7a497d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -445,6 +445,7 @@ AC_CHECK_HEADERS(\
+@@ -427,6 +427,7 @@ AC_CHECK_HEADERS(\
  	linux/ioctl.h \
  	linux/major.h \
  	linux/param.h \
@@ -21,7 +21,7 @@ index db7753959d7..08dd970506e 100644
  	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 c726b962074..ae985625e50 100644
+index bf528226462..a5cd26b7ea0 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
 @@ -27,6 +27,7 @@
@@ -53,10 +53,10 @@ index c726b962074..ae985625e50 100644
 +# include <linux/audit.h>
 +#endif
 +
- #define NONAMELESSUNION
- #define NONAMELESSSTRUCT
  #include "ntstatus.h"
-@@ -1807,6 +1818,179 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+ #define WIN32_NO_STATUS
+ #include "windef.h"
+@@ -1821,6 +1832,179 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
      return 0;
  }
  
@@ -236,7 +236,7 @@ index c726b962074..ae985625e50 100644
  
  /***********************************************************************
   *           handle_interrupt
-@@ -2479,6 +2663,7 @@ void signal_init_process(void)
+@@ -2520,6 +2704,7 @@ 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;
@@ -245,5 +245,5 @@ index c726b962074..ae985625e50 100644
  
   error:
 -- 
-2.38.1
+2.40.1
 

staging/upstream-commit

@@ -1 +1 @@
-a500bb72f05058c985511ff35f191565f45cd6c0
+619e34500fc43f1103fddd91e86d581660d2ae4b