summaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-21 01:27:44 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-21 01:27:44 +0000
commit2b19d6878472189bbd622199ca90f23fb7f5129d (patch)
treece90880ae1cd1318680980381769544c90f941c8 /libgo
parent30adea30570840d9b4bcbd1cf7786f19ecf2e06d (diff)
downloadlinaro-gcc-2b19d6878472189bbd622199ca90f23fb7f5129d.tar.gz
linaro-gcc-2b19d6878472189bbd622199ca90f23fb7f5129d.tar.bz2
linaro-gcc-2b19d6878472189bbd622199ca90f23fb7f5129d.zip
PR go/66574
runtime: Use clock_gettime to get current time. Fetch the current time in nanoseconds, not microseconds, by using clock_gettime rather than gettimeofday. Update golang/go#11222. Fixes https://gcc.gnu.org/PR66574. Reviewed-on: https://go-review.googlesource.com/17156 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230694 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rwxr-xr-xlibgo/configure56
-rw-r--r--libgo/configure.ac3
-rw-r--r--libgo/runtime/go-now.c8
3 files changed, 62 insertions, 5 deletions
diff --git a/libgo/configure b/libgo/configure
index eb37e29d2f8..e024b2f4b62 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -14479,6 +14479,62 @@ if test "$ac_res" != no; then :
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
+$as_echo_n "checking for library containing clock_gettime... " >&6; }
+if test "${ac_cv_search_clock_gettime+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime ();
+int
+main ()
+{
+return clock_gettime ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' rt; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_clock_gettime=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if test "${ac_cv_search_clock_gettime+set}" = set; then :
+ break
+fi
+done
+if test "${ac_cv_search_clock_gettime+set}" = set; then :
+
+else
+ ac_cv_search_clock_gettime=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
+$as_echo "$ac_cv_search_clock_gettime" >&6; }
+ac_res=$ac_cv_search_clock_gettime
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 6e23a85fa6d..6eddb860974 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -501,9 +501,10 @@ PTHREAD_LIBS=
AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
AC_SUBST(PTHREAD_LIBS)
-dnl Test if -lrt is required for sched_yield and/or nanosleep.
+dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
AC_SEARCH_LIBS([sched_yield], [rt])
AC_SEARCH_LIBS([nanosleep], [rt])
+AC_SEARCH_LIBS([clock_gettime], [rt])
AC_C_BIGENDIAN
diff --git a/libgo/runtime/go-now.c b/libgo/runtime/go-now.c
index ea8d070e9f3..d24e6ee76af 100644
--- a/libgo/runtime/go-now.c
+++ b/libgo/runtime/go-now.c
@@ -13,11 +13,11 @@
struct time_now_ret
now()
{
- struct timeval tv;
+ struct timespec ts;
struct time_now_ret ret;
- gettimeofday (&tv, NULL);
- ret.sec = tv.tv_sec;
- ret.nsec = tv.tv_usec * 1000;
+ clock_gettime (CLOCK_REALTIME, &ts);
+ ret.sec = ts.tv_sec;
+ ret.nsec = ts.tv_nsec;
return ret;
}