summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-12-09 18:03:53 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-12-09 18:03:53 +0000
commit763c9f4a8544318998c7adf04e4c92e9a4b85614 (patch)
treec6db505f350b0501e4ee3fe78e87b003a7977171 /gcc/go
parentb5b2e3879db9a251a2e7ff2553e188682d202c7e (diff)
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
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 009a8662835..93e29b71b9a 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.