[PATCH 2/3] linux: update sys/ptrace.h comments

[PATCH 2/3] linux: update sys/ptrace.h comments

[Dmitry V. Levin]

* sysdeps/unix/sysv/linux/sys/ptrace.h (__ptrace_request): Add comments
about PTRACE_PEEKSIGINFO, PTRACE_GETSIGMASK, PTRACE_SETSIGMASK, and
PTRACE_SECCOMP_GET_FILTER.  Update comments about PTRACE_SINGLESTEP
and PTRACE_SYSCALL.
* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/tile/sys/ptrace.h: Likewise.
---
 ChangeLog                                    | 11 +++++++++++
 sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h |  8 ++++++--
 sysdeps/unix/sysv/linux/ia64/sys/ptrace.h    |  9 ++++++---
 sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h |  9 ++++++---
 sysdeps/unix/sysv/linux/s390/sys/ptrace.h    |  9 ++++++---
 sysdeps/unix/sysv/linux/sparc/sys/ptrace.h   |  9 ++++++---
 sysdeps/unix/sysv/linux/sys/ptrace.h         | 22 +++++++++++++---------
 sysdeps/unix/sysv/linux/tile/sys/ptrace.h    |  8 ++++++--
 8 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
index f955470..111d54e 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
@@ -66,7 +66,7 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process. */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
@@ -80,7 +80,7 @@ enum __ptrace_request
 
   PTRACE_GET_THREAD_AREA = 22,
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
@@ -127,15 +127,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   PTRACE_SECCOMP_GET_FILTER = 0x420c
 #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
index d08a738..0ca8237 100644
--- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
@@ -67,8 +67,7 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process.
-     This is not supported on all machines.  */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
@@ -92,7 +91,7 @@ enum __ptrace_request
   PTRACE_SETREGS = 19,
 #define PT_SETREGS PTRACE_SETREGS
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
@@ -133,15 +132,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   PTRACE_SECCOMP_GET_FILTER = 0x420c
 #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
index 799b81c..40e9836 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
@@ -65,8 +65,7 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process.
-     This is not supported on all machines.  */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
@@ -78,7 +77,7 @@ enum __ptrace_request
   PTRACE_DETACH = 17,
 #define PT_DETACH PTRACE_DETACH
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
@@ -119,15 +118,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   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 57c9793..8d19b72 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
@@ -120,8 +120,7 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process.
-     This is not supported on all machines.  */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
@@ -137,7 +136,7 @@ enum __ptrace_request
   PTRACE_DETACH = 17,
 #define PT_DETACH PTRACE_DETACH
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
@@ -178,15 +177,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   PTRACE_SECCOMP_GET_FILTER = 0x420c,
 #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
index 8e0a488..b1eaefe 100644
--- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
@@ -78,8 +78,7 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process.
-     This is not supported on all machines.  */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
@@ -146,7 +145,7 @@ enum __ptrace_request
 
 #endif
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PTRACE_SYSCALL PTRACE_SYSCALL
 
@@ -201,15 +200,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   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 096e263..6bdc91d 100644
--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
@@ -1,5 +1,6 @@
 /* `ptrace' debugger support interface.  Linux version.
    Copyright (C) 1996-2017 Free Software Foundation, Inc.
+
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -65,29 +66,28 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process.
-     This is not supported on all machines.  */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
   /* Get all general purpose registers used by a processes.
      This is not supported on all machines.  */
-   PTRACE_GETREGS = 12,
+  PTRACE_GETREGS = 12,
 #define PT_GETREGS PTRACE_GETREGS
 
   /* Set all general purpose registers used by a processes.
      This is not supported on all machines.  */
-   PTRACE_SETREGS = 13,
+  PTRACE_SETREGS = 13,
 #define PT_SETREGS PTRACE_SETREGS
 
   /* Get all floating point registers used by a processes.
      This is not supported on all machines.  */
-   PTRACE_GETFPREGS = 14,
+  PTRACE_GETFPREGS = 14,
 #define PT_GETFPREGS PTRACE_GETFPREGS
 
   /* Set all floating point registers used by a processes.
      This is not supported on all machines.  */
-   PTRACE_SETFPREGS = 15,
+  PTRACE_SETFPREGS = 15,
 #define PT_SETFPREGS PTRACE_SETFPREGS
 
   /* Attach to a process that is already running. */
@@ -100,15 +100,15 @@ enum __ptrace_request
 
   /* Get all extended floating point registers used by a processes.
      This is not supported on all machines.  */
-   PTRACE_GETFPXREGS = 18,
+  PTRACE_GETFPXREGS = 18,
 #define PT_GETFPXREGS PTRACE_GETFPXREGS
 
   /* Set all extended floating point registers used by a processes.
      This is not supported on all machines.  */
-   PTRACE_SETFPXREGS = 19,
+  PTRACE_SETFPXREGS = 19,
 #define PT_SETFPXREGS PTRACE_SETFPXREGS
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
@@ -149,15 +149,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   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 455d291..92e335f 100644
--- a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
@@ -66,7 +66,7 @@ enum __ptrace_request
   PTRACE_KILL = 8,
 #define PT_KILL PTRACE_KILL
 
-  /* Single step the process. */
+  /* Single step the process.  */
   PTRACE_SINGLESTEP = 9,
 #define PT_STEP PTRACE_SINGLESTEP
 
@@ -86,7 +86,7 @@ enum __ptrace_request
   PTRACE_DETACH = 17,
 #define PT_DETACH PTRACE_DETACH
 
-  /* Continue and stop at the next (return from) syscall.  */
+  /* Continue and stop at the next entry to or return from syscall.  */
   PTRACE_SYSCALL = 24,
 #define PT_SYSCALL PTRACE_SYSCALL
 
@@ -123,15 +123,19 @@ enum __ptrace_request
   PTRACE_LISTEN = 0x4208,
 #define PTRACE_LISTEN PTRACE_LISTEN
 
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
   PTRACE_PEEKSIGINFO = 0x4209,
 #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
 
+  /* Get the mask of blocked signals.  */
   PTRACE_GETSIGMASK = 0x420a,
 #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
 
+  /* Change the mask of blocked signals.  */
   PTRACE_SETSIGMASK = 0x420b,
 #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
 
+  /* Get seccomp BPF filters.  */
   PTRACE_SECCOMP_GET_FILTER = 0x420c
 #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
 };
-- 
ldv

[PATCH 1/3] linux: move a shared part of sys/ptrace.h to bits/ptrace-shared.h

[Dmitry V. Levin]

Move a shared part of sys/ptrace.h which is the same on all
architectures to a separate file.

* sysdeps/unix/sysv/linux/sys/ptrace.h: Include <bits/ptrace-shared.h>.
(__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
__ptrace_peeksiginfo_flags, ptrace): Move to ...
* sysdeps/unix/sysv/linux/bits/ptrace-shared.h: ... new file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
bits/ptrace-shared.h.
* sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h: Include
<bits/ptrace-shared.h>.
(__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
__ptrace_peeksiginfo_flags, ptrace): Remove.
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/tile/sys/ptrace.h: Likewise.
---
 ChangeLog                                    | 18 +++++++
 sysdeps/unix/sysv/linux/Makefile             |  2 +-
 sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 57 +-------------------
 sysdeps/unix/sysv/linux/bits/ptrace-shared.h | 78 ++++++++++++++++++++++++++++
 sysdeps/unix/sysv/linux/ia64/sys/ptrace.h    | 55 +-------------------
 sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h | 57 +-------------------
 sysdeps/unix/sysv/linux/s390/sys/ptrace.h    | 57 +-------------------
 sysdeps/unix/sysv/linux/sparc/sys/ptrace.h   | 55 +-------------------
 sysdeps/unix/sysv/linux/sys/ptrace.h         | 55 +-------------------
 sysdeps/unix/sysv/linux/tile/sys/ptrace.h    | 58 ++-------------------
 10 files changed, 109 insertions(+), 383 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/bits/ptrace-shared.h

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 8a17828..4af9c56 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -39,7 +39,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \
 		  bits/signalfd.h bits/timerfd.h bits/epoll.h \
 		  bits/socket_type.h bits/syscall.h bits/sysctl.h \
