diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/configure | 56 | ||||
| -rw-r--r-- | libgo/configure.ac | 3 | ||||
| -rw-r--r-- | libgo/runtime/go-now.c | 8 |
4 files changed, 63 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3ccd3fc..4097bab 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f79db38cf3484b63f7807abef05eecb23e9d0806 +b839c8c35af49bd6d86306ad34449654a4657cb1 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/configure b/libgo/configure index eb37e29..e024b2f 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 6e23a85..6eddb86 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 ea8d070..d24e6ee 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; } |