OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR other/29842 ([meta-bug] outstanding patches / issues from STMicroelectronics)

Browse Source 
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
This commit is contained in:
Ian Lance Taylor 2019-12-06 19:37:39 +00:00
parent 1a880ef211
commit 5ec7a413d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

10
libgo/go/runtime/os_hurd.go
View File

@ -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")
}
}