-		  bits/mman-linux.h bits/mman-shared.h \
+		  bits/mman-linux.h bits/mman-shared.h bits/ptrace-shared.h \
 		  bits/siginfo-arch.h bits/siginfo-consts-arch.h
 
 tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
index df3d9c3..f955470 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
@@ -1,4 +1,4 @@
-/* `ptrace' debugger support interface.  Linux version.
+/* `ptrace' debugger support interface.  Linux/AArch64 version.
    Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
    This file is part of the GNU C Library.
@@ -141,60 +141,7 @@ enum __ptrace_request
 };
 
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/bits/ptrace-shared.h b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
new file mode 100644
index 0000000..98ed335
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
@@ -0,0 +1,78 @@
+/* `ptrace' debugger support interface.  Linux version,
+   not architecture-specific.
+   Copyright (C) 1996-2017 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_PTRACE_H
+# error "Never use <bits/ptrace-shared.h> directly; include <sys/ptrace.h> instead."
+#endif
+
+/* Options set using PTRACE_SETOPTIONS.  */
+enum __ptrace_setoptions
+{
+  PTRACE_O_TRACESYSGOOD	= 0x00000001,
+  PTRACE_O_TRACEFORK	= 0x00000002,
+  PTRACE_O_TRACEVFORK	= 0x00000004,
+  PTRACE_O_TRACECLONE	= 0x00000008,
+  PTRACE_O_TRACEEXEC	= 0x00000010,
+  PTRACE_O_TRACEVFORKDONE = 0x00000020,
+  PTRACE_O_TRACEEXIT	= 0x00000040,
+  PTRACE_O_TRACESECCOMP	= 0x00000080,
+  PTRACE_O_EXITKILL	= 0x00100000,
+  PTRACE_O_SUSPEND_SECCOMP = 0x00200000,
+  PTRACE_O_MASK		= 0x003000ff
+};
+
+enum __ptrace_eventcodes
+{
+/* Wait extended result codes for the above trace options.  */
+  PTRACE_EVENT_FORK	= 1,
+  PTRACE_EVENT_VFORK	= 2,
+  PTRACE_EVENT_CLONE	= 3,
+  PTRACE_EVENT_EXEC	= 4,
+  PTRACE_EVENT_VFORK_DONE = 5,
+  PTRACE_EVENT_EXIT	= 6,
+  PTRACE_EVENT_SECCOMP  = 7,
+/* Extended result codes enabled by means other than options.  */
+  PTRACE_EVENT_STOP	= 128
+};
+
+/* Arguments for PTRACE_PEEKSIGINFO.  */
+struct __ptrace_peeksiginfo_args
+{
+  __uint64_t off;	/* From which siginfo to start.  */
+  __uint32_t flags;	/* Flags for peeksiginfo.  */
+  __int32_t nr;		/* How many siginfos to take.  */
+};
+
+enum __ptrace_peeksiginfo_flags
+{
+  /* Read signals from a shared (process wide) queue.  */
+  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
+};
+
+/* Perform process tracing functions.  REQUEST is one of the values
+   above, and determines the action to be taken.
+   For all requests except PTRACE_TRACEME, PID specifies the process to be
+   traced.
+
+   PID and the other arguments described above for the various requests should
+   appear (those that are used for the particular request) as:
+     pid_t PID, void *ADDR, int DATA, void *ADDR2
+   after REQUEST.  */
+extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
index 9de2f94..d08a738 100644
--- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
@@ -162,60 +162,7 @@ struct __pt_all_user_regs
     struct __ia64_fpreg fr[128];
   };
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
index b2296fa..799b81c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
@@ -1,4 +1,4 @@
-/* `ptrace' debugger support interface.  Linux version.
+/* `ptrace' debugger support interface.  Linux/PowerPC version.
    Copyright (C) 2001-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -133,60 +133,7 @@ enum __ptrace_request
 };
 
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
index 6c7d86b..57c9793 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
@@ -1,4 +1,4 @@
-/* `ptrace' debugger support interface.  Linux version.
+/* `ptrace' debugger support interface.  Linux/S390 version.
    Copyright (C) 2000-2017 Free Software Foundation, Inc.
    Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com).
    This file is part of the GNU C Library.
@@ -210,60 +210,7 @@ enum __ptrace_request
 };
 
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
index 1fda17c..8e0a488 100644
--- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
@@ -215,60 +215,7 @@ enum __ptrace_request
 };
 
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
index 6ddd972..096e263 100644
--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
@@ -163,60 +163,7 @@ enum __ptrace_request
 };
 
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
diff --git a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
index 6287e42..455d291 100644
--- a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
+/* `ptrace' debugger support interface.  Linux/Tile version.
+   Copyright (C) 2011-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
 
@@ -136,60 +137,7 @@ enum __ptrace_request
 };
 
 
-/* Options set using PTRACE_SETOPTIONS.  */
-enum __ptrace_setoptions
-{
-  PTRACE_O_TRACESYSGOOD	= 0x00000001,
-  PTRACE_O_TRACEFORK	= 0x00000002,
-  PTRACE_O_TRACEVFORK   = 0x00000004,
-  PTRACE_O_TRACECLONE	= 0x00000008,
-  PTRACE_O_TRACEEXEC	= 0x00000010,
-  PTRACE_O_TRACEVFORKDONE = 0x00000020,
-  PTRACE_O_TRACEEXIT	= 0x00000040,
-  PTRACE_O_TRACESECCOMP = 0x00000080,
-  PTRACE_O_EXITKILL	= 0x00100000,
-  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
-  PTRACE_O_MASK		= 0x003000ff
-};
-
-enum __ptrace_eventcodes
-{
-/* Wait extended result codes for the above trace options.  */
-  PTRACE_EVENT_FORK	= 1,
-  PTRACE_EVENT_VFORK	= 2,
-  PTRACE_EVENT_CLONE	= 3,
-  PTRACE_EVENT_EXEC	= 4,
-  PTRACE_EVENT_VFORK_DONE = 5,
-  PTRACE_EVENT_EXIT	= 6,
-  PTRACE_EVENT_SECCOMP  = 7,
-/* Extended result codes enabled by means other than options.  */
-  PTRACE_EVENT_STOP	= 128
-};
-
-/* Arguments for PTRACE_PEEKSIGINFO.  */
-struct __ptrace_peeksiginfo_args
-{
-  __uint64_t off;	/* From which siginfo to start.  */
-  __uint32_t flags;	/* Flags for peeksiginfo.  */
-  __int32_t nr;		/* How many siginfos to take.  */
-};
-
-enum __ptrace_peeksiginfo_flags
-{
-  /* Read signals from a shared (process wide) queue.  */
-  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-};
-
-/* Perform process tracing functions.  REQUEST is one of the values
-   above, and determines the action to be taken.
-   For all requests except PTRACE_TRACEME, PID specifies the process to be
-   traced.
-
-   PID and the other arguments described above for the various requests should
-   appear (those that are used for the particular request) as:
-     pid_t PID, void *ADDR, int DATA, void *ADDR2
-   after REQUEST.  */
-extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+#include <bits/ptrace-shared.h>
 
 __END_DECLS
 
