Update the return type of gdb_ptrace to be more flexible

Linux returns long from ptrace(2) and BSDs int.

gdb/ChangeLog:

       * amd64-bsd-nat.c (gdb_ptrace): Change return type from `int' to
       `PTRACE_TYPE_RET'.
       * i386-bsd-nat.c (gdb_ptrace): Likewise.
       * sparc-nat.c (gdb_ptrace): Likewise.
       * x86-bsd-nat.c (gdb_ptrace): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1be14b15d185db272902ab985b27707651a7b0ef..650b74bae4ad3f752153da14e1b0f2dd2c2d178e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2020-03-20  Kamil Rytarowski  <n54@gmx.com>
+
+       * amd64-bsd-nat.c (gdb_ptrace): Change return type from `int' to
+       `PTRACE_TYPE_RET'.
+       * i386-bsd-nat.c (gdb_ptrace): Likewise.
+       * sparc-nat.c (gdb_ptrace): Likewise.
+       * x86-bsd-nat.c (gdb_ptrace): Likewise.
+
 2020-03-20  Tom Tromey  <tromey@adacore.com>
 
        * c-exp.y (lex_one_token): Fix assert.

diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c
index 1ff044ff470bd59449b0ae46a951102c90492c89..04322c70378751900bc8145013a76d3bf96ce915 100644 (file)
--- a/gdb/amd64-bsd-nat.c
+++ b/gdb/amd64-bsd-nat.c
@@ -36,7 +36,7 @@
 #include "amd64-bsd-nat.h"
 \f
 
-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr,
            PTRACE_TYPE_ARG4 data)
 {

diff --git a/gdb/i386-bsd-nat.c b/gdb/i386-bsd-nat.c
index 3250dab737fec2fd394c530e48912ebe2e98f07a..4e8693246c87088881afd5a361c5803d2743116d 100644 (file)
--- a/gdb/i386-bsd-nat.c
+++ b/gdb/i386-bsd-nat.c
@@ -34,7 +34,7 @@
 #include "inf-ptrace.h"
 \f
 
-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr,
            PTRACE_TYPE_ARG4 data)
 {

diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index fadcfd344740013494abc64deed314ef8bebcf64..8d5bf350bdbb30a8ee03a423067f2f84678c5b32 100644 (file)
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -78,7 +78,7 @@ typedef struct fp_status fpregset_t;
 #define PTRACE_SETFPREGS PT_SETFPREGS
 #endif
 
-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr)
 {
 #ifdef __NetBSD__

diff --git a/gdb/x86-bsd-nat.c b/gdb/x86-bsd-nat.c
index 9e2bea1e0208638b3453e1191bb1f540bb075114..e2ebf5f2e5049b9d191988eac17b879b154011b3 100644 (file)
--- a/gdb/x86-bsd-nat.c
+++ b/gdb/x86-bsd-nat.c
@@ -33,7 +33,7 @@
 #include "inf-ptrace.h"
 \f
 
-static int
+static PTRACE_TYPE_RET
 gdb_ptrace (PTRACE_TYPE_ARG1 request, ptid_t ptid, PTRACE_TYPE_ARG3 addr)
 {
 #ifdef __NetBSD__