diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-12-09 18:03:53 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-12-09 18:03:53 +0000 |
| commit | 763c9f4a8544318998c7adf04e4c92e9a4b85614 (patch) | |
| tree | c6db505f350b0501e4ee3fe78e87b003a7977171 | |
| parent | b5b2e3879db9a251a2e7ff2553e188682d202c7e (diff) | |
| download | gcc-763c9f4a8544318998c7adf04e4c92e9a4b85614.zip gcc-763c9f4a8544318998c7adf04e4c92e9a4b85614.tar.gz gcc-763c9f4a8544318998c7adf04e4c92e9a4b85614.tar.bz2 | |
re PR go/92861 (Passes relative time to sem_timedwait on GNU/Hurd)
PR go/92861
runtime: don't define CLOCK_REALTIME in os_hurd.go
It's already defined in sysinfo.go.
Patch by Samuel Thibault.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/210538
From-SVN: r279136
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/os_hurd.go | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 009a866..93e29b7 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -1da5ceb8daaab7a243fffd6a647554cf674716f8 +6f2bf15e15bf7516c393966577d72b79cba7f980 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 fab1774..bb3e7ff 100644 --- a/libgo/go/runtime/os_hurd.go +++ b/libgo/go/runtime/os_hurd.go @@ -125,7 +125,3 @@ func osinit() { physPageSize = uintptr(getPageSize()) } } - -const ( - _CLOCK_REALTIME = 0 -) |