-- 
ldv

[PATCH 3/3] linux/x86: sync sys/ptrace.h with Linux 4.14 [BZ #22433]

[Dmitry V. Levin]

Clone generic linux/sys/ptrace.h, add the following x86-specific
__ptrace_request constants: PTRACE_GET_THREAD_AREA,
PTRACE_SET_THREAD_AREA, PTRACE_ARCH_PRCTL, PTRACE_SYSEMU,
PTRACE_SYSEMU_SINGLESTEP, and PTRACE_SINGLEBLOCK.

[BZ #22433]
* sysdeps/unix/sysv/linux/x86/sys/ptrace.h: New file.
---
 ChangeLog                                |   3 +
 sysdeps/unix/sysv/linux/x86/sys/ptrace.h | 194 +++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 sysdeps/unix/sysv/linux/x86/sys/ptrace.h

diff --git a/sysdeps/unix/sysv/linux/x86/sys/ptrace.h b/sysdeps/unix/sysv/linux/x86/sys/ptrace.h
new file mode 100644
index 0000000..69c5221
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86/sys/ptrace.h
@@ -0,0 +1,194 @@
+/* `ptrace' debugger support interface.  Linux/x86 version.
+   Copyright (C) 1996-2017 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_PTRACE_H
+#define _SYS_PTRACE_H	1
+
+#include <features.h>
+#include <bits/types.h>
+
+__BEGIN_DECLS
+
+/* Type of the REQUEST argument to `ptrace.'  */
+enum __ptrace_request
+{
+  /* Indicate that the process making this request should be traced.
+     All signals received by this process can be intercepted by its
+     parent, and its parent can use the other `ptrace' requests.  */
+  PTRACE_TRACEME = 0,
+#define PT_TRACE_ME PTRACE_TRACEME
+
+  /* Return the word in the process's text space at address ADDR.  */
+  PTRACE_PEEKTEXT = 1,
+#define PT_READ_I PTRACE_PEEKTEXT
+
+  /* Return the word in the process's data space at address ADDR.  */
+  PTRACE_PEEKDATA = 2,
+#define PT_READ_D PTRACE_PEEKDATA
+
+  /* Return the word in the process's user area at offset ADDR.  */
+  PTRACE_PEEKUSER = 3,
+#define PT_READ_U PTRACE_PEEKUSER
+
+  /* Write the word DATA into the process's text space at address ADDR.  */
+  PTRACE_POKETEXT = 4,
+#define PT_WRITE_I PTRACE_POKETEXT
+
+  /* Write the word DATA into the process's data space at address ADDR.  */
+  PTRACE_POKEDATA = 5,
+#define PT_WRITE_D PTRACE_POKEDATA
+
+  /* Write the word DATA into the process's user area at offset ADDR.  */
+  PTRACE_POKEUSER = 6,
+#define PT_WRITE_U PTRACE_POKEUSER
+
+  /* Continue the process.  */
+  PTRACE_CONT = 7,
+#define PT_CONTINUE PTRACE_CONT
+
+  /* Kill the process.  */
+  PTRACE_KILL = 8,
+#define PT_KILL PTRACE_KILL
+
+  /* Single step the process.  */
+  PTRACE_SINGLESTEP = 9,
+#define PT_STEP PTRACE_SINGLESTEP
+
+  /* Get all general purpose registers used by a processes.  */
+  PTRACE_GETREGS = 12,
+#define PT_GETREGS PTRACE_GETREGS
+
+  /* Set all general purpose registers used by a processes.  */
+  PTRACE_SETREGS = 13,
+#define PT_SETREGS PTRACE_SETREGS
+
+  /* Get all floating point registers used by a processes.  */
+  PTRACE_GETFPREGS = 14,
+#define PT_GETFPREGS PTRACE_GETFPREGS
+
+  /* Set all floating point registers used by a processes.  */
+  PTRACE_SETFPREGS = 15,
+#define PT_SETFPREGS PTRACE_SETFPREGS
+
+  /* Attach to a process that is already running. */
+  PTRACE_ATTACH = 16,
+#define PT_ATTACH PTRACE_ATTACH
+
+  /* Detach from a process attached to with PTRACE_ATTACH.  */
+  PTRACE_DETACH = 17,
+#define PT_DETACH PTRACE_DETACH
+
+  /* Get all extended floating point registers used by a processes.  */
+  PTRACE_GETFPXREGS = 18,
+#define PT_GETFPXREGS PTRACE_GETFPXREGS
+
+  /* Set all extended floating point registers used by a processes.  */
+  PTRACE_SETFPXREGS = 19,
+#define PT_SETFPXREGS PTRACE_SETFPXREGS
+
+  /* Continue and stop at the next entry to or return from syscall.  */
+  PTRACE_SYSCALL = 24,
+#define PT_SYSCALL PTRACE_SYSCALL
+
+  /* Get a TLS entry in the GDT.  */
+  PTRACE_GET_THREAD_AREA = 25,
+#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
+
+  /* Change a TLS entry in the GDT.  */
+  PTRACE_SET_THREAD_AREA = 26,
+#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA
+
+#ifdef __x86_64__
+  /* Access TLS data.  */
+  PTRACE_ARCH_PRCTL = 30,
+# define PT_ARCH_PRCTL PTRACE_ARCH_PRCTL
+#endif
+
+  /* Continue and stop at the next syscall, it will not be executed.  */
+  PTRACE_SYSEMU = 31,
+#define PT_SYSEMU PTRACE_SYSEMU
+
+  /* Single step the process, the next syscall will not be executed.  */
+  PTRACE_SYSEMU_SINGLESTEP = 32,
+#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP
+
+  /* Execute process until next taken branch.  */
+  PTRACE_SINGLEBLOCK = 33,
+#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
+
+  /* Set ptrace filter options.  */
+  PTRACE_SETOPTIONS = 0x4200,
+#define PT_SETOPTIONS PTRACE_SETOPTIONS
+
+  /* Get last ptrace message.  */
+  PTRACE_GETEVENTMSG = 0x4201,
+#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
+
+  /* Get siginfo for process.  */
+  PTRACE_GETSIGINFO = 0x4202,
+#define PT_GETSIGINFO PTRACE_GETSIGINFO
+
+  /* Set new siginfo for process.  */
+  PTRACE_SETSIGINFO = 0x4203,
+#define PT_SETSIGINFO PTRACE_SETSIGINFO
+
+  /* Get register content.  */
+  PTRACE_GETREGSET = 0x4204,
+#define PTRACE_GETREGSET PTRACE_GETREGSET
+
+  /* Set register content.  */
+  PTRACE_SETREGSET = 0x4205,
+#define PTRACE_SETREGSET PTRACE_SETREGSET
+
+  /* Like PTRACE_ATTACH, but do not force tracee to trap and do not affect
+     signal or group stop state.  */
+  PTRACE_SEIZE = 0x4206,
+#define PTRACE_SEIZE PTRACE_SEIZE
+
+  /* Trap seized tracee.  */
+  PTRACE_INTERRUPT = 0x4207,
+#define PTRACE_INTERRUPT PTRACE_INTERRUPT
+
+  /* Wait for next group event.  */
+  PTRACE_LISTEN = 0x4208,
+#define PTRACE_LISTEN PTRACE_LISTEN
+
+  /* Retrieve siginfo_t structures without removing signals from a queue.  */
+  PTRACE_PEEKSIGINFO = 0x4209,
+#define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
+
+  /* Get the mask of blocked signals.  */
+  PTRACE_GETSIGMASK = 0x420a,
+#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
+
+  /* Change the mask of blocked signals.  */
+  PTRACE_SETSIGMASK = 0x420b,
+#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
+
+  /* Get seccomp BPF filters.  */
+  PTRACE_SECCOMP_GET_FILTER = 0x420c
+#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
+};
+
+
+#include <bits/ptrace-shared.h>
+
+__END_DECLS
+
+#endif /* _SYS_PTRACE_H */
-- 
ldv

Re: [PATCH 1/3] linux: move a shared part of sys/ptrace.h to bits/ptrace-shared.h

[Adhemerval Zanella]

On 27/12/2017 01:46, Dmitry V. Levin wrote:
> Move a shared part of sys/ptrace.h which is the same on all
> architectures to a separate file.
> 
> * sysdeps/unix/sysv/linux/sys/ptrace.h: Include <bits/ptrace-shared.h>.
> (__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
> __ptrace_peeksiginfo_flags, ptrace): Move to ...
> * sysdeps/unix/sysv/linux/bits/ptrace-shared.h: ... new file.
> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
> bits/ptrace-shared.h.
> * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h: Include
> <bits/ptrace-shared.h>.
> (__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
> __ptrace_peeksiginfo_flags, ptrace): Remove.
> * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/tile/sys/ptrace.h: Likewise.

I assume you have checked for any build failures on the affected architectures.
I have just a nit below regarding copyright dates, otherwise looks ok.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

> ---
>  ChangeLog                                    | 18 +++++++
>  sysdeps/unix/sysv/linux/Makefile             |  2 +-
>  sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h | 57 +-------------------
>  sysdeps/unix/sysv/linux/bits/ptrace-shared.h | 78 ++++++++++++++++++++++++++++
>  sysdeps/unix/sysv/linux/ia64/sys/ptrace.h    | 55 +-------------------
>  sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h | 57 +-------------------
>  sysdeps/unix/sysv/linux/s390/sys/ptrace.h    | 57 +-------------------
>  sysdeps/unix/sysv/linux/sparc/sys/ptrace.h   | 55 +-------------------
>  sysdeps/unix/sysv/linux/sys/ptrace.h         | 55 +-------------------
>  sysdeps/unix/sysv/linux/tile/sys/ptrace.h    | 58 ++-------------------
>  10 files changed, 109 insertions(+), 383 deletions(-)
>  create mode 100644 sysdeps/unix/sysv/linux/bits/ptrace-shared.h
> 
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 8a17828..4af9c56 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -39,7 +39,7 @@ sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
>  		  sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \
>  		  bits/signalfd.h bits/timerfd.h bits/epoll.h \
>  		  bits/socket_type.h bits/syscall.h bits/sysctl.h \
> -		  bits/mman-linux.h bits/mman-shared.h \
> +		  bits/mman-linux.h bits/mman-shared.h bits/ptrace-shared.h \
>  		  bits/siginfo-arch.h bits/siginfo-consts-arch.h
>  
>  tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \

Ok.

> diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
> index df3d9c3..f955470 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
> @@ -1,4 +1,4 @@
> -/* `ptrace' debugger support interface.  Linux version.
> +/* `ptrace' debugger support interface.  Linux/AArch64 version.
>     Copyright (C) 1996-2017 Free Software Foundation, Inc.
>  
>     This file is part of the GNU C Library.
> @@ -141,60 +141,7 @@ enum __ptrace_request
>  };
>  
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/bits/ptrace-shared.h b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
> new file mode 100644
> index 0000000..98ed335
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
> @@ -0,0 +1,78 @@
> +/* `ptrace' debugger support interface.  Linux version,
> +   not architecture-specific.
> +   Copyright (C) 1996-2017 Free Software Foundation, Inc.

I am not sure if we should retroactively set the copyright for consolidation
code (it was not the case for some internal pthread consolidation).

> +
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#ifndef _SYS_PTRACE_H
> +# error "Never use <bits/ptrace-shared.h> directly; include <sys/ptrace.h> instead."
> +#endif
> +
> +/* Options set using PTRACE_SETOPTIONS.  */
> +enum __ptrace_setoptions
> +{
> +  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> +  PTRACE_O_TRACEFORK	= 0x00000002,
> +  PTRACE_O_TRACEVFORK	= 0x00000004,
> +  PTRACE_O_TRACECLONE	= 0x00000008,
> +  PTRACE_O_TRACEEXEC	= 0x00000010,
> +  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> +  PTRACE_O_TRACEEXIT	= 0x00000040,
> +  PTRACE_O_TRACESECCOMP	= 0x00000080,
> +  PTRACE_O_EXITKILL	= 0x00100000,
> +  PTRACE_O_SUSPEND_SECCOMP = 0x00200000,
> +  PTRACE_O_MASK		= 0x003000ff
> +};
> +
> +enum __ptrace_eventcodes
> +{
> +/* Wait extended result codes for the above trace options.  */
> +  PTRACE_EVENT_FORK	= 1,
> +  PTRACE_EVENT_VFORK	= 2,
> +  PTRACE_EVENT_CLONE	= 3,
> +  PTRACE_EVENT_EXEC	= 4,
> +  PTRACE_EVENT_VFORK_DONE = 5,
> +  PTRACE_EVENT_EXIT	= 6,
> +  PTRACE_EVENT_SECCOMP  = 7,
> +/* Extended result codes enabled by means other than options.  */
> +  PTRACE_EVENT_STOP	= 128
> +};
> +
> +/* Arguments for PTRACE_PEEKSIGINFO.  */
> +struct __ptrace_peeksiginfo_args
> +{
> +  __uint64_t off;	/* From which siginfo to start.  */
> +  __uint32_t flags;	/* Flags for peeksiginfo.  */
> +  __int32_t nr;		/* How many siginfos to take.  */
> +};
> +
> +enum __ptrace_peeksiginfo_flags
> +{
> +  /* Read signals from a shared (process wide) queue.  */
> +  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> +};
> +
> +/* Perform process tracing functions.  REQUEST is one of the values
> +   above, and determines the action to be taken.
> +   For all requests except PTRACE_TRACEME, PID specifies the process to be
> +   traced.
> +
> +   PID and the other arguments described above for the various requests should
> +   appear (those that are used for the particular request) as:
> +     pid_t PID, void *ADDR, int DATA, void *ADDR2
> +   after REQUEST.  */
> +extern long int ptrace (enum __ptrace_request __request, ...) __THROW;

Ok.

> diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
> index 9de2f94..d08a738 100644
> --- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
> @@ -162,60 +162,7 @@ struct __pt_all_user_regs
>      struct __ia64_fpreg fr[128];
>    };
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
> index b2296fa..799b81c 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
> @@ -1,4 +1,4 @@
> -/* `ptrace' debugger support interface.  Linux version.
> +/* `ptrace' debugger support interface.  Linux/PowerPC version.
>     Copyright (C) 2001-2017 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
>  
> @@ -133,60 +133,7 @@ enum __ptrace_request
>  };
>  
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
> index 6c7d86b..57c9793 100644
> --- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
> @@ -1,4 +1,4 @@
> -/* `ptrace' debugger support interface.  Linux version.
> +/* `ptrace' debugger support interface.  Linux/S390 version.
>     Copyright (C) 2000-2017 Free Software Foundation, Inc.
>     Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com).
>     This file is part of the GNU C Library.
> @@ -210,60 +210,7 @@ enum __ptrace_request
>  };
>  
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
> index 1fda17c..8e0a488 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
> @@ -215,60 +215,7 @@ enum __ptrace_request
>  };
>  
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
> index 6ddd972..096e263 100644
> --- a/sysdeps/unix/sysv/linux/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
> @@ -163,60 +163,7 @@ enum __ptrace_request
>  };
>  
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  

Ok.

> diff --git a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
> index 6287e42..455d291 100644
> --- a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
> +/* `ptrace' debugger support interface.  Linux/Tile version.
> +   Copyright (C) 2011-2017 Free Software Foundation, Inc.
>     This file is part of the GNU C Library.
>     Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
>  
> @@ -136,60 +137,7 @@ enum __ptrace_request
>  };
>  
>  
> -/* Options set using PTRACE_SETOPTIONS.  */
> -enum __ptrace_setoptions
> -{
> -  PTRACE_O_TRACESYSGOOD	= 0x00000001,
> -  PTRACE_O_TRACEFORK	= 0x00000002,
> -  PTRACE_O_TRACEVFORK   = 0x00000004,
> -  PTRACE_O_TRACECLONE	= 0x00000008,
> -  PTRACE_O_TRACEEXEC	= 0x00000010,
> -  PTRACE_O_TRACEVFORKDONE = 0x00000020,
> -  PTRACE_O_TRACEEXIT	= 0x00000040,
> -  PTRACE_O_TRACESECCOMP = 0x00000080,
> -  PTRACE_O_EXITKILL	= 0x00100000,
> -  PTRACE_O_SUSPEND_SECCOMP	= 0x00200000,
> -  PTRACE_O_MASK		= 0x003000ff
> -};
> -
> -enum __ptrace_eventcodes
> -{
> -/* Wait extended result codes for the above trace options.  */
> -  PTRACE_EVENT_FORK	= 1,
> -  PTRACE_EVENT_VFORK	= 2,
> -  PTRACE_EVENT_CLONE	= 3,
> -  PTRACE_EVENT_EXEC	= 4,
> -  PTRACE_EVENT_VFORK_DONE = 5,
> -  PTRACE_EVENT_EXIT	= 6,
> -  PTRACE_EVENT_SECCOMP  = 7,
> -/* Extended result codes enabled by means other than options.  */
> -  PTRACE_EVENT_STOP	= 128
> -};
> -
> -/* Arguments for PTRACE_PEEKSIGINFO.  */
> -struct __ptrace_peeksiginfo_args
> -{
> -  __uint64_t off;	/* From which siginfo to start.  */
> -  __uint32_t flags;	/* Flags for peeksiginfo.  */
> -  __int32_t nr;		/* How many siginfos to take.  */
> -};
> -
> -enum __ptrace_peeksiginfo_flags
> -{
> -  /* Read signals from a shared (process wide) queue.  */
> -  PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
> -};
> -
> -/* Perform process tracing functions.  REQUEST is one of the values
> -   above, and determines the action to be taken.
> -   For all requests except PTRACE_TRACEME, PID specifies the process to be
> -   traced.
> -
> -   PID and the other arguments described above for the various requests should
> -   appear (those that are used for the particular request) as:
> -     pid_t PID, void *ADDR, int DATA, void *ADDR2
> -   after REQUEST.  */
> -extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
> +#include <bits/ptrace-shared.h>
>  
>  __END_DECLS
>  
> 

Ok.

Re: [PATCH 2/3] linux: update sys/ptrace.h comments

[Adhemerval Zanella]

On 27/12/2017 01:46, Dmitry V. Levin wrote:
> * sysdeps/unix/sysv/linux/sys/ptrace.h (__ptrace_request): Add comments
> about PTRACE_PEEKSIGINFO, PTRACE_GETSIGMASK, PTRACE_SETSIGMASK, and
> PTRACE_SECCOMP_GET_FILTER.  Update comments about PTRACE_SINGLESTEP
> and PTRACE_SYSCALL.
> * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
> * sysdeps/unix/sysv/linux/tile/sys/ptrace.h: Likewise.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

> ---
>  ChangeLog                                    | 11 +++++++++++
>  sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h |  8 ++++++--
>  sysdeps/unix/sysv/linux/ia64/sys/ptrace.h    |  9 ++++++---
>  sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h |  9 ++++++---
>  sysdeps/unix/sysv/linux/s390/sys/ptrace.h    |  9 ++++++---
>  sysdeps/unix/sysv/linux/sparc/sys/ptrace.h   |  9 ++++++---
>  sysdeps/unix/sysv/linux/sys/ptrace.h         | 22 +++++++++++++---------
>  sysdeps/unix/sysv/linux/tile/sys/ptrace.h    |  8 ++++++--
>  8 files changed, 60 insertions(+), 25 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
> index f955470..111d54e 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h
> @@ -66,7 +66,7 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process. */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
> @@ -80,7 +80,7 @@ enum __ptrace_request
>  
>    PTRACE_GET_THREAD_AREA = 22,
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PT_SYSCALL PTRACE_SYSCALL
>  
> @@ -127,15 +127,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    PTRACE_SECCOMP_GET_FILTER = 0x420c
>  #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
>  };
> diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
> index d08a738..0ca8237 100644
> --- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
> @@ -67,8 +67,7 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process.
> -     This is not supported on all machines.  */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
> @@ -92,7 +91,7 @@ enum __ptrace_request
>    PTRACE_SETREGS = 19,
>  #define PT_SETREGS PTRACE_SETREGS
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PT_SYSCALL PTRACE_SYSCALL
>  
> @@ -133,15 +132,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    PTRACE_SECCOMP_GET_FILTER = 0x420c
>  #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
>  };
> diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
> index 799b81c..40e9836 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
> @@ -65,8 +65,7 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process.
> -     This is not supported on all machines.  */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
> @@ -78,7 +77,7 @@ enum __ptrace_request
>    PTRACE_DETACH = 17,
>  #define PT_DETACH PTRACE_DETACH
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PT_SYSCALL PTRACE_SYSCALL
>  
> @@ -119,15 +118,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    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 57c9793..8d19b72 100644
> --- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
> @@ -120,8 +120,7 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process.
> -     This is not supported on all machines.  */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
> @@ -137,7 +136,7 @@ enum __ptrace_request
>    PTRACE_DETACH = 17,
>  #define PT_DETACH PTRACE_DETACH
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PT_SYSCALL PTRACE_SYSCALL
>  
> @@ -178,15 +177,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    PTRACE_SECCOMP_GET_FILTER = 0x420c,
>  #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
>  
> diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
> index 8e0a488..b1eaefe 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
> @@ -78,8 +78,7 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process.
> -     This is not supported on all machines.  */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
> @@ -146,7 +145,7 @@ enum __ptrace_request
>  
>  #endif
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PTRACE_SYSCALL PTRACE_SYSCALL
>  
> @@ -201,15 +200,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    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 096e263..6bdc91d 100644
> --- a/sysdeps/unix/sysv/linux/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
> @@ -1,5 +1,6 @@
>  /* `ptrace' debugger support interface.  Linux version.
>     Copyright (C) 1996-2017 Free Software Foundation, Inc.
> +
>     This file is part of the GNU C Library.
>  
>     The GNU C Library is free software; you can redistribute it and/or
> @@ -65,29 +66,28 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process.
> -     This is not supported on all machines.  */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
>    /* Get all general purpose registers used by a processes.
>       This is not supported on all machines.  */
> -   PTRACE_GETREGS = 12,
> +  PTRACE_GETREGS = 12,
>  #define PT_GETREGS PTRACE_GETREGS
>  
>    /* Set all general purpose registers used by a processes.
>       This is not supported on all machines.  */
> -   PTRACE_SETREGS = 13,
> +  PTRACE_SETREGS = 13,
>  #define PT_SETREGS PTRACE_SETREGS
>  
>    /* Get all floating point registers used by a processes.
>       This is not supported on all machines.  */
> -   PTRACE_GETFPREGS = 14,
> +  PTRACE_GETFPREGS = 14,
>  #define PT_GETFPREGS PTRACE_GETFPREGS
>  
>    /* Set all floating point registers used by a processes.
>       This is not supported on all machines.  */
> -   PTRACE_SETFPREGS = 15,
> +  PTRACE_SETFPREGS = 15,
>  #define PT_SETFPREGS PTRACE_SETFPREGS
>  
>    /* Attach to a process that is already running. */
> @@ -100,15 +100,15 @@ enum __ptrace_request
>  
>    /* Get all extended floating point registers used by a processes.
>       This is not supported on all machines.  */
> -   PTRACE_GETFPXREGS = 18,
> +  PTRACE_GETFPXREGS = 18,
>  #define PT_GETFPXREGS PTRACE_GETFPXREGS
>  
>    /* Set all extended floating point registers used by a processes.
>       This is not supported on all machines.  */
> -   PTRACE_SETFPXREGS = 19,
> +  PTRACE_SETFPXREGS = 19,
>  #define PT_SETFPXREGS PTRACE_SETFPXREGS
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PT_SYSCALL PTRACE_SYSCALL
>  
> @@ -149,15 +149,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    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 455d291..92e335f 100644
> --- a/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
> +++ b/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
> @@ -66,7 +66,7 @@ enum __ptrace_request
>    PTRACE_KILL = 8,
>  #define PT_KILL PTRACE_KILL
>  
> -  /* Single step the process. */
> +  /* Single step the process.  */
>    PTRACE_SINGLESTEP = 9,
>  #define PT_STEP PTRACE_SINGLESTEP
>  
> @@ -86,7 +86,7 @@ enum __ptrace_request
>    PTRACE_DETACH = 17,
>  #define PT_DETACH PTRACE_DETACH
>  
> -  /* Continue and stop at the next (return from) syscall.  */
> +  /* Continue and stop at the next entry to or return from syscall.  */
>    PTRACE_SYSCALL = 24,
>  #define PT_SYSCALL PTRACE_SYSCALL
>  
> @@ -123,15 +123,19 @@ enum __ptrace_request
>    PTRACE_LISTEN = 0x4208,
>  #define PTRACE_LISTEN PTRACE_LISTEN
>  
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
>    PTRACE_PEEKSIGINFO = 0x4209,
>  #define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
>  
> +  /* Get the mask of blocked signals.  */
>    PTRACE_GETSIGMASK = 0x420a,
>  #define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
>  
> +  /* Change the mask of blocked signals.  */
>    PTRACE_SETSIGMASK = 0x420b,
>  #define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
>  
> +  /* Get seccomp BPF filters.  */
>    PTRACE_SECCOMP_GET_FILTER = 0x420c
>  #define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
>  };
> 

