aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNikhil Benesch <nikhil.benesch@gmail.com>2020-10-14 19:02:12 +0000
committerIan Lance Taylor <iant@golang.org>2020-10-15 13:36:08 -0700
commitf33ac3b0cd9f88be8faadded88e40a511f01c32a (patch)
tree2bfe6904b72aec7c19c177182fd8966d35f6653a /gcc
parent6949fbefe28134744a86c5d7b8d9c17fcf3a16a0 (diff)
downloadgcc-f33ac3b0cd9f88be8faadded88e40a511f01c32a.zip
gcc-f33ac3b0cd9f88be8faadded88e40a511f01c32a.tar.gz
gcc-f33ac3b0cd9f88be8faadded88e40a511f01c32a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index a7e6a72..5355103 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.