(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 fd581163bca3666ae16550b282932a5ccbb8474f..cdbf8b957ce2aaee20a4bbe28e4dc4cb27629ecd 100644 (file)
--- 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 c0e950bbd9806f66d61bb8c391489544965fa012..9c96ed19e1facff59be145997c6c010208e8bec7 100644 (file)
--- 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 694a6b9ea2915ef474a360cbcff7f616b0db7780..676491c04d943c2414d1346c07d673926273081f 100644 (file)
--- 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 25d4ce5c9702eabfdd6cf05835ba48c04fc94d1f..32cd3a57fdeef2b0b93cd6399f3c990b5b7880bf 100644 (file)
--- 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 c44a1c62c644e4fc2a6a7256fd60496a3b5030aa..beab8ed90561c6b8b0eecfcb5c09ace7f6831d85 100644 (file)
--- 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 62ef9dd92a78785a5b85dc42ab420f298a9d450f..25e8557cdfd736d7b0cb7b49d8a25c71d8b3d572 100644 (file)
--- 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 396950156f0f7873794165ec8b24413c178ee2d8..db22f3e6ee0199f652fec752fcce1e66643c056d 100644 (file)
--- 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 fef2d6994b9b2658728108d290ee470983aafb63..333a27bbb184a78bb2f46c2855de460cb511914c 100644 (file)
--- 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 14817771b726356d900fc979802438d3c40dc203..791cc363a7cbafe9bd189f77024cd53e16a48787 100644 (file)
--- 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 c458756875d40985341e19001568d39511ba273c..423e61e3baaab1c0008c155368bddd533c67d719 100644 (file)
--- 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 b675e0103c02eed2c9c61f478c14c30cd9e11e01..82d7df4ab1b53fdbc5a44842b555a9042e05863e 100644 (file)
--- 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 aa616a68056ab777358367490d91a907b32bfac6..e198eb81415133d1f782e704d4a79cb9c7d67f5e 100644 (file)
--- 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 13e651adc0a423a95b003f9ed9323b5cb2fa502a..c76b394688d7722c64781be1c05fdb9c67a635c9 100644 (file)
--- 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 ae123b60915bf757785345c2a9868801a439a601..2defb512b5537c939005ecaf2fa90c70993b3149 100644 (file)
--- 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"