From 6be8281c16e14e8a06057a38c01d80e56c14fdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= <clement.chigot@atos.net>
Date: Tue, 1 Mar 2022 09:29:37 +0100
Subject: libgo: fix AIX build for the Go1.18 update

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/388635
---
 libgo/go/internal/syscall/unix/ioctl_aix.go | 2 +-
 libgo/go/os/user/listgroups_unix.go         | 1 -
 libgo/go/runtime/malloc.go                  | 2 +-
 libgo/go/runtime/os_aix.go                  | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'libgo/go')

diff --git a/libgo/go/internal/syscall/unix/ioctl_aix.go b/libgo/go/internal/syscall/unix/ioctl_aix.go
index af105d6..1a76804 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 b3cf839..af9b544 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 e5ab8de..7c019ee 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 d43765a..943cd22 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"
 )
 
-- 
cgit v1.1