libgo: fix AIX build for the Go1.18 update

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/388635

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 424bbebfeeda485f8f8d2114d86e7fef29974418..5cf2ace711b64c70cfea9b7da20ad443f4a02b95 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-45fd14ab8baf5e86012a808426f8ef52c1d77943
+34dece725f9f8826f4abe86209112626867bc716
 
 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/internal/syscall/unix/ioctl_aix.go b/libgo/go/internal/syscall/unix/ioctl_aix.go
index af105d6158ba3d59fb3060fd5e52f41adbb863c3..1a768048ba8f884c2947a8c6d9f21ee5aa330e26 100644 (file)
--- 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 b3cf839b3ece0cea62c0d5de3de7a421f0b30e40..af9b544bcbec554fdae1f8559fcf8d626eb58adb 100644 (file)
--- 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 e5ab8dedafa85522f470b2fcc6c11bc53b2f1585..7c019ee42d363c6f6156f601a965c3268f28ed0a 100644 (file)
--- 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 d43765ab884ddc5cf6c17c795155dedd9c8f966b..943cd2205d1754612483deb366141d772a21f0bb 100644 (file)
--- a/libgo/go/runtime/os_aix.go
+++ b/libgo/go/runtime/os_aix.go
@@ -7,7 +7,6 @@
 package runtime
 
 import (
-       "internal/abi"
        "unsafe"
 )