libgo: fix AIX build for the Go1.18 update
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/388635
This commit is contained in:
parent
25587472cc
commit
6be8281c16
|
@ -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.
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@ import (
|
|||
"io"
|
||||
"os"
|
||||
"strconv"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
const groupFile = "/etc/group"
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
package runtime
|
||||
|
||||
import (
|
||||
"internal/abi"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue