diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-12-06 19:37:39 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-12-06 19:37:39 +0000 |
| commit | 5ec7a413d154508c70cf4570ee8da0a545bd6b4a (patch) | |
| tree | 60ed50a5bdb7b3a50e47cb83a46f583f26cbe4e2 | |
| parent | 1a880ef2110aaa2c03b6eb88ef792d324b89f566 (diff) | |
| download | gcc-5ec7a413d154508c70cf4570ee8da0a545bd6b4a.zip gcc-5ec7a413d154508c70cf4570ee8da0a545bd6b4a.tar.gz gcc-5ec7a413d154508c70cf4570ee8da0a545bd6b4a.tar.bz2 | |
re PR other/29842 ([meta-bug] outstanding patches / issues from STMicroelectronics)
PR go/29842
runtime: update HURD support for mOS now being embedded
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/210285
From-SVN: r279062
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/os_hurd.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 6d61cd1..e5e555d 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -e32651d37e0c43bb7595ac94363b079610bed746 +f04751699e1a1ce98fe8bdbcce5a00f1be6a7d15 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/runtime/os_hurd.go b/libgo/go/runtime/os_hurd.go index 5be5a1d..2a09e12 100644 --- a/libgo/go/runtime/os_hurd.go +++ b/libgo/go/runtime/os_hurd.go @@ -39,7 +39,7 @@ func sem_timedwait(sem *_sem_t, timeout *timespec) int32 //go:nosplit func semacreate(mp *m) { - if mp.mos.waitsema != 0 { + if mp.waitsema != 0 { return } @@ -52,7 +52,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 @@ -62,7 +62,7 @@ func semasleep(ns int64) int32 { var ts timespec ts.setNsec(ns) - if sem_timedwait((*_sem_t)(unsafe.Pointer(_m_.mos.waitsema)), &ts) != 0 { + if sem_timedwait((*_sem_t)(unsafe.Pointer(_m_.waitsema)), &ts) != 0 { err := errno() if err == _ETIMEDOUT || err == _EAGAIN || err == _EINTR { return -1 @@ -72,7 +72,7 @@ func semasleep(ns int64) int32 { return 0 } for { - r1 := sem_wait((*_sem_t)(unsafe.Pointer(_m_.mos.waitsema))) + r1 := sem_wait((*_sem_t)(unsafe.Pointer(_m_.waitsema))) if r1 == 0 { break } @@ -86,7 +86,7 @@ func semasleep(ns int64) int32 { //go:nosplit func semawakeup(mp *m) { - if sem_post((*_sem_t)(unsafe.Pointer(mp.mos.waitsema))) != 0 { + if sem_post((*_sem_t)(unsafe.Pointer(mp.waitsema))) != 0 { throw("sem_post") } } |