| Message ID | 20171227034622.GB32108@altlinux.org |
|---|---|
| State | New |
| Headers | show |
| Series | update sys/ptrace.h [BZ #22433] | expand |
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.
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?
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.
* 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.
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