Re: [PATCH 3/3] linux/x86: sync sys/ptrace.h with Linux 4.14 [BZ #22433]

[Adhemerval Zanella]

On 27/12/2017 01:46, Dmitry V. Levin wrote:
> Clone generic linux/sys/ptrace.h, add the following x86-specific
> __ptrace_request constants: PTRACE_GET_THREAD_AREA,
> PTRACE_SET_THREAD_AREA, PTRACE_ARCH_PRCTL, PTRACE_SYSEMU,
> PTRACE_SYSEMU_SINGLESTEP, and PTRACE_SINGLEBLOCK.
> 
> [BZ #22433]
> * sysdeps/unix/sysv/linux/x86/sys/ptrace.h: New file.

Wouldn't be better to avoid code duplication to add a ptrace-arch.h as an
empty one for generic case and add a x86 with the arch-specific bits?

> ---
>  ChangeLog                                |   3 +
>  sysdeps/unix/sysv/linux/x86/sys/ptrace.h | 194 +++++++++++++++++++++++++++++++
>  2 files changed, 197 insertions(+)
>  create mode 100644 sysdeps/unix/sysv/linux/x86/sys/ptrace.h
> 
> diff --git a/sysdeps/unix/sysv/linux/x86/sys/ptrace.h b/sysdeps/unix/sysv/linux/x86/sys/ptrace.h
> new file mode 100644
> index 0000000..69c5221
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/x86/sys/ptrace.h
> @@ -0,0 +1,194 @@
> +/* `ptrace' debugger support interface.  Linux/x86 version.
> +   Copyright (C) 1996-2017 Free Software Foundation, Inc.
> +
> +   This file is part of the GNU C Library.
> +
> +   The GNU C Library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later version.
> +
> +   The GNU C Library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with the GNU C Library; if not, see
> +   <http://www.gnu.org/licenses/>.  */
> +
> +#ifndef _SYS_PTRACE_H
> +#define _SYS_PTRACE_H	1
> +
> +#include <features.h>
> +#include <bits/types.h>
> +
> +__BEGIN_DECLS
> +
> +/* Type of the REQUEST argument to `ptrace.'  */
> +enum __ptrace_request
> +{
> +  /* Indicate that the process making this request should be traced.
> +     All signals received by this process can be intercepted by its
> +     parent, and its parent can use the other `ptrace' requests.  */
> +  PTRACE_TRACEME = 0,
> +#define PT_TRACE_ME PTRACE_TRACEME
> +
> +  /* Return the word in the process's text space at address ADDR.  */
> +  PTRACE_PEEKTEXT = 1,
> +#define PT_READ_I PTRACE_PEEKTEXT
> +
> +  /* Return the word in the process's data space at address ADDR.  */
> +  PTRACE_PEEKDATA = 2,
> +#define PT_READ_D PTRACE_PEEKDATA
> +
> +  /* Return the word in the process's user area at offset ADDR.  */
> +  PTRACE_PEEKUSER = 3,
> +#define PT_READ_U PTRACE_PEEKUSER
> +
> +  /* Write the word DATA into the process's text space at address ADDR.  */
> +  PTRACE_POKETEXT = 4,
> +#define PT_WRITE_I PTRACE_POKETEXT
> +
> +  /* Write the word DATA into the process's data space at address ADDR.  */
> +  PTRACE_POKEDATA = 5,
> +#define PT_WRITE_D PTRACE_POKEDATA
> +
> +  /* Write the word DATA into the process's user area at offset ADDR.  */
> +  PTRACE_POKEUSER = 6,
> +#define PT_WRITE_U PTRACE_POKEUSER
> +
> +  /* Continue the process.  */
> +  PTRACE_CONT = 7,
> +#define PT_CONTINUE PTRACE_CONT
> +
> +  /* Kill the process.  */
> +  PTRACE_KILL = 8,
> +#define PT_KILL PTRACE_KILL
> +
> +  /* Single step the process.  */
> +  PTRACE_SINGLESTEP = 9,
> +#define PT_STEP PTRACE_SINGLESTEP
> +
> +  /* Get all general purpose registers used by a processes.  */
> +  PTRACE_GETREGS = 12,
> +#define PT_GETREGS PTRACE_GETREGS
> +
> +  /* Set all general purpose registers used by a processes.  */
> +  PTRACE_SETREGS = 13,
> +#define PT_SETREGS PTRACE_SETREGS
> +
> +  /* Get all floating point registers used by a processes.  */
> +  PTRACE_GETFPREGS = 14,
> +#define PT_GETFPREGS PTRACE_GETFPREGS
> +
> +  /* Set all floating point registers used by a processes.  */
> +  PTRACE_SETFPREGS = 15,
> +#define PT_SETFPREGS PTRACE_SETFPREGS
> +
> +  /* Attach to a process that is already running. */
> +  PTRACE_ATTACH = 16,
> +#define PT_ATTACH PTRACE_ATTACH
> +
> +  /* Detach from a process attached to with PTRACE_ATTACH.  */
> +  PTRACE_DETACH = 17,
> +#define PT_DETACH PTRACE_DETACH
> +
> +  /* Get all extended floating point registers used by a processes.  */
> +  PTRACE_GETFPXREGS = 18,
> +#define PT_GETFPXREGS PTRACE_GETFPXREGS
> +
> +  /* Set all extended floating point registers used by a processes.  */
> +  PTRACE_SETFPXREGS = 19,
> +#define PT_SETFPXREGS PTRACE_SETFPXREGS
> +
> +  /* Continue and stop at the next entry to or return from syscall.  */
> +  PTRACE_SYSCALL = 24,
> +#define PT_SYSCALL PTRACE_SYSCALL
> +
> +  /* Get a TLS entry in the GDT.  */
> +  PTRACE_GET_THREAD_AREA = 25,
> +#define PT_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
> +
> +  /* Change a TLS entry in the GDT.  */
> +  PTRACE_SET_THREAD_AREA = 26,
> +#define PT_SET_THREAD_AREA PTRACE_SET_THREAD_AREA
> +
> +#ifdef __x86_64__
> +  /* Access TLS data.  */
> +  PTRACE_ARCH_PRCTL = 30,
> +# define PT_ARCH_PRCTL PTRACE_ARCH_PRCTL
> +#endif
> +
> +  /* Continue and stop at the next syscall, it will not be executed.  */
> +  PTRACE_SYSEMU = 31,
> +#define PT_SYSEMU PTRACE_SYSEMU
> +
> +  /* Single step the process, the next syscall will not be executed.  */
> +  PTRACE_SYSEMU_SINGLESTEP = 32,
> +#define PT_SYSEMU_SINGLESTEP PTRACE_SYSEMU_SINGLESTEP
> +
> +  /* Execute process until next taken branch.  */
> +  PTRACE_SINGLEBLOCK = 33,
> +#define PT_STEPBLOCK PTRACE_SINGLEBLOCK
> +
> +  /* Set ptrace filter options.  */
> +  PTRACE_SETOPTIONS = 0x4200,
> +#define PT_SETOPTIONS PTRACE_SETOPTIONS
> +
> +  /* Get last ptrace message.  */
> +  PTRACE_GETEVENTMSG = 0x4201,
> +#define PT_GETEVENTMSG PTRACE_GETEVENTMSG
> +
> +  /* Get siginfo for process.  */
> +  PTRACE_GETSIGINFO = 0x4202,
> +#define PT_GETSIGINFO PTRACE_GETSIGINFO
> +
> +  /* Set new siginfo for process.  */
> +  PTRACE_SETSIGINFO = 0x4203,
> +#define PT_SETSIGINFO PTRACE_SETSIGINFO
> +
> +  /* Get register content.  */
> +  PTRACE_GETREGSET = 0x4204,
> +#define PTRACE_GETREGSET PTRACE_GETREGSET
> +
> +  /* Set register content.  */
> +  PTRACE_SETREGSET = 0x4205,
> +#define PTRACE_SETREGSET PTRACE_SETREGSET
> +
> +  /* Like PTRACE_ATTACH, but do not force tracee to trap and do not affect
> +     signal or group stop state.  */
> +  PTRACE_SEIZE = 0x4206,
> +#define PTRACE_SEIZE PTRACE_SEIZE
> +
> +  /* Trap seized tracee.  */
> +  PTRACE_INTERRUPT = 0x4207,
> +#define PTRACE_INTERRUPT PTRACE_INTERRUPT
> +
> +  /* Wait for next group event.  */
> +  PTRACE_LISTEN = 0x4208,
> +#define PTRACE_LISTEN PTRACE_LISTEN
> +
> +  /* Retrieve siginfo_t structures without removing signals from a queue.  */
> +  PTRACE_PEEKSIGINFO = 0x4209,
> +#define PTRACE_PEEKSIGINFO PTRACE_PEEKSIGINFO
> +
> +  /* Get the mask of blocked signals.  */
> +  PTRACE_GETSIGMASK = 0x420a,
> +#define PTRACE_GETSIGMASK PTRACE_GETSIGMASK
> +
> +  /* Change the mask of blocked signals.  */
> +  PTRACE_SETSIGMASK = 0x420b,
> +#define PTRACE_SETSIGMASK PTRACE_SETSIGMASK
> +
> +  /* Get seccomp BPF filters.  */
> +  PTRACE_SECCOMP_GET_FILTER = 0x420c
> +#define PTRACE_SECCOMP_GET_FILTER PTRACE_SECCOMP_GET_FILTER
> +};
> +
> +
> +#include <bits/ptrace-shared.h>
> +
> +__END_DECLS
> +
> +#endif /* _SYS_PTRACE_H */
> 

Re: [PATCH 1/3] linux: move a shared part of sys/ptrace.h to bits/ptrace-shared.h

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 2074 bytes --]

On Fri, Dec 29, 2017 at 11:07:39AM -0200, Adhemerval Zanella wrote:
> On 27/12/2017 01:46, Dmitry V. Levin wrote:
> > Move a shared part of sys/ptrace.h which is the same on all
> > architectures to a separate file.
> > 
> > * sysdeps/unix/sysv/linux/sys/ptrace.h: Include <bits/ptrace-shared.h>.
> > (__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
> > __ptrace_peeksiginfo_flags, ptrace): Move to ...
> > * sysdeps/unix/sysv/linux/bits/ptrace-shared.h: ... new file.
> > * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
> > bits/ptrace-shared.h.
> > * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h: Include
> > <bits/ptrace-shared.h>.
> > (__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
> > __ptrace_peeksiginfo_flags, ptrace): Remove.
> > * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise.
> > * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
> > * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
> > * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
> > * sysdeps/unix/sysv/linux/tile/sys/ptrace.h: Likewise.
> 
> I assume you have checked for any build failures on the affected architectures.
> I have just a nit below regarding copyright dates, otherwise looks ok.

Thanks.

[...]
> > diff --git a/sysdeps/unix/sysv/linux/bits/ptrace-shared.h b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
> > new file mode 100644
> > index 0000000..98ed335
> > --- /dev/null
> > +++ b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
> > @@ -0,0 +1,78 @@
> > +/* `ptrace' debugger support interface.  Linux version,
> > +   not architecture-specific.
> > +   Copyright (C) 1996-2017 Free Software Foundation, Inc.
> 
> I am not sure if we should retroactively set the copyright for consolidation
> code (it was not the case for some internal pthread consolidation).

bits/ptrace-shared.h file is essentially a copy of sys/ptrace.h with
__ptrace_request removed, this way it inherited the copyright notice, too.

Do we reset copyright years in such cases?


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH 3/3] linux/x86: sync sys/ptrace.h with Linux 4.14 [BZ #22433]

[Dmitry V. Levin]

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

On Fri, Dec 29, 2017 at 11:13:03AM -0200, Adhemerval Zanella wrote:
> On 27/12/2017 01:46, Dmitry V. Levin wrote:
> > Clone generic linux/sys/ptrace.h, add the following x86-specific
> > __ptrace_request constants: PTRACE_GET_THREAD_AREA,
> > PTRACE_SET_THREAD_AREA, PTRACE_ARCH_PRCTL, PTRACE_SYSEMU,
> > PTRACE_SYSEMU_SINGLESTEP, and PTRACE_SINGLEBLOCK.
> > 
> > [BZ #22433]
> > * sysdeps/unix/sysv/linux/x86/sys/ptrace.h: New file.
> 
> Wouldn't be better to avoid code duplication to add a ptrace-arch.h as an
> empty one for generic case and add a x86 with the arch-specific bits?

Maybe, but there are two complications.

First, this x86/bits/ptrace-arch.h would have to contain a part of
enum __ptrace_request definition - are we OK with distributing
such ugly looking arch-specific bits?

Second, there are exceptions, e.g. ia64/sys/ptrace.h includes additional
headers and defines struct __pt_all_user_regs, s390/sys/ptrace.h and
sparc/sys/ptrace.h undefine potentially conflicting PTRACE_* macros -
we would have to #include more arch-specific bits to accommodate them.


-- 
ldv

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH 3/3] linux/x86: sync sys/ptrace.h with Linux 4.14 [BZ #22433]

[Adhemerval Zanella]

[-- Attachment #1.1: Type: text/plain, Size: 1367 bytes --]



On 29/12/2017 11:36, Dmitry V. Levin wrote:
> On Fri, Dec 29, 2017 at 11:13:03AM -0200, Adhemerval Zanella wrote:
>> On 27/12/2017 01:46, Dmitry V. Levin wrote:
>>> Clone generic linux/sys/ptrace.h, add the following x86-specific
>>> __ptrace_request constants: PTRACE_GET_THREAD_AREA,
>>> PTRACE_SET_THREAD_AREA, PTRACE_ARCH_PRCTL, PTRACE_SYSEMU,
>>> PTRACE_SYSEMU_SINGLESTEP, and PTRACE_SINGLEBLOCK.
>>>
>>> [BZ #22433]
>>> * sysdeps/unix/sysv/linux/x86/sys/ptrace.h: New file.
>>
>> Wouldn't be better to avoid code duplication to add a ptrace-arch.h as an
>> empty one for generic case and add a x86 with the arch-specific bits?
> 
> Maybe, but there are two complications.
> 
> First, this x86/bits/ptrace-arch.h would have to contain a part of
> enum __ptrace_request definition - are we OK with distributing
> such ugly looking arch-specific bits?
> 
> Second, there are exceptions, e.g. ia64/sys/ptrace.h includes additional
> headers and defines struct __pt_all_user_regs, s390/sys/ptrace.h and
> sparc/sys/ptrace.h undefine potentially conflicting PTRACE_* macros -
> we would have to #include more arch-specific bits to accommodate them.
> 
> 

Indeed breaking down the enum on arch-specific bits does not seems a good
refactor way.  It seems ptrace.h justify to be a quite arch-specific
header.

The patch LGTM then.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/3] linux: move a shared part of sys/ptrace.h to bits/ptrace-shared.h

[Adhemerval Zanella]

[-- Attachment #1.1: Type: text/plain, Size: 2315 bytes --]



On 29/12/2017 11:18, Dmitry V. Levin wrote:
> On Fri, Dec 29, 2017 at 11:07:39AM -0200, Adhemerval Zanella wrote:
>> On 27/12/2017 01:46, Dmitry V. Levin wrote:
>>> Move a shared part of sys/ptrace.h which is the same on all
>>> architectures to a separate file.
>>>
>>> * sysdeps/unix/sysv/linux/sys/ptrace.h: Include <bits/ptrace-shared.h>.
>>> (__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
>>> __ptrace_peeksiginfo_flags, ptrace): Move to ...
>>> * sysdeps/unix/sysv/linux/bits/ptrace-shared.h: ... new file.
>>> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
>>> bits/ptrace-shared.h.
>>> * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h: Include
>>> <bits/ptrace-shared.h>.
>>> (__ptrace_setoptions, __ptrace_eventcodes, __ptrace_peeksiginfo_args,
>>> __ptrace_peeksiginfo_flags, ptrace): Remove.
>>> * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Likewise.
>>> * sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
>>> * sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
>>> * sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
>>> * sysdeps/unix/sysv/linux/tile/sys/ptrace.h: Likewise.
>>
>> I assume you have checked for any build failures on the affected architectures.
>> I have just a nit below regarding copyright dates, otherwise looks ok.
> 
> Thanks.
> 
> [...]
>>> diff --git a/sysdeps/unix/sysv/linux/bits/ptrace-shared.h b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
>>> new file mode 100644
>>> index 0000000..98ed335
>>> --- /dev/null
>>> +++ b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
>>> @@ -0,0 +1,78 @@
>>> +/* `ptrace' debugger support interface.  Linux version,
>>> +   not architecture-specific.
>>> +   Copyright (C) 1996-2017 Free Software Foundation, Inc.
>>
>> I am not sure if we should retroactively set the copyright for consolidation
>> code (it was not the case for some internal pthread consolidation).
> 
> bits/ptrace-shared.h file is essentially a copy of sys/ptrace.h with
> __ptrace_request removed, this way it inherited the copyright notice, too.
> 
> Do we reset copyright years in such cases?

I am trying to see if there is a guideline regarding it, but I can't find any
documentation. In any case, you patch seems a conservative approach and should do
no harm. LGTM.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/3] linux: move a shared part of sys/ptrace.h to bits/ptrace-shared.h

[Florian Weimer]

* Dmitry V. Levin:

>> > diff --git a/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
>> > b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
>> > new file mode 100644
>> > index 0000000..98ed335
>> > --- /dev/null
>> > +++ b/sysdeps/unix/sysv/linux/bits/ptrace-shared.h
>> > @@ -0,0 +1,78 @@
>> > +/* `ptrace' debugger support interface.  Linux version,
>> > +   not architecture-specific.
>> > +   Copyright (C) 1996-2017 Free Software Foundation, Inc.
>> 
>> I am not sure if we should retroactively set the copyright for consolidation
>> code (it was not the case for some internal pthread consolidation).
>
> bits/ptrace-shared.h file is essentially a copy of sys/ptrace.h with
> __ptrace_request removed, this way it inherited the copyright notice, too.
>
> Do we reset copyright years in such cases?

I think we should keep the copyright range in this case.  As far as I
can tell,

  <https://www.gnu.org/prep/maintain/maintain.html#Copyright-Notices>

does not deal explicitly with this scenario, but it says:

| If you copy a file into the package from some other program, keep
| the copyright years that come with the file.