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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 009a866283515d758378eb8284b3d0729aeb0e13..93e29b71b9afdc0b1f0c95342388e4e70899b6d3 100644 (file)
--- 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 fab17741c22694041e55134a24373093986e3078..bb3e7ffc0fadce83aaed9c2d3cc31f648203d95e 100644 (file)
--- 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
-)