From: Nikhil Benesch <nikhil.benesch@gmail.com>
Date: Wed, 14 Oct 2020 19:02:12 +0000 (+0000)
Subject: runtime: use correct types in __go_ptrace shim
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f33ac3b0cd9f88be8faadded88e40a511f01c32a;p=gcc.git

runtime: use correct types in __go_ptrace shim

Make the types of the addr and data arguments in the __go_ptrace shim
match the types declared in Go and the types declared by the C ptrace
function, i.e., void*. This avoids a warning about an implicit
int-to-pointer cast on some platforms.

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/262340
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index a7e6a7257f0..53551030eae 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-d36e74c7a1aa94fc5cf393dc705b8a1271cb01c7
+71e161daafa1e19c2c53e28fffc3954d88a4cdb2
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
index 9cb4a7e79bd..d8f7dc55ea4 100644
--- a/libgo/runtime/go-varargs.c
+++ b/libgo/runtime/go-varargs.c
@@ -122,7 +122,7 @@ __go_syscall6(uintptr_t flag, uintptr_t a1, uintptr_t a2, uintptr_t a3,
 // a variadic function within glibc.
 
 long
-__go_ptrace(int request, pid_t pid, uintptr_t addr, uintptr_t data)
+__go_ptrace(int request, pid_t pid, void *addr, void *data)
 {
   return ptrace (request, pid, addr, data);
 }