From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <krytarowski@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2023)
 id F004D385B835; Fri, 17 Apr 2020 22:20:22 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F004D385B835
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Kamil Rytarowski <krytarowski@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] Fix gdb.base/attach-twice.c build on NetBSD
X-Act-Checkin: binutils-gdb
X-Git-Author: Kamil Rytarowski <n54@gmx.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 2bed205e44ad853f10416e970de2534554f8cf18
X-Git-Newrev: 4ddfec930ca5bd57800ebc71daef66f685a6de4d
Message-Id: <20200417222022.F004D385B835@sourceware.org>
Date: Fri, 17 Apr 2020 22:20:22 +0000 (GMT)
X-BeenThere: gdb-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-cvs mailing list <gdb-cvs.sourceware.org>
List-Unsubscribe: <http://sourceware.org/mailman/options/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-cvs/>
List-Help: <mailto:gdb-cvs-request@sourceware.org?subject=help>
List-Subscribe: <http://sourceware.org/mailman/listinfo/gdb-cvs>,
 <mailto:gdb-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Apr 2020 22:20:23 -0000

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4ddfec930ca5bd57800ebc71daef66f685a6de4d

commit 4ddfec930ca5bd57800ebc71daef66f685a6de4d
Author: Kamil Rytarowski <n54@gmx.com>
Date:   Fri Apr 17 18:39:42 2020 +0200

    Fix gdb.base/attach-twice.c build on NetBSD
    
    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'.

Diff:
---
 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;