isfinite-no-c++: New module.

Reported by G. Branden Robinson <g.branden.robinson@gmail.com> in
<https://lists.gnu.org/archive/html/bug-gnulib/2025-12/msg00150.html>.

* modules/isfinite-no-c++: New file, based on modules/isfinite.
* modules/isfinite: Essentially an alias of isfinite-no-c++ now.
* modules/isfinite-no-c++-tests: Renamed from modules/isfinite-tests.
* lib/math.in.h (isfinite): Test also GNULIB_ISFINITE_NO_CXX.
* m4/math_h.m4 (gl_MATH_H_REQUIRE_DEFAULTS): Initialize
GNULIB_ISFINITE_NO_CXX.
* modules/math-h (Makefile.am): Substitute GNULIB_ISFINITE_NO_CXX.
* modules/cbrt (Depends-on): Add isfinite-no-c++. Remove isfinite.
* modules/cbrtf (Depends-on): Likewise.
* modules/cbrtl (Depends-on): Likewise.
* modules/fma (Depends-on): Likewise.
* modules/fmaf (Depends-on): Likewise.
* modules/fmal (Depends-on): Likewise.
* modules/fmod (Depends-on): Likewise.
* modules/fmodl (Depends-on): Likewise.
* modules/hypot (Depends-on): Likewise.
* modules/hypotl (Depends-on): Likewise.
* modules/ilogb (Depends-on): Likewise.
* modules/ilogbf (Depends-on): Likewise.
* modules/ilogbl (Depends-on): Likewise.
* modules/logb (Depends-on): Likewise.
* modules/logbf (Depends-on): Likewise.
* modules/logbl (Depends-on): Likewise.
* modules/modf (Depends-on): Likewise.
* modules/modfl (Depends-on): Likewise.
* modules/remainder (Depends-on): Likewise.
* modules/remainderf (Depends-on): Likewise.
* modules/remainderl (Depends-on): Likewise.

diff --git a/ChangeLog b/ChangeLog
index fe19efcc4bfd233cc9cb4bb43da91b34a4995a5c..8439755c9a8244a28e12680dfb4023b5b4355811 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2025-12-19  Bruno Haible  <bruno@clisp.org>
+
+       isfinite-no-c++: New module.
+       Reported by G. Branden Robinson <g.branden.robinson@gmail.com> in
+       <https://lists.gnu.org/archive/html/bug-gnulib/2025-12/msg00150.html>.
+       * modules/isfinite-no-c++: New file, based on modules/isfinite.
+       * modules/isfinite: Essentially an alias of isfinite-no-c++ now.
+       * modules/isfinite-no-c++-tests: Renamed from modules/isfinite-tests.
+       * lib/math.in.h (isfinite): Test also GNULIB_ISFINITE_NO_CXX.
+       * m4/math_h.m4 (gl_MATH_H_REQUIRE_DEFAULTS): Initialize
+       GNULIB_ISFINITE_NO_CXX.
+       * modules/math-h (Makefile.am): Substitute GNULIB_ISFINITE_NO_CXX.
+       * modules/cbrt (Depends-on): Add isfinite-no-c++. Remove isfinite.
+       * modules/cbrtf (Depends-on): Likewise.
+       * modules/cbrtl (Depends-on): Likewise.
+       * modules/fma (Depends-on): Likewise.
+       * modules/fmaf (Depends-on): Likewise.
+       * modules/fmal (Depends-on): Likewise.
+       * modules/fmod (Depends-on): Likewise.
+       * modules/fmodl (Depends-on): Likewise.
+       * modules/hypot (Depends-on): Likewise.
+       * modules/hypotl (Depends-on): Likewise.
+       * modules/ilogb (Depends-on): Likewise.
+       * modules/ilogbf (Depends-on): Likewise.
+       * modules/ilogbl (Depends-on): Likewise.
+       * modules/logb (Depends-on): Likewise.
+       * modules/logbf (Depends-on): Likewise.
+       * modules/logbl (Depends-on): Likewise.
+       * modules/modf (Depends-on): Likewise.
+       * modules/modfl (Depends-on): Likewise.
+       * modules/remainder (Depends-on): Likewise.
+       * modules/remainderf (Depends-on): Likewise.
+       * modules/remainderl (Depends-on): Likewise.
+
 2025-12-15  Collin Funk  <collin.funk1@gmail.com>
 
        nanosleep: Avoid a redefinition on mingw.

