summaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-15 00:29:06 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-10-15 00:29:06 +0000
commitecc0b0cee14466e780b78b19758a3b2f0be4e798 (patch)
tree156c9d476a537c240533dedcf79341b37bcdf5d9 /gcc/go/gofrontend/MERGE
parent4537dbd222bb31bd1a6e997c3839ba0fec347c90 (diff)
downloadgcc-ecc0b0cee14466e780b78b19758a3b2f0be4e798.tar.gz
runtime: copy runtime package time code from Go 1.7
Fix handling of function values for -fgo-c-header to generate FuncVal*, not simply FuncVal. While we're here change runtime.nanotime to use clock_gettime with CLOCK_MONOTONIC, rather than gettimeofday. This is what the gc library does. It provides nanosecond precision and a monotonic clock. Reviewed-on: https://go-review.googlesource.com/31232 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@241197 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go/gofrontend/MERGE')
-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 2e09ec1db85..7d0643c7c4b 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ec3dc927da71d15cac48a13c0fb0c1f94572d0d2
+880cb0a45590d992880fc6aabc7484e54c817eeb
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.