From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26275 invoked by alias); 29 Dec 2017 13:07:51 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 26261 invoked by uid 89); 29 Dec 2017 13:07:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f193.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=u6NWON6Q2EG5Q3YPOR6DprsjWmBHU73zLTDlztz1uuc=; b=UMQ/bc3YEEuuyLLIXpPwsF2A0lv9Db6OZiaIcZMtBK4XgQ1eh9SJZUtsKNtt7TPO0J lv6FlidHID3iyR3VHBDEkiwrPly8N8nMhFxcdc8indEyDlz0KgXJf+pHvOnCN2tJjO+W c0wbmISJKXWyELqwiUYvTgTxvyKNHrOCnVtdnpVdqc3W+yCyyRHG6Iesk+uRkk7EGpyu D/3pmU9B5NMK371JIu7gXWhasmm31EhyOAjHx5bU1nWvZ/+TPgCloNG0CFmpGspWDiAM TKpPeEv30HmvLgO90Vv+TXb+ty7zNmgx+gkfbNUElyK6W6FyIuym/ME5Aoo9IZ4+uwn/ K85g== X-Gm-Message-State: AKGB3mLNGxJ3fF4iyWs1hfQtLyJa87vYWjKP5LXGuZPUz1rxaBLOFzfT ypW3FVLffdBdSRmFiX/klnxyG4xp0Vw= X-Google-Smtp-Source: ACJfBosxz2xg6lUj9SuvxqbW+Jp6LNWMDKBRtu1p7lSgWhbrKBnNevcUVqwuaaKCqXiLm9SQbuinSg== X-Received: by 10.200.17.147 with SMTP id d19mr2407235qtj.327.1514552864878; Fri, 29 Dec 2017 05:07:44 -0800 (PST) Subject: Re: [PATCH 1/3] linux: move a shared part of sys/ptrace.h to bits/ptrace-shared.h To: libc-alpha@sourceware.org References: <20171227034622.GB32108@altlinux.org> From: Adhemerval Zanella Message-ID: Date: Fri, 29 Dec 2017 13:07:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20171227034622.GB32108@altlinux.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2017-12/txt/msg00950.txt.bz2 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 . > (__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 > . > (__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 > --- > 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 > > __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 > + . */ > + > +#ifndef _SYS_PTRACE_H > +# error "Never use directly; include 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 > > __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 > > __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 > > __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 > > __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 > > __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 , 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 > > __END_DECLS > > Ok.