diff --git a/lib/math.in.h b/lib/math.in.h
index 53450d4c60d426c6c78cbba1fa72c3a37f542ee9..66b23e36efb1e9dbbe6b4bd64b46c011f780189d 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -2461,7 +2461,7 @@ _GL_CXXALIASWARN (yn);
    declarations.  */
 
 
-#if @GNULIB_ISFINITE@
+#if @GNULIB_ISFINITE@ || @GNULIB_ISFINITE_NO_CXX@
 # if @REPLACE_ISFINITE@
 _GL_EXTERN_C int gl_isfinitef (float x);
 _GL_EXTERN_C int gl_isfinited (double x);
@@ -2472,7 +2472,7 @@ _GL_EXTERN_C int gl_isfinitel (long double x);
     sizeof (x) == sizeof (double) ? gl_isfinited (x) : \
     gl_isfinitef (x))
 # endif
-# ifdef __cplusplus
+# if @GNULIB_ISFINITE@ && defined __cplusplus
 #  if defined isfinite || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isfinite)
 #   undef isfinite

diff --git a/m4/math_h.m4 b/m4/math_h.m4
index 805cca471db0dc84983dc0be2ba19d5515c8cb24..a8cc3c833f58e3704c600ac1e456cdff6d817939 100644 (file)
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -1,5 +1,5 @@
 # math_h.m4
-# serial 142
+# serial 143
 dnl Copyright (C) 2007-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,
@@ -131,6 +131,7 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE_NO_CXX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF])

diff --git a/modules/cbrt b/modules/cbrt
index aa6c30c53ad57942238b75651399310b7b8ed560..458f1df64336e10292152d83addb2a968a84cd9c 100644 (file)
--- a/modules/cbrt
+++ b/modules/cbrt
@@ -9,7 +9,7 @@ m4/mathfunc.m4
 Depends-on:
 math-h
 extensions
-isfinite        [test $HAVE_CBRT = 0]
+isfinite-no-c++ [test $HAVE_CBRT = 0]
 fabs            [test $HAVE_CBRT = 0]
 frexp           [test $HAVE_CBRT = 0]
 ldexp           [test $HAVE_CBRT = 0]

diff --git a/modules/cbrtf b/modules/cbrtf
index 0656c679991f9abe2c8307ed5472b3cee3af14ca..e770857e786141440524365a7b78aa478cb34261 100644 (file)
--- a/modules/cbrtf
+++ b/modules/cbrtf
@@ -10,7 +10,7 @@ m4/mathfunc.m4
 Depends-on:
 math-h
 extensions
-isfinite        [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1]
+isfinite-no-c++ [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1]
 fabsf           [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1]
 frexpf          [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1]
 ldexpf          [test $HAVE_CBRTF = 0 || test $REPLACE_CBRTF = 1]

