runtime, net: fix build errors on AIX

Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/235158
This commit is contained in:
Clément Chigot 2020-05-26 11:31:37 +02:00 committed by Ian Lance Taylor
parent e41e66b78d
commit 63cd53d2f5
7 changed files with 24 additions and 11 deletions

View File

@ -1,4 +1,4 @@
b24062f0b2e8f6173731d5654afe0addf857270e
5605a0727d3395becba1fbd4447807073984ec13
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

View File

@ -6,6 +6,7 @@
// +build !amd64
// +build !arm
// +build !arm64
// +build !ppc
// +build !ppc64
// +build !ppc64le
// +build !s390x

View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build ppc64 ppc64le
// +build ppc ppc64 ppc64le
package cpu

View File

@ -33,8 +33,6 @@ const _RTAX_NETMASK = 2
const _RTAX_IFA = 5
const _RTAX_MAX = 8
const _SIOCGIFMTU = -0x3fd796aa
func getIfList() ([]byte, error) {
needed, err := syscall.Getkerninfo(_KINFO_RT_IFLIST, 0, 0, 0)
if err != nil {

View File

@ -46,7 +46,7 @@ func clock_gettime(clock_id int64, timeout *timespec) int32
//go:nosplit
func semacreate(mp *m) {
if mp.mos.waitsema != 0 {
if mp.waitsema != 0 {
return
}
@ -59,7 +59,7 @@ func semacreate(mp *m) {
if sem_init(sem, 0, 0) != 0 {
throw("sem_init")
}
mp.mos.waitsema = uintptr(unsafe.Pointer(sem))
mp.waitsema = uintptr(unsafe.Pointer(sem))
}
//go:nosplit
@ -85,7 +85,7 @@ func semasleep(ns int64) int32 {
ts.tv_sec = timespec_sec_t(sec)
ts.tv_nsec = timespec_nsec_t(nsec)
if sem_timedwait((*semt)(unsafe.Pointer(_m_.mos.waitsema)), &ts) != 0 {
if sem_timedwait((*semt)(unsafe.Pointer(_m_.waitsema)), &ts) != 0 {
err := errno()
if err == _ETIMEDOUT || err == _EAGAIN || err == _EINTR {
return -1
@ -96,7 +96,7 @@ func semasleep(ns int64) int32 {
return 0
}
for {
r1 := sem_wait((*semt)(unsafe.Pointer(_m_.mos.waitsema)))
r1 := sem_wait((*semt)(unsafe.Pointer(_m_.waitsema)))
if r1 == 0 {
break
}
@ -110,7 +110,7 @@ func semasleep(ns int64) int32 {
//go:nosplit
func semawakeup(mp *m) {
if sem_post((*semt)(unsafe.Pointer(mp.mos.waitsema))) != 0 {
if sem_post((*semt)(unsafe.Pointer(mp.waitsema))) != 0 {
throw("sem_post")
}
}
@ -128,7 +128,6 @@ const (
const (
// getsystemcfg constants
_SC_IMPL = 2
_IMPL_POWER8 = 0x10000
_IMPL_POWER9 = 0x20000
)

View File

@ -1041,9 +1041,16 @@ grep '^const _IFF' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(IFF[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
grep '^const _IFNAMSIZ' gen-sysinfo.go | \
sed -e 's/^\(const \)_\(IFNAMSIZ[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
grep '^const _SIOC' gen-sysinfo.go |
grep '^const _SIOC' gen-sysinfo.go | \
grep -v '_val =' | \
sed -e 's/^\(const \)_\(SIOC[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
if ! grep '^const SIOCGIFMTU' ${OUT} >/dev/null 2>&1; then
if grep '^const _SIOCGIFMTU_val' ${OUT} >/dev/null 2>&1; then
echo 'const SIOCGIFMTU = _SIOCGIFMTU_val' >> ${OUT}
fi
fi
# The ifaddrmsg struct.
grep '^type _ifaddrmsg ' gen-sysinfo.go | \
sed -e 's/_ifaddrmsg/IfAddrmsg/' \

View File

@ -281,6 +281,14 @@ enum {
#endif
};
// SIOCGIFMTU can't be added in the above enum as it might
// be signed in some OSes.
#ifdef SIOCGIFMTU
enum {
SIOCGIFMTU_val = SIOCGIFMTU,
};
#endif
#if defined(HAVE_SYS_EPOLL_H)
enum {
epoll_data_offset = offsetof(struct epoll_event, data)