diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-10 20:41:04 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-10 20:41:04 +0000 |
| commit | efc864927f57fa1a4aa8d1f22e4071343f0b8cbb (patch) | |
| tree | 459ff147fd2603203e17c2a17dca1291399fbb51 /libgo/go/runtime | |
| parent | 4d7bfeec428c5bfd005bb6028221c22e5a8abcdf (diff) | |
| download | gcc-efc864927f57fa1a4aa8d1f22e4071343f0b8cbb.zip gcc-efc864927f57fa1a4aa8d1f22e4071343f0b8cbb.tar.gz gcc-efc864927f57fa1a4aa8d1f22e4071343f0b8cbb.tar.bz2 | |
libgo: Solaris and x/sys/cpu compatibility fixes
Restore Solaris compatibility fixes lost when internal/x/net/lif moved
to golang.org/x/net/lif. Also fix the Makefile for x/net/lif and
x/net/route.
Change x/sys/cpu to get the cache line size from goarch.sh as the
gofrontend version of internal/cpu does.
Partially based on work by Rainer Orth.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/194438
From-SVN: r275611
Diffstat (limited to 'libgo/go/runtime')
| -rw-r--r-- | libgo/go/runtime/os_solaris.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libgo/go/runtime/os_solaris.go b/libgo/go/runtime/os_solaris.go index ea72393..63b5cd7 100644 --- a/libgo/go/runtime/os_solaris.go +++ b/libgo/go/runtime/os_solaris.go @@ -31,7 +31,7 @@ func sem_reltimedwait_np(sem *semt, timeout *timespec) int32 //go:nosplit func semacreate(mp *m) { - if mp.mos.waitsema != 0 { + if mp.waitsema != 0 { return } @@ -44,7 +44,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 @@ -54,7 +54,7 @@ func semasleep(ns int64) int32 { var ts timespec ts.setNsec(ns) - if sem_reltimedwait_np((*semt)(unsafe.Pointer(_m_.mos.waitsema)), &ts) != 0 { + if sem_reltimedwait_np((*semt)(unsafe.Pointer(_m_.waitsema)), &ts) != 0 { err := errno() if err == _ETIMEDOUT || err == _EAGAIN || err == _EINTR { return -1 @@ -64,7 +64,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 } @@ -78,7 +78,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") } } |