From 1260f69aeb96f98ebefdbb852a4e868b8926eb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Date: Tue, 7 May 2019 13:57:40 +0200 Subject: [PATCH] syscall: remove ptrace syscall on ppc64 ptrace is available only for 32 bits programs. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/252558 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/syscall/libcall_aix.go | 3 --- libgo/go/syscall/syscall_aix_ppc.go | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index d17d39702c8..59b580f0956 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -5605a0727d3395becba1fbd4447807073984ec13 +99ab98d2ed8fa8a33947c52925f89b344d7cb8ae The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/syscall/libcall_aix.go b/libgo/go/syscall/libcall_aix.go index 8d9f59eb62f..27b469e1e47 100644 --- a/libgo/go/syscall/libcall_aix.go +++ b/libgo/go/syscall/libcall_aix.go @@ -16,9 +16,6 @@ const SYS_EXECVE = 0 //sys Openat(dirfd int, path string, flags int, mode uint32) (fd int, err error) //open64at(dirfd _C_int, path *byte, flags _C_int, mode Mode_t) _C_int -//sys ptrace(request int, id int, addr uintptr, data int, buff uintptr) (val int) -//ptrace(request _C_int, id int, addr uintptr, data _C_int, buff *byte) _C_int - //sys ptrace64(request int, id int64, addr int64, data int, buff uintptr) (err error) //ptrace64(request _C_int, id int64, addr int64, data _C_int, buff *byte) _C_int diff --git a/libgo/go/syscall/syscall_aix_ppc.go b/libgo/go/syscall/syscall_aix_ppc.go index 83ed1e64c3a..23333e89081 100644 --- a/libgo/go/syscall/syscall_aix_ppc.go +++ b/libgo/go/syscall/syscall_aix_ppc.go @@ -8,6 +8,9 @@ package syscall import "unsafe" +//sys ptrace(request int, id int, addr uintptr, data int, buff uintptr) (val int) +//ptrace(request _C_int, id int, addr uintptr, data _C_int, buff *byte) _C_int + // AIX does not define a specific structure but instead uses separate // ptrace calls for the different registers. type PtraceRegs struct {