libgo patch committed: Correct types in __go_ptrace shim

libgo patch committed: Correct types in __go_ptrace shim

[Ian Lance Taylor]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

This libgo patch by Nikhil Benesch uses the correct types in the
__go_ptrace shim.  This makes them 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.
Bootstrapped and ran Go tests on x86_64-pc-linux-gnu.  Committed to
mainline.

Ian

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 911 bytes --]

f33ac3b0cd9f88be8faadded88e40a511f01c32a
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);
 }