From 05fbc5877488cc2c322291f22c89147e6e917238 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 28 Jun 2024 11:10:59 +0200 Subject: [PATCH] time: Fix test failure on FreeBSD. * m4/time.m4 (gl_FUNC_TIME): Guess no for FreeBSD in general. * doc/posix-functions/time.texi: Mention FreeBSD in general. --- ChangeLog | 6 ++++++ doc/posix-functions/time.texi | 5 ++++- m4/time.m4 | 11 +++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c79ef2842f..abc84f16e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-06-28 Bruno Haible + + time: Fix test failure on FreeBSD. + * m4/time.m4 (gl_FUNC_TIME): Guess no for FreeBSD in general. + * doc/posix-functions/time.texi: Mention FreeBSD in general. + 2024-06-25 Bruno Haible c-vasnprintf: Fix link errors. diff --git a/doc/posix-functions/time.texi b/doc/posix-functions/time.texi index 39a00d4370..804c2a3bfa 100644 --- a/doc/posix-functions/time.texi +++ b/doc/posix-functions/time.texi @@ -12,7 +12,10 @@ Portability problems fixed by Gnulib: This function is not consistent with @code{gettimeofday} and @code{timespec_get} on some platforms: @c https://sourceware.org/bugzilla/show_bug.cgi?id=30200 -glibc 2.31 or newer on Linux, FreeBSD 12.2/sparc64, AIX 7.2, native Windows. +glibc 2.31 or newer on Linux, +@c Only seen on machines with 2 or more CPUs. +FreeBSD 14.0, +AIX 7.2, native Windows. Namely, in the first 1 to 2.5 milliseconds of every second (or, on AIX and Windows, in the first 5 milliseconds of every second), @code{time} returns a value that is one less than the @code{tv_sec} part of the return value of diff --git a/m4/time.m4 b/m4/time.m4 index 6f2347b2f1..ca5a5b7e15 100644 --- a/m4/time.m4 +++ b/m4/time.m4 @@ -1,4 +1,4 @@ -# time.m4 serial 5 +# time.m4 serial 6 dnl Copyright (C) 2023-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_TIME], dnl - glibc >= 2.31 with Linux. And binaries produced on glibc < 2.31 dnl need to run fine on newer glibc versions as well; therefore ignore dnl __GLIBC_MINOR__. - dnl - FreeBSD/sparc, + dnl - FreeBSD, on machines with 2 or more CPUs, dnl - AIX, dnl - native Windows. case "$host_os" in @@ -32,12 +32,7 @@ AC_DEFUN([gl_FUNC_TIME], [gl_cv_func_time_works="guessing no"], [gl_cv_func_time_works="guessing yes"]) ;; - freebsd*) - case "$host_cpu" in - sparc*) gl_cv_func_time_works="guessing no";; - *) gl_cv_func_time_works="guessing yes";; - esac - ;; + freebsd*) gl_cv_func_time_works="guessing no";; aix*) gl_cv_func_time_works="guessing no";; mingw* | windows*) gl_cv_func_time_works="guessing no";; *) gl_cv_func_time_works="guessing yes";; -- 2.39.5