From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 28 Nov 2023 07:33:08 +0000 (+0100)
Subject: (really) Bug 477630 - Include ucontext.h rather than sys/ucontext.h in Solaris sources
X-Git-Tag: VALGRIND_3_23_0~235
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56a331352cc1d6b2926f75a362f4cee48f5b58d7;p=thirdparty%2Fvalgrind.git

(really) Bug 477630 - Include ucontext.h rather than sys/ucontext.h in Solaris sources

Mixed up my patches and the previous commit should have been
Bug 477628 - Add mremap support for Solaris

Patch provided by
   Jakub Kulik kulikjak@gmail.com
---

diff --git a/NEWS b/NEWS
index fd581163bc..cdbf8b957c 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,7 @@ are not entered into bugzilla tend to get forgotten about or ignored.
 476787  Build of Valgrind 3.21.0 fails when SOLARIS_PT_SUNDWTRACE_THRP is
         defined
 476887  WARNING: unhandled amd64-freebsd syscall: 578
+477628  Add mremap support for Solaris
 477630  Include ucontext.h rather than sys/ucontext.h in Solaris sources
 
 To see details of a given bug, visit
diff --git a/include/vki/vki-solaris.h b/include/vki/vki-solaris.h
index c0e950bbd9..9c96ed19e1 100644
--- a/include/vki/vki-solaris.h
+++ b/include/vki/vki-solaris.h
@@ -1387,9 +1387,9 @@ typedef struct sigaction vki_sigaction_fromK_t;
 #define vki_sgttyb sgttyb
 
 
-#include <sys/ucontext.h>
+#include <ucontext.h>
 /* This section also contains items defined in sys/regset.h, this file
-   is directly included in sys/ucontext.h. */
+   is directly included in ucontext.h. */
 #if defined(VGP_x86_solaris)
 #define VKI_SS SS
 #define VKI_UESP UESP
diff --git a/memcheck/tests/amd64-solaris/context_fpu.c b/memcheck/tests/amd64-solaris/context_fpu.c
index 694a6b9ea2..676491c04d 100644
--- a/memcheck/tests/amd64-solaris/context_fpu.c
+++ b/memcheck/tests/amd64-solaris/context_fpu.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 static siginfo_t si;
 static ucontext_t uc;
diff --git a/memcheck/tests/amd64-solaris/context_gpr.c b/memcheck/tests/amd64-solaris/context_gpr.c
index 25d4ce5c97..32cd3a57fd 100644
--- a/memcheck/tests/amd64-solaris/context_gpr.c
+++ b/memcheck/tests/amd64-solaris/context_gpr.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 static siginfo_t si;
 static ucontext_t uc;
diff --git a/memcheck/tests/amd64-solaris/context_rflags.c b/memcheck/tests/amd64-solaris/context_rflags.c
index c44a1c62c6..beab8ed905 100644
--- a/memcheck/tests/amd64-solaris/context_rflags.c
+++ b/memcheck/tests/amd64-solaris/context_rflags.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #define OBIT(rflags) (!!((rflags) & (1 << 11)))
 #define SBIT(rflags) (!!((rflags) & (1 << 7)))
diff --git a/memcheck/tests/amd64-solaris/context_rflags2.c b/memcheck/tests/amd64-solaris/context_rflags2.c
index 62ef9dd92a..25e8557cdf 100644
--- a/memcheck/tests/amd64-solaris/context_rflags2.c
+++ b/memcheck/tests/amd64-solaris/context_rflags2.c
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #define OBIT(rflags) (!!((rflags) & (1 << 11)))
 #define SBIT(rflags) (!!((rflags) & (1 << 7)))
diff --git a/memcheck/tests/amd64-solaris/context_sse.c b/memcheck/tests/amd64-solaris/context_sse.c
index 396950156f..db22f3e6ee 100644
--- a/memcheck/tests/amd64-solaris/context_sse.c
+++ b/memcheck/tests/amd64-solaris/context_sse.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #include "config.h"
 
diff --git a/memcheck/tests/solaris/scalar.c b/memcheck/tests/solaris/scalar.c
index fef2d6994b..333a27bbb1 100644
--- a/memcheck/tests/solaris/scalar.c
+++ b/memcheck/tests/solaris/scalar.c
@@ -24,7 +24,7 @@
 #include <sys/sendfile.h>
 #include <sys/shm_impl.h>
 #include <sys/termios.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 #include <sys/utsname.h>
 #include <sys/tsol/tndb.h>
 #include <sys/tsol/tsyscall.h>
diff --git a/memcheck/tests/solaris/thr_daemon_exit_standalone.c b/memcheck/tests/solaris/thr_daemon_exit_standalone.c
index 14817771b7..791cc363a7 100644
--- a/memcheck/tests/solaris/thr_daemon_exit_standalone.c
+++ b/memcheck/tests/solaris/thr_daemon_exit_standalone.c
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #if defined(__amd64) || defined(__i386)
 #include <sys/segments.h>
diff --git a/memcheck/tests/x86-solaris/context_eflags.c b/memcheck/tests/x86-solaris/context_eflags.c
index c458756875..423e61e3ba 100644
--- a/memcheck/tests/x86-solaris/context_eflags.c
+++ b/memcheck/tests/x86-solaris/context_eflags.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #define OBIT(eflags) (!!((eflags) & (1 << 11)))
 #define SBIT(eflags) (!!((eflags) & (1 << 7)))
diff --git a/memcheck/tests/x86-solaris/context_eflags2.c b/memcheck/tests/x86-solaris/context_eflags2.c
index b675e0103c..82d7df4ab1 100644
--- a/memcheck/tests/x86-solaris/context_eflags2.c
+++ b/memcheck/tests/x86-solaris/context_eflags2.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #define OBIT(eflags) (!!((eflags) & (1 << 11)))
 #define SBIT(eflags) (!!((eflags) & (1 << 7)))
diff --git a/memcheck/tests/x86-solaris/context_fpu.c b/memcheck/tests/x86-solaris/context_fpu.c
index aa616a6805..e198eb8141 100644
--- a/memcheck/tests/x86-solaris/context_fpu.c
+++ b/memcheck/tests/x86-solaris/context_fpu.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 static siginfo_t si;
 static ucontext_t uc;
diff --git a/memcheck/tests/x86-solaris/context_gpr.c b/memcheck/tests/x86-solaris/context_gpr.c
index 13e651adc0..c76b394688 100644
--- a/memcheck/tests/x86-solaris/context_gpr.c
+++ b/memcheck/tests/x86-solaris/context_gpr.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <sys/regset.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 static siginfo_t si;
 static ucontext_t uc;
diff --git a/memcheck/tests/x86-solaris/context_sse.c b/memcheck/tests/x86-solaris/context_sse.c
index ae123b6091..2defb512b5 100644
--- a/memcheck/tests/x86-solaris/context_sse.c
+++ b/memcheck/tests/x86-solaris/context_sse.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include <sys/ucontext.h>
+#include <ucontext.h>
 
 #include "config.h"