* [PATCH] Fix gdb.base/attach-twice.c build on NetBSD
@ 2020-04-17 16:49 Kamil Rytarowski
2020-04-17 20:18 ` Simon Marchi
2020-04-17 21:50 ` Kamil Rytarowski
0 siblings, 2 replies; 4+ messages in thread
From: Kamil Rytarowski @ 2020-04-17 16:49 UTC (permalink / raw)
To: gdb-patches
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 | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eaa96b06e76..81c555834ae 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-16 Tom de Vries <tdevries@suse.de>
PR symtab/25791
diff --git a/gdb/testsuite/gdb.base/attach-twice.c b/gdb/testsuite/gdb.base/attach-twice.c
index 9299b3abf81..cdefc53c9d8 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,7 @@ main (void)
exit (1);
case 0:
errno = 0;
- ptrace (PTRACE_ATTACH, getppid (), NULL, NULL);
+ ptrace (PTRACE_ATTACH, getppid (), NULL, 0);
if (errno != 0)
perror ("PTRACE_ATTACH");
break;
--
2.25.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix gdb.base/attach-twice.c build on NetBSD
2020-04-17 16:49 [PATCH] Fix gdb.base/attach-twice.c build on NetBSD Kamil Rytarowski
@ 2020-04-17 20:18 ` Simon Marchi
2020-04-17 21:50 ` Kamil Rytarowski
1 sibling, 0 replies; 4+ messages in thread
From: Simon Marchi @ 2020-04-17 20:18 UTC (permalink / raw)
To: Kamil Rytarowski, gdb-patches
On 2020-04-17 12:49 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 | 7 ++++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
> index eaa96b06e76..81c555834ae 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-16 Tom de Vries <tdevries@suse.de>
>
> PR symtab/25791
> diff --git a/gdb/testsuite/gdb.base/attach-twice.c b/gdb/testsuite/gdb.base/attach-twice.c
> index 9299b3abf81..cdefc53c9d8 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,7 @@ main (void)
> exit (1);
> case 0:
> errno = 0;
> - ptrace (PTRACE_ATTACH, getppid (), NULL, NULL);
> + ptrace (PTRACE_ATTACH, getppid (), NULL, 0);
I don't really mind to take this shortcut, since this is some test
code. However, if you want to avoid somebody "cleaning" it and
putting back NULL, you should put a comment.
Simon
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Fix gdb.base/attach-twice.c build on NetBSD
2020-04-17 16:49 [PATCH] Fix gdb.base/attach-twice.c build on NetBSD Kamil Rytarowski
2020-04-17 20:18 ` Simon Marchi
@ 2020-04-17 21:50 ` Kamil Rytarowski
2020-04-17 22:19 ` Simon Marchi
1 sibling, 1 reply; 4+ messages in thread
From: Kamil Rytarowski @ 2020-04-17 21:50 UTC (permalink / raw)
To: gdb-patches; +Cc: simark, Kamil Rytarowski
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix gdb.base/attach-twice.c build on NetBSD
2020-04-17 21:50 ` Kamil Rytarowski
@ 2020-04-17 22:19 ` Simon Marchi
0 siblings, 0 replies; 4+ messages in thread
From: Simon Marchi @ 2020-04-17 22:19 UTC (permalink / raw)
To: Kamil Rytarowski, gdb-patches
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-17 22:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-17 16:49 [PATCH] Fix gdb.base/attach-twice.c build on NetBSD Kamil Rytarowski
2020-04-17 20:18 ` Simon Marchi
2020-04-17 21:50 ` Kamil Rytarowski
2020-04-17 22:19 ` Simon Marchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).