Rebase against e956c4ec71dd0f41090df3863e6f937963b2b7d9.

This commit is contained in:
Elizabeth Figura
2025-04-02 18:32:00 -05:00
parent e1b2c45272
commit 8924ee42d8
12 changed files with 47 additions and 263 deletions

View File

@@ -1,4 +1,4 @@
From fd1785fead39ea0aecaaf4b02b8b62f1b0006332 Mon Sep 17 00:00:00 2001
From e941585d942942f7b97b73ae24b9a0a486a855e4 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.
@@ -21,7 +21,7 @@ index 8192c067e4c..d4abbdb3f37 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 26b540bd629..45add085205 100644
index fb5259d8714..93020158d0b 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -27,6 +27,7 @@
@@ -41,8 +41,8 @@ index 26b540bd629..45add085205 100644
#include <unistd.h>
#ifdef HAVE_MACHINE_SYSARCH_H
# include <machine/sysarch.h>
@@ -65,6 +68,14 @@
# include <mach/mach.h>
@@ -73,6 +76,14 @@
extern void _thread_set_tsd_base(uint64_t);
#endif
+#if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_PRCTL_H)
@@ -56,7 +56,7 @@ index 26b540bd629..45add085205 100644
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
@@ -1824,6 +1835,194 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
@@ -1857,6 +1868,194 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
return 0;
}
@@ -251,7 +251,7 @@ index 26b540bd629..45add085205 100644
/***********************************************************************
* handle_interrupt
@@ -2572,10 +2771,14 @@ void signal_init_process(void)
@@ -2567,10 +2766,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;