From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:42:35 +0000 (+0200)
Subject: logf: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=445dd999ea4ca06c233280d2d59d35ee2e7a2184;p=thirdparty%2Fgnulib.git

logf: Remove support for OSF/1.

* m4/logf.m4 (gl_FUNC_LOGF_WORKS): Remove macro.
(gl_FUNC_LOGF): Don't invoke it.
* lib/logf.c (logf): Assume that logf (±0.0f) is correct.
---

diff --git a/ChangeLog b/ChangeLog
index 84e0e1c398..e2b761a453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	logf: Remove support for OSF/1.
+	* m4/logf.m4 (gl_FUNC_LOGF_WORKS): Remove macro.
+	(gl_FUNC_LOGF): Don't invoke it.
+	* lib/logf.c (logf): Assume that logf (±0.0f) is correct.
+
 	log: Remove support for OSF/1.
 	* m4/log.m4 (gl_FUNC_LOG_WORKS): Remove macro.
 	(gl_FUNC_LOG): Don't invoke it.
diff --git a/lib/logf.c b/lib/logf.c
index 32f407d02c..e3fd45923f 100644
--- a/lib/logf.c
+++ b/lib/logf.c
@@ -24,16 +24,11 @@ logf (float x)
 #undef logf
 {
 #if HAVE_LOGF
-  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 logf (x);
 #else
diff --git a/m4/logf.m4 b/m4/logf.m4
index 8a2f81b036..3a736dc23d 100644
--- a/m4/logf.m4
+++ b/m4/logf.m4
@@ -1,5 +1,5 @@
 # logf.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_LOGF],
   if test $ac_cv_func_logf = yes; then
     LOGF_LIBM="$LOG_LIBM"
 
-    saved_LIBS="$LIBS"
-    LIBS="$LIBS $LOGF_LIBM"
-    gl_FUNC_LOGF_WORKS
-    LIBS="$saved_LIBS"
-    case "$gl_cv_func_logf_works" in
-      *yes) ;;
-      *) REPLACE_LOGF=1 ;;
-    esac
-
     m4_ifdef([gl_FUNC_LOGF_IEEE], [
-      if test $gl_logf_required = ieee && test $REPLACE_LOGF = 0; then
+      if test $gl_logf_required = ieee; then
         AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
         AC_CACHE_CHECK([whether logf works according to ISO C 99 with IEC 60559],
           [gl_cv_func_logf_ieee],
@@ -103,37 +94,3 @@ int main (int argc, char *argv[])
   fi
   AC_SUBST([LOGF_LIBM])
 ])
-
-dnl Test whether logf() works.
-dnl On OSF/1 5.1, logf(-0.0f) is NaN.
-AC_DEFUN([gl_FUNC_LOGF_WORKS],
-[
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_CACHE_CHECK([whether logf works], [gl_cv_func_logf_works],
-    [
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-#include <math.h>
-volatile float x;
-float y;
-int main ()
-{
-  x = -0.0f;
-  y = logf (x);
-  if (!(y + y == y))
-    return 1;
-  return 0;
-}
-]])],
-        [gl_cv_func_logf_works=yes],
-        [gl_cv_func_logf_works=no],
-        [case "$host_os" in
-           osf*)              gl_cv_func_logf_works="guessing no" ;;
-                              # Guess yes on native Windows.
-           mingw* | windows*) gl_cv_func_logf_works="guessing yes" ;;
-           *)                 gl_cv_func_logf_works="guessing yes" ;;
-         esac
-        ])
-    ])
-])