Add new header definitions from Linux 4.4 (plus older ptrace definitions).

This patch adds some new header definitions from Linux 4.4:

* MCL_ONFAULT is added to bits/mman.h / bits/mman-linux.h (this was
  already done for hppa).

* PTRACE_SECCOMP_GET_FILTER is added to sys/ptrace.h.  Along with it,
  the older PTRACE_GETSIGMASK and PTRACE_SETSIGMASK, added in Linux
  3.11 but missed at the time, are also added.

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	* bits/mman-linux.h [!MCL_CURRENT] (MCL_ONFAULT): New macro.
	* sysdeps/unix/sysv/linux/alpha/bits/mman.h (MCL_ONFAULT):
	Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/mman.h (MCL_ONFAULT):
	Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/mman.h (MCL_ONFAULT):
	Likewise.
	* sysdeps/unix/sysv/linux/sys/ptrace.h (PTRACE_GETSIGMASK): New
	enum constant and macro.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.
	* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
	(PTRACE_GETSIGMASK): Likewise.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.
	* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (PTRACE_GETSIGMASK):
	Likewise.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
	(PTRACE_GETSIGMASK): Likewise.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.
	* sysdeps/unix/sysv/linux/s390/sys/ptrace.h (PTRACE_GETSIGMASK):
	Likewise.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h (PTRACE_GETSIGMASK):
	Likewise.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.
	* sysdeps/unix/sysv/linux/tile/sys/ptrace.h (PTRACE_GETSIGMASK):
	Likewise.
	(PTRACE_SETSIGMASK): Likewise.
	(PTRACE_SECCOMP_GET_FILTER): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 08a05bfb7d05e085a006afef8f3e887e15a5ca75..6322a675a3448cffbe28bb6a47514bfb35603494 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2016-01-12  Joseph Myers  <joseph@codesourcery.com>
+
+       * bits/mman-linux.h [!MCL_CURRENT] (MCL_ONFAULT): New macro.
+       * sysdeps/unix/sysv/linux/alpha/bits/mman.h (MCL_ONFAULT):
+       Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/mman.h (MCL_ONFAULT):
+       Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/mman.h (MCL_ONFAULT):
+       Likewise.
+       * sysdeps/unix/sysv/linux/sys/ptrace.h (PTRACE_GETSIGMASK): New
+       enum constant and macro.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+       * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
+       (PTRACE_GETSIGMASK): Likewise.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+       * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (PTRACE_GETSIGMASK):
+       Likewise.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
+       (PTRACE_GETSIGMASK): Likewise.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+       * sysdeps/unix/sysv/linux/s390/sys/ptrace.h (PTRACE_GETSIGMASK):
+       Likewise.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h (PTRACE_GETSIGMASK):
+       Likewise.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+       * sysdeps/unix/sysv/linux/tile/sys/ptrace.h (PTRACE_GETSIGMASK):
+       Likewise.
+       (PTRACE_SETSIGMASK): Likewise.
+       (PTRACE_SECCOMP_GET_FILTER): Likewise.
+
 2016-01-11  Jonathan Wakely  <jwakely.gcc@gmail.com>
            Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 

diff --git a/bits/mman-linux.h b/bits/mman-linux.h
index 9d0a9834c92cc768ef6b1c05c5cf2a4f51ed0b92..dbb994bf4dbff1a58585b1053072b47444e47c63 100644 (file)
--- a/bits/mman-linux.h
+++ b/bits/mman-linux.h
@@ -108,4 +108,6 @@
 # define MCL_CURRENT   1               /* Lock all currently mapped pages.  */
 # define MCL_FUTURE    2               /* Lock all additions to address
                                           space.  */
+# define MCL_ONFAULT   4               /* Lock all pages that are
+                                          faulted in.  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
index 1ef1c5f7176b4e87297bdf74ad4237ee5f76b6a4..506ecceee39d05412a4035c547d8a97600101ee4 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
@@ -127,8 +127,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
 
 

diff --git a/sysdeps/unix/sysv/linux/alpha/bits/mman.h b/sysdeps/unix/sysv/linux/alpha/bits/mman.h
index 38a798ac28021a806f6bb3202d058ba5c5d44acb..3b9e9a9049574e393e123340e2b49b934cc6888a 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/mman.h
@@ -41,6 +41,7 @@
 /* Flags for `mlockall'.  */
 #define MCL_CURRENT      8192
 #define MCL_FUTURE       16384
+#define MCL_ONFAULT      32768
 
 #include <bits/mman-linux.h>
 

diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
index d082d058f85d0e71c246a3c00da68bb7fb04341a..b568a66871275d561f9259b92dcbe3b98b821725 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
@@ -132,8 +132,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
 
 

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
index 14f13cdff0087b07512ff5221728fd55612df295..21c5fa9e71eb77c3fd18d0fc5ed3222d985a26e5 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
@@ -42,6 +42,8 @@
 #define MCL_CURRENT    0x2000          /* Lock all currently mapped pages.  */
 #define MCL_FUTURE     0x4000          /* Lock all additions to address
                                           space.  */
+#define MCL_ONFAULT    0x8000          /* Lock all pages that are
+                                          faulted in.  */
 
 /* Include generic Linux declarations.  */
 #include <bits/mman-linux.h>

diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
index 20d60aab739fd505d251d169e1d74412dc216627..b9ddee076d8f454e7d442cf981cff094d9d6dd53 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
@@ -119,8 +119,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
 
 

diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
index 07b118dde8138e8fce0307617e010ac2a8efe17f..15991f3e36342475c634239ce33bdc7ee0fc66f4 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
@@ -158,8 +158,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
 
 

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
index 7382dcea91573f04f6ece2612737e3daa109d8de..b5bfc6661505bae86de96ab26feecc855d33a8e8 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
@@ -41,6 +41,8 @@
 /* Flags for `mlockall'.  */
 #define MCL_CURRENT    0x2000          /* Lock all currently mapped pages.  */
 #define MCL_FUTURE     0x4000          /* Lock all additions to address
+#define MCL_ONFAULT    0x8000          /* Lock all pages that are
+                                          faulted in.  */
                                           space.  */
 /* Include generic Linux declarations.  */
 #include <bits/mman-linux.h>

diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
index dd57c7f953921bb2f50e8cb1d46403fc32041ffe..4b8815275eac35fabedea3b1a211e3ea285ea8f1 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
@@ -201,8 +201,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
 
 

diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
index cb4f6a122a61a193171147cef1829dc575ced6ce..ee88271e0ecc8a38b3d41d1f344443f9464f3a57 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
@@ -149,8 +149,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
 
 

diff --git a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
index bb921c87eee461fa6d85f7cd2a4f2a24f0c7bbbe..46b5efaa7a3a9585026b35525b5e8745af4d3f99 100644 (file)
--- a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
@@ -122,8 +122,17 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
-  PTRACE_PEEKSIGINFO = 0x4209
+  PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };