runtime, net: fix build errors on AIX

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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index a8ba5a35e44df5ed76d81488258a04a89d2e3831..d17d39702c8ef5caf071b6338ca7fc52a545dbe2 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.

diff --git a/libgo/go/internal/cpu/cpu_no_init.go b/libgo/go/internal/cpu/cpu_no_init.go
index fb381e1ce2d61b3080ec58eb54727a509bfd3822..e7ff87383c3a7309516b003e13307cb2b466293c 100644 (file)
--- a/libgo/go/internal/cpu/cpu_no_init.go
+++ b/libgo/go/internal/cpu/cpu_no_init.go
@@ -6,6 +6,7 @@
 // +build !amd64
 // +build !arm
 // +build !arm64
+// +build !ppc
 // +build !ppc64
 // +build !ppc64le
 // +build !s390x

diff --git a/libgo/go/internal/cpu/cpu_ppc64x.go b/libgo/go/internal/cpu/cpu_ppc64x.go
deleted file mode 100644 (file)
index b726cc8..0000000
--- a/libgo/go/internal/cpu/cpu_ppc64x.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ppc64 ppc64le
-
-package cpu
-
-// ppc64x doesn't have a 'cpuid' equivalent, so we rely on HWCAP/HWCAP2.
-// These are initialized by archauxv and should not be changed after they are
-// initialized.
-// On aix/ppc64, these values are initialized early in the runtime in runtime/os_aix.go.
-var HWCap uint
-var HWCap2 uint
-
-// HWCAP/HWCAP2 bits. These are exposed by the kernel.
-const (
-       // ISA Level
-       PPC_FEATURE2_ARCH_2_07 = 0x80000000
-       PPC_FEATURE2_ARCH_3_00 = 0x00800000
-
-       // CPU features
-       PPC_FEATURE2_DARN = 0x00200000
-       PPC_FEATURE2_SCV  = 0x00100000
-)
-
-func doinit() {
-       options = []option{
-               {Name: "darn", Feature: &PPC64.HasDARN},
-               {Name: "scv", Feature: &PPC64.HasSCV},
-               {Name: "power9", Feature: &PPC64.IsPOWER9},
-               {Name: "power8", Feature: &PPC64.IsPOWER8},
-       }
-
-       // HWCAP2 feature bits
-       PPC64.IsPOWER8 = isSet(HWCap2, PPC_FEATURE2_ARCH_2_07)
-       PPC64.IsPOWER9 = isSet(HWCap2, PPC_FEATURE2_ARCH_3_00)
-       PPC64.HasDARN = isSet(HWCap2, PPC_FEATURE2_DARN)
-       PPC64.HasSCV = isSet(HWCap2, PPC_FEATURE2_SCV)
-}
-
-func isSet(hwc uint, value uint) bool {
-       return hwc&value != 0
-}

diff --git a/libgo/go/internal/cpu/cpu_ppcx.go b/libgo/go/internal/cpu/cpu_ppcx.go
new file mode 100644 (file)
index 0000000..56ff875
--- /dev/null
+++ b/libgo/go/internal/cpu/cpu_ppcx.go
@@ -0,0 +1,44 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ppc ppc64 ppc64le
+
+package cpu
+
+// ppc64x doesn't have a 'cpuid' equivalent, so we rely on HWCAP/HWCAP2.
+// These are initialized by archauxv and should not be changed after they are
+// initialized.
+// On aix/ppc64, these values are initialized early in the runtime in runtime/os_aix.go.
+var HWCap uint
+var HWCap2 uint
+
+// HWCAP/HWCAP2 bits. These are exposed by the kernel.
+const (
+       // ISA Level
+       PPC_FEATURE2_ARCH_2_07 = 0x80000000
+       PPC_FEATURE2_ARCH_3_00 = 0x00800000
+
+       // CPU features
+       PPC_FEATURE2_DARN = 0x00200000
+       PPC_FEATURE2_SCV  = 0x00100000
+)
+
+func doinit() {
+       options = []option{
+               {Name: "darn", Feature: &PPC64.HasDARN},
+               {Name: "scv", Feature: &PPC64.HasSCV},
+               {Name: "power9", Feature: &PPC64.IsPOWER9},
+               {Name: "power8", Feature: &PPC64.IsPOWER8},
+       }
+
+       // HWCAP2 feature bits
+       PPC64.IsPOWER8 = isSet(HWCap2, PPC_FEATURE2_ARCH_2_07)
+       PPC64.IsPOWER9 = isSet(HWCap2, PPC_FEATURE2_ARCH_3_00)
+       PPC64.HasDARN = isSet(HWCap2, PPC_FEATURE2_DARN)
+       PPC64.HasSCV = isSet(HWCap2, PPC_FEATURE2_SCV)
+}
+
+func isSet(hwc uint, value uint) bool {
+       return hwc&value != 0
+}

diff --git a/libgo/go/net/interface_aix.go b/libgo/go/net/interface_aix.go
index f57c5ff6622c6350aec03408f460b9f5fa21f3b5..bd5538699bb7eb55a0b4e68828c8de00096a62f1 100644 (file)
--- a/libgo/go/net/interface_aix.go
+++ b/libgo/go/net/interface_aix.go
@@ -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 {

diff --git a/libgo/go/runtime/os_aix.go b/libgo/go/runtime/os_aix.go
index b337330c8f276b5441be35173265131c4cb680fb..951aeb6cffd7d59517dc2ac677c99c64d0ac8527 100644 (file)
--- a/libgo/go/runtime/os_aix.go
+++ b/libgo/go/runtime/os_aix.go
@@ -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
 )

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index bd2ba32cba1b58c9fc8fb54d055eb2d3089ab94c..9671e394cb8cd8739a4db75e2b7e4fe92804b113 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -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/' \

diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
index 764055971289a7444eda81bb2b432c99818060dd..6ea990f471ad332d192c5ecbd480745e35c0a40a 100644 (file)
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
@@ -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)