diff options
| author | Clément Chigot <clement.chigot@atos.net> | 2022-03-01 09:29:37 +0100 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-03-04 10:19:50 -0800 |
| commit | 6be8281c16e14e8a06057a38c01d80e56c14fdb3 (patch) | |
| tree | efef0cbe3b3cf9561709064b72046b7ed34d4782 /libgo | |
| parent | 25587472ccd223c861fe77cfeca4ba33c3f6cd99 (diff) | |
| download | gcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.tar.gz | |
libgo: fix AIX build for the Go1.18 update
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/388635
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/internal/syscall/unix/ioctl_aix.go | 2 | ||||
| -rw-r--r-- | libgo/go/os/user/listgroups_unix.go | 1 | ||||
| -rw-r--r-- | libgo/go/runtime/malloc.go | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/os_aix.go | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/libgo/go/internal/syscall/unix/ioctl_aix.go b/libgo/go/internal/syscall/unix/ioctl_aix.go index af105d6158b..1a768048ba8 100644 --- a/libgo/go/internal/syscall/unix/ioctl_aix.go +++ b/libgo/go/internal/syscall/unix/ioctl_aix.go @@ -12,7 +12,7 @@ import ( //extern __go_ioctl_ptr func ioctl(int32, int32, unsafe.Pointer) int32 -func Ioctl(fd int, cmd int, args uintptr) (err error) { +func Ioctl(fd int, cmd int, args unsafe.Pointer) (err error) { if ioctl(int32(fd), int32(cmd), unsafe.Pointer(args)) < 0 { return syscall.GetErrno() } diff --git a/libgo/go/os/user/listgroups_unix.go b/libgo/go/os/user/listgroups_unix.go index b3cf839b3ec..af9b544bcbe 100644 --- a/libgo/go/os/user/listgroups_unix.go +++ b/libgo/go/os/user/listgroups_unix.go @@ -14,7 +14,6 @@ import ( "io" "os" "strconv" - "syscall" ) const groupFile = "/etc/group" diff --git a/libgo/go/runtime/malloc.go b/libgo/go/runtime/malloc.go index e5ab8dedafa..7c019ee42d3 100644 --- a/libgo/go/runtime/malloc.go +++ b/libgo/go/runtime/malloc.go @@ -321,7 +321,7 @@ const ( // // On other platforms, the user address space is contiguous // and starts at 0, so no offset is necessary. - arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix + arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix*goarch.IsPpc64 // A typed version of this constant that will make it into DWARF (for viewcore). arenaBaseOffsetUintptr = uintptr(arenaBaseOffset) diff --git a/libgo/go/runtime/os_aix.go b/libgo/go/runtime/os_aix.go index d43765ab884..943cd2205d1 100644 --- a/libgo/go/runtime/os_aix.go +++ b/libgo/go/runtime/os_aix.go @@ -7,7 +7,6 @@ package runtime import ( - "internal/abi" "unsafe" ) |