diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-varargs.c | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c index 9cb4a7e..d8f7dc5 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); } |