summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-11-21 01:03:55 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-11-21 01:03:55 +0000
commit025f56b7d3061631ce5210520beb0cb7d2764e47 (patch)
tree6734a4acb537947bc8cccc8a177934bfa35084e6 /gcc/go
parentb69d4d4542d718e9010a71f0b05e20422b3f0d40 (diff)
mksysinfo: use type aliases for time struct field types
Also fix a case where grep wasn't redirecting to /dev/null. Fixes golang/go#35713 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/208160 From-SVN: r278539
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 4eab78b36b4..7050d78103e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-245904ac148f15db530fb8d50f526c47d08024c5
+9cc7092b84c38d77d98ed856f1f613a6ca27122d
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.