From: Bruno Haible Date: Tue, 9 Sep 2025 10:42:43 +0000 (+0200) Subject: log10f: Remove support for OSF/1. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0329020a7e8f0ac9dc847fd41dc198acda087401;p=thirdparty%2Fgnulib.git log10f: Remove support for OSF/1. * m4/log10f.m4 (gl_FUNC_LOG10F_WORKS): Remove macro. (gl_FUNC_LOG10F): Don't invoke it. * lib/log10f.c (log10f): Assume that log10f (±0.0f) is correct. --- diff --git a/ChangeLog b/ChangeLog index 00070e7e72..b84777d915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2025-09-09 Bruno Haible + log10f: Remove support for OSF/1. + * m4/log10f.m4 (gl_FUNC_LOG10F_WORKS): Remove macro. + (gl_FUNC_LOG10F): Don't invoke it. + * lib/log10f.c (log10f): Assume that log10f (±0.0f) is correct. + log10: Remove support for OSF/1. * m4/log10.m4 (gl_FUNC_LOG10_WORKS): Remove macro. (gl_FUNC_LOG10): Don't invoke it. diff --git a/lib/log10f.c b/lib/log10f.c index 1fb4213224..1acd77719c 100644 --- a/lib/log10f.c +++ b/lib/log10f.c @@ -24,16 +24,11 @@ log10f (float x) #undef log10f { #if HAVE_LOG10F - if (x <= 0.0f) + if (x < 0.0f) { - /* Work around the OSF/1 5.1 bug. */ - if (x == 0.0f) - /* Return -Infinity. */ - return -1.0f / 0.0f; /* Work around the NetBSD 5.1 bug. */ - else /* x < 0.0 */ - /* Return NaN. */ - return 0.0f / 0.0f; + /* Return NaN. */ + return 0.0f / 0.0f; } return log10f (x); #else diff --git a/m4/log10f.m4 b/m4/log10f.m4 index 38eaf9a19e..57af0b4795 100644 --- a/m4/log10f.m4 +++ b/m4/log10f.m4 @@ -1,5 +1,5 @@ # log10f.m4 -# serial 15 +# serial 16 dnl Copyright (C) 2011-2025 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,17 +24,8 @@ AC_DEFUN([gl_FUNC_LOG10F], if test $ac_cv_func_log10f = yes; then LOG10F_LIBM="$LOG10_LIBM" - saved_LIBS="$LIBS" - LIBS="$LIBS $LOG10F_LIBM" - gl_FUNC_LOG10F_WORKS - LIBS="$saved_LIBS" - case "$gl_cv_func_log10f_works" in - *yes) ;; - *) REPLACE_LOG10F=1 ;; - esac - m4_ifdef([gl_FUNC_LOG10F_IEEE], [ - if test $gl_log10f_required = ieee && test $REPLACE_LOG10F = 0; then + if test $gl_log10f_required = ieee; then AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether log10f works according to ISO C 99 with IEC 60559], [gl_cv_func_log10f_ieee], @@ -103,37 +94,3 @@ int main (int argc, char *argv[]) fi AC_SUBST([LOG10F_LIBM]) ]) - -dnl Test whether log10f() works. -dnl On OSF/1 5.1, log10f(-0.0f) is NaN. -AC_DEFUN([gl_FUNC_LOG10F_WORKS], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether log10f works], [gl_cv_func_log10f_works], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -volatile float x; -float y; -int main () -{ - x = -0.0f; - y = log10f (x); - if (!(y + y == y)) - return 1; - return 0; -} -]])], - [gl_cv_func_log10f_works=yes], - [gl_cv_func_log10f_works=no], - [case "$host_os" in - osf*) gl_cv_func_log10f_works="guessing no" ;; - # Guess yes on native Windows. - mingw* | windows*) gl_cv_func_log10f_works="guessing yes" ;; - *) gl_cv_func_log10f_works="guessing yes" ;; - esac - ]) - ]) -])