From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 9 Dec 2019 18:03:53 +0000 (+0000)
Subject: re PR go/92861 (Passes relative time to sem_timedwait on GNU/Hurd)
X-Git-Tag: misc/cutover-git~630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=763c9f4a8544318998c7adf04e4c92e9a4b85614;p=thirdparty%2Fgcc.git

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 009a86628351..93e29b71b9af 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 fab17741c226..bb3e7ffc0fad 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
-)