diff --git a/modules/cbrtl b/modules/cbrtl
index caa6cd6efc0d9799d5a330cd373d198dbdf9dbf2..f8c37d5611115d9a8e0c9e6536fc3f2ac4ae521b 100644 (file)
--- a/modules/cbrtl
+++ b/modules/cbrtl
@@ -11,7 +11,7 @@ Depends-on:
 math-h
 extensions
 cbrt            [{ test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
-isfinite        [{ test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 ldexpl          [{ test $HAVE_CBRTL = 0 || test $REPLACE_CBRTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 

diff --git a/modules/fma b/modules/fma
index f27d0271c178920fbd8638df0440a242095135e3..33ebcd3a5277ebb19cc96a5a9c2b513e88094735 100644 (file)
--- a/modules/fma
+++ b/modules/fma
@@ -13,7 +13,7 @@ math-h
 float-h         [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 bool            [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 assert-h        [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
-isfinite        [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
+isfinite-no-c++ [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 integer_length  [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 frexp           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]
 ldexp           [test $HAVE_FMA = 0 || test $REPLACE_FMA = 1]

diff --git a/modules/fmaf b/modules/fmaf
index 08a75385a9dc14285b2327d3fcb4dea6879c3743..f2d77b801b93f6a16628b788e117595bff39d1df 100644 (file)
--- a/modules/fmaf
+++ b/modules/fmaf
@@ -14,8 +14,8 @@ math-h
 extensions
 float-h         [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 bool            [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
-assert-h         [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
-isfinite        [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
+assert-h        [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
+isfinite-no-c++ [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 integer_length  [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 frexpf          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]
 ldexpf          [test $HAVE_FMAF = 0 || test $REPLACE_FMAF = 1]

diff --git a/modules/fmal b/modules/fmal
index 083cd8e0689995f6f8de2348fa5adb53a7bc3267..7f9c5b8c0cce4d1bcf6fc4b165f1340666067783 100644 (file)
--- a/modules/fmal
+++ b/modules/fmal
@@ -16,7 +16,7 @@ fma             [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAV
 float-h         [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 bool            [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 assert-h        [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
-isfinite        [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 integer_length  [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 ldexpl          [{ test $HAVE_FMAL = 0 || test $REPLACE_FMAL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]

diff --git a/modules/fmod b/modules/fmod
index 4b0c24f32d1ec120489a3eb8ad151236089eb317..7d271bfb789ba413794a285e03d2bbae79fb412e 100644 (file)
--- a/modules/fmod
+++ b/modules/fmod
@@ -8,7 +8,7 @@ m4/mathfunc.m4
 
 Depends-on:
 math-h
-isfinite        [test $REPLACE_FMOD = 1]
+isfinite-no-c++ [test $REPLACE_FMOD = 1]
 signbit         [test $REPLACE_FMOD = 1]
 fabs            [test $REPLACE_FMOD = 1]
 frexp           [test $REPLACE_FMOD = 1]

diff --git a/modules/fmodl b/modules/fmodl
index 3e46f58d6915a69d3c7d367cf9f78c35c88befcd..1a9ad6fbb2e40435870693f7773d728cc795ed1c 100644 (file)
--- a/modules/fmodl
+++ b/modules/fmodl
@@ -12,7 +12,7 @@ math-h
 extensions
 fmod            [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
 float-h         [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
-isfinite        [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 signbit         [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 fabsl           [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_FMODL = 0 || test $REPLACE_FMODL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]

diff --git a/modules/hypot b/modules/hypot
index d12651c3c06111b91f6cccc02f4a9c7bace7d501..9e6fdc84323173385b321e1d33dfdf6b2176c947 100644 (file)
--- a/modules/hypot
+++ b/modules/hypot
@@ -9,7 +9,7 @@ m4/mathfunc.m4
 Depends-on:
 math-h
 extensions
-isfinite        [test $REPLACE_HYPOT = 1]
+isfinite-no-c++ [test $REPLACE_HYPOT = 1]
 fabs            [test $REPLACE_HYPOT = 1]
 frexp           [test $REPLACE_HYPOT = 1]
 ldexp           [test $REPLACE_HYPOT = 1]

diff --git a/modules/hypotl b/modules/hypotl
index b1e334b330398c7bd0390420dd8004c042ea1056..8668724228f52ab7e1b46ff2f9b714dd787fd2a8 100644 (file)
--- a/modules/hypotl
+++ b/modules/hypotl
@@ -10,7 +10,7 @@ Depends-on:
 math-h
 extensions
 hypot           [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
-isfinite        [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 fabsl           [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 ldexpl          [{ test $HAVE_HYPOTL = 0 || test $REPLACE_HYPOTL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]

diff --git a/modules/ilogb b/modules/ilogb
index 04884e26b06ecd38a16c8913140331158f49d45a..3afffbba2eeadd960344dc1354c27925559681db 100644 (file)
--- a/modules/ilogb
+++ b/modules/ilogb
@@ -8,7 +8,7 @@ m4/mathfunc.m4
 
 Depends-on:
 math-h
-isfinite        [test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1]
+isfinite-no-c++ [test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1]
 frexp           [test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1]
 isnand          [test $HAVE_ILOGB = 0 || test $REPLACE_ILOGB = 1]
 

diff --git a/modules/ilogbf b/modules/ilogbf
index eb01143711e74ffe7c8af72fd203c9c3394d9b1b..6fb310c86494de20161406eed4538fc23a071748 100644 (file)
--- a/modules/ilogbf
+++ b/modules/ilogbf
@@ -10,7 +10,7 @@ m4/mathfunc.m4
 Depends-on:
 math-h
 extensions
-isfinite        [test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1]
+isfinite-no-c++ [test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1]
 frexpf          [test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1]
 isnanf          [test $HAVE_ILOGBF = 0 || test $REPLACE_ILOGBF = 1]
 

diff --git a/modules/ilogbl b/modules/ilogbl
index ef3c54b3c8a5901c9dc06a90e65cb34b0958f8da..69818f9467290d908d2ef0500722803e94c6c590 100644 (file)
--- a/modules/ilogbl
+++ b/modules/ilogbl
@@ -11,7 +11,7 @@ Depends-on:
 math-h
 extensions
 ilogb           [{ test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
-isfinite        [{ test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 isnanl          [{ test $HAVE_ILOGBL = 0 || test $REPLACE_ILOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 

diff --git a/modules/isfinite b/modules/isfinite
index 68382e32a608d269812f9288d7639f3115e4ed51..f62e2d6ae6f0f0242ed807ac43c64ab622cb9d21 100644 (file)
--- a/modules/isfinite
+++ b/modules/isfinite
@@ -2,29 +2,14 @@ Description:
 isfinite macro: test for finite value (zero, subnormal, or normal, and not infinite or NaN).
 
 Files:
-lib/isfinite.c
-m4/isfinite.m4
-m4/check-math-lib.m4
-m4/exponentl.m4
-m4/exponentd.m4
-m4/math_h.m4
 
 Depends-on:
-math-h
-extensions
-isnanf-nolibm   [test $REPLACE_ISFINITE = 1]
-isnand-nolibm   [test $REPLACE_ISFINITE = 1]
-isnanl-nolibm   [test $REPLACE_ISFINITE = 1]
+isfinite-no-c++
 
 configure.ac:
-gl_ISFINITE
-gl_CONDITIONAL([GL_COND_OBJ_ISFINITE], [test $REPLACE_ISFINITE = 1])
 gl_MATH_MODULE_INDICATOR([isfinite])
 
 Makefile.am:
-if GL_COND_OBJ_ISFINITE
-lib_SOURCES += isfinite.c
-endif
 
 Include:
 <math.h>

diff --git a/modules/isfinite-no-c++ b/modules/isfinite-no-c++
new file mode 100644 (file)
index 0000000..2122419
--- /dev/null
+++ b/modules/isfinite-no-c++
@@ -0,0 +1,36 @@
+Description:
+isfinite macro: test for finite value (zero, subnormal, or normal, and not infinite or NaN).
+
+Files:
+lib/isfinite.c
+m4/isfinite.m4
+m4/check-math-lib.m4
+m4/exponentl.m4
+m4/exponentd.m4
+m4/math_h.m4
+
+Depends-on:
+math-h
+extensions
+isnanf-nolibm   [test $REPLACE_ISFINITE = 1]
+isnand-nolibm   [test $REPLACE_ISFINITE = 1]
+isnanl-nolibm   [test $REPLACE_ISFINITE = 1]
+
+configure.ac:
+gl_ISFINITE
+gl_CONDITIONAL([GL_COND_OBJ_ISFINITE], [test $REPLACE_ISFINITE = 1])
+gl_MATH_MODULE_INDICATOR([isfinite-no-cxx])
+
+Makefile.am:
+if GL_COND_OBJ_ISFINITE
+lib_SOURCES += isfinite.c
+endif
+
+Include:
+<math.h>
+
+License:
+LGPL
+
+Maintainer:
+Ben Pfaff

diff --git a/modules/isfinite-tests b/modules/isfinite-no-c++-tests
similarity index 100%
rename from modules/isfinite-tests
rename to modules/isfinite-no-c++-tests

diff --git a/modules/logb b/modules/logb
index a7dcb2072eba6f8755cacf9694c8b07175251541..ea2013ed6639929d5f49c950f67b22472ddff8b1 100644 (file)
--- a/modules/logb
+++ b/modules/logb
@@ -9,7 +9,7 @@ m4/mathfunc.m4
 Depends-on:
 math-h
 extensions
-isfinite        [test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1]
+isfinite-no-c++ [test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1]
 frexp           [test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1]
 isnand          [test $HAVE_LOGB = 0 || test $REPLACE_LOGB = 1]
 

diff --git a/modules/logbf b/modules/logbf
index 9e633c95dd8cc22b8a0824efe292addd2a6e74c2..9ea26b7ac4368eb583b658747b345a382637510e 100644 (file)
--- a/modules/logbf
+++ b/modules/logbf
@@ -10,7 +10,7 @@ m4/mathfunc.m4
 Depends-on:
 math-h
 extensions
-isfinite        [test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1]
+isfinite-no-c++ [test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1]
 frexpf          [test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1]
 isnanf          [test $HAVE_LOGBF = 0 || test $REPLACE_LOGBF = 1]
 

diff --git a/modules/logbl b/modules/logbl
index 6b0609074624d229b9c56bbd371efcb6636d87a7..6aefe4289787036280eb1003a2bf02920aa1fb17 100644 (file)
--- a/modules/logbl
+++ b/modules/logbl
@@ -11,7 +11,7 @@ Depends-on:
 math-h
 extensions
 logb            [{ test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
-isfinite        [{ test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 frexpl          [{ test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 isnanl          [{ test $HAVE_LOGBL = 0 || test $REPLACE_LOGBL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 

diff --git a/modules/math-h b/modules/math-h
index da3214ad4eb2cda9a080d1f5ffc3f7524449480f..78e94cb01c0f5c2174ddee4c11055c72a11fbb06 100644 (file)
--- a/modules/math-h
+++ b/modules/math-h
@@ -87,6 +87,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
              -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \
              -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \
              -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \
+             -e 's/@''GNULIB_ISFINITE_NO_CXX''@/$(GNULIB_ISFINITE_NO_CXX)/g' \
              -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \
              -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \
              -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \

diff --git a/modules/modf b/modules/modf
index 2df0419acbb757507539e921ade8c2b4fedb37e5..e021c301c3d1c695795fb44eb7848376a0ab28a4 100644 (file)
--- a/modules/modf
+++ b/modules/modf
@@ -8,7 +8,7 @@ m4/mathfunc.m4
 
 Depends-on:
 math-h
-isfinite        [test $REPLACE_MODF = 1]
+isfinite-no-c++ [test $REPLACE_MODF = 1]
 trunc           [test $REPLACE_MODF = 1]
 isinf           [test $REPLACE_MODF = 1]
 

diff --git a/modules/modfl b/modules/modfl
index c05304337a3561d58b9927875b8c7d1af2f133e9..92c260e89895316d09d7434df505891401a544c8 100644 (file)
--- a/modules/modfl
+++ b/modules/modfl
@@ -10,7 +10,7 @@ Depends-on:
 math-h
 extensions
 modf            [{ test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
-isfinite        [{ test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 truncl          [{ test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 isinf           [{ test $HAVE_MODFL = 0 || test $REPLACE_MODFL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 

diff --git a/modules/remainder b/modules/remainder
index e3a15830199fdb047f2f60be557895f38628e4ab..ffad86a8cd05a75bbf6b9458c153b1bb05123381 100644 (file)
--- a/modules/remainder
+++ b/modules/remainder
@@ -8,7 +8,7 @@ m4/mathfunc.m4
 
 Depends-on:
 math-h
-isfinite        [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1]
+isfinite-no-c++ [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1]
 signbit         [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1]
 fabs            [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1]
 fmod            [test $HAVE_REMAINDER = 0 || test $REPLACE_REMAINDER = 1]

diff --git a/modules/remainderf b/modules/remainderf
index e75bd1dc04bf27acbe8c8e066d3bcff8f4957ed8..459681435f8b8e2c6dc340a7cd950c89939df68c 100644 (file)
--- a/modules/remainderf
+++ b/modules/remainderf
@@ -11,7 +11,7 @@ Depends-on:
 math-h
 extensions
 remainder       [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]
-isfinite        [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]
+isfinite-no-c++ [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]
 signbit         [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]
 fabsf           [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]
 fmodf           [test $HAVE_REMAINDERF = 0 || test $REPLACE_REMAINDERF = 1]

diff --git a/modules/remainderl b/modules/remainderl
index 44bcf065334583c28cf7398a6517cf396fc03d35..5baebf4b270a755f24af7fc8e9bc175e143a1b9a 100644 (file)
--- a/modules/remainderl
+++ b/modules/remainderl
@@ -12,7 +12,7 @@ math-h
 extensions
 remainder       [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
 float-h         [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
-isfinite        [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isfinite-no-c++ [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 signbit         [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 fabsl           [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 fmodl           [{ test $HAVE_REMAINDERL = 0 || test $REPLACE_REMAINDERL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]