summaryrefslogtreecommitdiffstats
path: root/libgo
diff options
context:
space:
mode:
authorClément Chigot <clement.chigot@atos.net>2022-03-01 09:29:37 +0100
committerIan Lance Taylor <iant@golang.org>2022-03-04 10:19:50 -0800
commit6be8281c16e14e8a06057a38c01d80e56c14fdb3 (patch)
treeefef0cbe3b3cf9561709064b72046b7ed34d4782 /libgo
parentDarwin: Fix a type mismatch warning for a non-GCC bootstrap compiler. (diff)
downloadgcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.tar.gz
gcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.tar.bz2
gcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.tar.xz
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.go2
-rw-r--r--libgo/go/os/user/listgroups_unix.go1
-rw-r--r--libgo/go/runtime/malloc.go2
-rw-r--r--libgo/go/runtime/os_aix.go1
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 (
12//extern __go_ioctl_ptr 12//extern __go_ioctl_ptr
13func ioctl(int32, int32, unsafe.Pointer) int32 13func ioctl(int32, int32, unsafe.Pointer) int32
14 14
15func Ioctl(fd int, cmd int, args uintptr) (err error) { 15func Ioctl(fd int, cmd int, args unsafe.Pointer) (err error) {
16 if ioctl(int32(fd), int32(cmd), unsafe.Pointer(args)) < 0 { 16 if ioctl(int32(fd), int32(cmd), unsafe.Pointer(args)) < 0 {
17 return syscall.GetErrno() 17 return syscall.GetErrno()
18 } 18 }
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 (
14 "io" 14 "io"
15 "os" 15 "os"
16 "strconv" 16 "strconv"
17 "syscall"
18) 17)
19 18
20const groupFile = "/etc/group" 19const 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 (
321 // 321 //
322 // On other platforms, the user address space is contiguous 322 // On other platforms, the user address space is contiguous
323 // and starts at 0, so no offset is necessary. 323 // and starts at 0, so no offset is necessary.
324 arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix 324 arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix*goarch.IsPpc64
325 // A typed version of this constant that will make it into DWARF (for viewcore). 325 // A typed version of this constant that will make it into DWARF (for viewcore).
326 arenaBaseOffsetUintptr = uintptr(arenaBaseOffset) 326 arenaBaseOffsetUintptr = uintptr(arenaBaseOffset)
327 327
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 @@
7package runtime 7package runtime
8 8
9import ( 9import (
10 "internal/abi"
11 "unsafe" 10 "unsafe"
12) 11)
13 12