aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-10-15 00:29:06 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-10-15 00:29:06 +0000
commit35d942444418606e75f2e65aa7708616c5233035 (patch)
tree156c9d476a537c240533dedcf79341b37bcdf5d9 /gcc
parent2a0b23da0560f4d321e28ae3673cd130ebf0e8f8 (diff)
downloadgcc-35d942444418606e75f2e65aa7708616c5233035.zip
gcc-35d942444418606e75f2e65aa7708616c5233035.tar.gz
gcc-35d942444418606e75f2e65aa7708616c5233035.tar.bz2
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 From-SVN: r241197
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/types.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 2e09ec1..7d0643c 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.
diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc
index 38613bb..d99c834 100644
--- a/gcc/go/gofrontend/types.cc
+++ b/gcc/go/gofrontend/types.cc
@@ -5928,7 +5928,7 @@ Struct_type::write_field_to_c_header(std::ostream& os, const std::string& name,
break;
case TYPE_FUNCTION:
- os << "FuncVal";
+ os << "FuncVal*";
break;
case TYPE_POINTER: