[PATCH] Fix gdb.base/attach-twice.c build on NetBSD
Simon Marchi
simark@simark.ca
Fri Apr 17 22:19:23 GMT 2020
On 2020-04-17 5:50 p.m., Kamil Rytarowski wrote:
> Add a fallback definition of PTRACE_ATTACH that is an alias of
> PT_ATTACH. Change the 4th argument of ptrace(2) to 0 as it is
> compatible with void * (Linux) and int (NetBSD) arguments.
>
> Include <sys/types.h> for <sys/ptrace.h>.
>
> gdb/testsuite/ChangeLog:
>
> * gdb.base/attach-twice.c: Include "sys/types.h".
> (PTRACE_ATTACH): Add fallback definition.
> (main): Pass `0' to the 4th argument of `ptrace'.
> ---
> gdb/testsuite/ChangeLog | 6 ++++++
> gdb/testsuite/gdb.base/attach-twice.c | 9 ++++++++-
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
> index 44ada371679..b24efc772b2 100644
> --- a/gdb/testsuite/ChangeLog
> +++ b/gdb/testsuite/ChangeLog
> @@ -1,3 +1,9 @@
> +2020-04-17 Kamil Rytarowski <n54@gmx.com>
> +
> + * gdb.base/attach-twice.c: Include "sys/types.h".
> + (PTRACE_ATTACH): Add fallback definition.
> + (main): Pass `0' to the 4th argument of `ptrace'.
> +
> 2020-04-17 Kamil Rytarowski <n54@gmx.com>
>
> * gdb.base/fork-running-state.c: Include "signal.h".
> diff --git a/gdb/testsuite/gdb.base/attach-twice.c b/gdb/testsuite/gdb.base/attach-twice.c
> index 9299b3abf81..31cd087453f 100644
> --- a/gdb/testsuite/gdb.base/attach-twice.c
> +++ b/gdb/testsuite/gdb.base/attach-twice.c
> @@ -18,9 +18,14 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <unistd.h>
> +#include <sys/types.h>
> #include <sys/ptrace.h>
> #include <errno.h>
>
> +#ifndef PTRACE_ATTACH
> +#define PTRACE_ATTACH PT_ATTACH
> +#endif
> +
> int
> main (void)
> {
> @@ -33,7 +38,9 @@ main (void)
> exit (1);
> case 0:
> errno = 0;
> - ptrace (PTRACE_ATTACH, getppid (), NULL, NULL);
> + /* The 4th argument to ptrace () is 0 on purpose, as it is compatible
> + between kernels that accept void* (like Linux) and int (NetBSD). */
> + ptrace (PTRACE_ATTACH, getppid (), NULL, 0);
> if (errno != 0)
> perror ("PTRACE_ATTACH");
> break;
> --
> 2.25.0
>
Thanks, this is ok.
Simon
More information about the Gdb-patches
mailing list