1 files changed, 28 insertions, 19 deletions

diff --git a/gl/m4/math_h.m4 b/gl/m4/math_h.m4
index 4b26c9e9..4cf59671 100644
--- a/gl/m4/math_h.m4
+++ b/gl/m4/math_h.m4
@@ -1,9 +1,10 @@
 # math_h.m4
-# serial 138
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 146
+dnl Copyright (C) 2007-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_MATH_H],
 [
@@ -49,7 +50,7 @@ AC_DEFUN_ONCE([gl_MATH_H],
      ilogb ilogbf ilogbl
      ldexpf ldexpl
      log logf logl log10 log10f log10l log1p log1pf log1pl log2 log2f log2l
-     logb logbf logbl
+     logb logbf logbl logp1 log1pf logp1l
      modf modff modfl powf
      remainder remainderf remainderl
      rint rintf rintl round roundf roundl
@@ -130,8 +131,11 @@ 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_ISINF_NO_CXX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN_NO_CXX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL])
@@ -153,6 +157,9 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGP1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGP1F])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGP1L])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL])
@@ -173,6 +180,7 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIGF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIGL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT_NO_CXX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF])
@@ -216,14 +224,19 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_CBRTF=1;                     AC_SUBST([HAVE_CBRTF])
   HAVE_CBRTL=1;                     AC_SUBST([HAVE_CBRTL])
   HAVE_COPYSIGN=1;                  AC_SUBST([HAVE_COPYSIGN])
+  HAVE_COPYSIGNF=1;                 AC_SUBST([HAVE_COPYSIGNF])
   HAVE_COPYSIGNL=1;                 AC_SUBST([HAVE_COPYSIGNL])
   HAVE_COSF=1;                      AC_SUBST([HAVE_COSF])
   HAVE_COSL=1;                      AC_SUBST([HAVE_COSL])
   HAVE_COSHF=1;                     AC_SUBST([HAVE_COSHF])
   HAVE_EXPF=1;                      AC_SUBST([HAVE_EXPF])
   HAVE_EXPL=1;                      AC_SUBST([HAVE_EXPL])
+  HAVE_EXP2=1;                      AC_SUBST([HAVE_EXP2])
+  HAVE_EXP2F=1;                     AC_SUBST([HAVE_EXP2F])
+  HAVE_EXP2L=1;                     AC_SUBST([HAVE_EXP2L])
   HAVE_EXPM1=1;                     AC_SUBST([HAVE_EXPM1])
   HAVE_EXPM1F=1;                    AC_SUBST([HAVE_EXPM1F])
+  HAVE_EXPM1L=1;                    AC_SUBST([HAVE_EXPM1L])
   HAVE_FABSF=1;                     AC_SUBST([HAVE_FABSF])
   HAVE_FABSL=1;                     AC_SUBST([HAVE_FABSL])
   HAVE_FMA=1;                       AC_SUBST([HAVE_FMA])
@@ -251,15 +264,26 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_LOG1P=1;                     AC_SUBST([HAVE_LOG1P])
   HAVE_LOG1PF=1;                    AC_SUBST([HAVE_LOG1PF])
   HAVE_LOG1PL=1;                    AC_SUBST([HAVE_LOG1PL])
+  HAVE_LOG2=1;                      AC_SUBST([HAVE_LOG2])
+  HAVE_LOG2F=1;                     AC_SUBST([HAVE_LOG2F])
+  HAVE_LOG2L=1;                     AC_SUBST([HAVE_LOG2L])
   HAVE_LOGBF=1;                     AC_SUBST([HAVE_LOGBF])
   HAVE_LOGBL=1;                     AC_SUBST([HAVE_LOGBL])
+  HAVE_LOGP1=1;                     AC_SUBST([HAVE_LOGP1])
+  HAVE_LOGP1F=1;                    AC_SUBST([HAVE_LOGP1F])
+  HAVE_LOGP1L=1;                    AC_SUBST([HAVE_LOGP1L])
   HAVE_MODFF=1;                     AC_SUBST([HAVE_MODFF])
   HAVE_MODFL=1;                     AC_SUBST([HAVE_MODFL])
   HAVE_POWF=1;                      AC_SUBST([HAVE_POWF])
   HAVE_REMAINDER=1;                 AC_SUBST([HAVE_REMAINDER])
   HAVE_REMAINDERF=1;                AC_SUBST([HAVE_REMAINDERF])
+  HAVE_REMAINDERL=1;                AC_SUBST([HAVE_REMAINDERL])
   HAVE_RINT=1;                      AC_SUBST([HAVE_RINT])
+  HAVE_RINTF=1;                     AC_SUBST([HAVE_RINTF])
   HAVE_RINTL=1;                     AC_SUBST([HAVE_RINTL])
+  HAVE_ROUND=1;                     AC_SUBST([HAVE_ROUND])
+  HAVE_ROUNDF=1;                    AC_SUBST([HAVE_ROUNDF])
+  HAVE_ROUNDL=1;                    AC_SUBST([HAVE_ROUNDL])
   HAVE_SETPAYLOAD=1;                AC_SUBST([HAVE_SETPAYLOAD])
   HAVE_SETPAYLOADF=1;               AC_SUBST([HAVE_SETPAYLOADF])
   HAVE_SETPAYLOADL=1;               AC_SUBST([HAVE_SETPAYLOADL])
@@ -283,33 +307,17 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_DECL_ACOSL=1;                AC_SUBST([HAVE_DECL_ACOSL])
   HAVE_DECL_ASINL=1;                AC_SUBST([HAVE_DECL_ASINL])
   HAVE_DECL_ATANL=1;                AC_SUBST([HAVE_DECL_ATANL])
-  HAVE_DECL_CBRTF=1;                AC_SUBST([HAVE_DECL_CBRTF])
-  HAVE_DECL_CBRTL=1;                AC_SUBST([HAVE_DECL_CBRTL])
   HAVE_DECL_CEILF=1;                AC_SUBST([HAVE_DECL_CEILF])
   HAVE_DECL_CEILL=1;                AC_SUBST([HAVE_DECL_CEILL])
-  HAVE_DECL_COPYSIGNF=1;            AC_SUBST([HAVE_DECL_COPYSIGNF])
   HAVE_DECL_COSL=1;                 AC_SUBST([HAVE_DECL_COSL])
   HAVE_DECL_EXPL=1;                 AC_SUBST([HAVE_DECL_EXPL])
-  HAVE_DECL_EXP2=1;                 AC_SUBST([HAVE_DECL_EXP2])
-  HAVE_DECL_EXP2F=1;                AC_SUBST([HAVE_DECL_EXP2F])
-  HAVE_DECL_EXP2L=1;                AC_SUBST([HAVE_DECL_EXP2L])
-  HAVE_DECL_EXPM1L=1;               AC_SUBST([HAVE_DECL_EXPM1L])
   HAVE_DECL_FLOORF=1;               AC_SUBST([HAVE_DECL_FLOORF])
   HAVE_DECL_FLOORL=1;               AC_SUBST([HAVE_DECL_FLOORL])
   HAVE_DECL_FREXPL=1;               AC_SUBST([HAVE_DECL_FREXPL])
   HAVE_DECL_LDEXPL=1;               AC_SUBST([HAVE_DECL_LDEXPL])
   HAVE_DECL_LOGL=1;                 AC_SUBST([HAVE_DECL_LOGL])
   HAVE_DECL_LOG10L=1;               AC_SUBST([HAVE_DECL_LOG10L])
-  HAVE_DECL_LOG2=1;                 AC_SUBST([HAVE_DECL_LOG2])
-  HAVE_DECL_LOG2F=1;                AC_SUBST([HAVE_DECL_LOG2F])
-  HAVE_DECL_LOG2L=1;                AC_SUBST([HAVE_DECL_LOG2L])
   HAVE_DECL_LOGB=1;                 AC_SUBST([HAVE_DECL_LOGB])
-  HAVE_DECL_REMAINDER=1;            AC_SUBST([HAVE_DECL_REMAINDER])
-  HAVE_DECL_REMAINDERL=1;           AC_SUBST([HAVE_DECL_REMAINDERL])
-  HAVE_DECL_RINTF=1;                AC_SUBST([HAVE_DECL_RINTF])
-  HAVE_DECL_ROUND=1;                AC_SUBST([HAVE_DECL_ROUND])
-  HAVE_DECL_ROUNDF=1;               AC_SUBST([HAVE_DECL_ROUNDF])
-  HAVE_DECL_ROUNDL=1;               AC_SUBST([HAVE_DECL_ROUNDL])
   HAVE_DECL_SINL=1;                 AC_SUBST([HAVE_DECL_SINL])
   HAVE_DECL_SQRTL=1;                AC_SUBST([HAVE_DECL_SQRTL])
   HAVE_DECL_TANL=1;                 AC_SUBST([HAVE_DECL_TANL])
@@ -392,6 +400,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   REPLACE_SIGNBIT_USING_BUILTINS=0; AC_SUBST([REPLACE_SIGNBIT_USING_BUILTINS])
   REPLACE_SINF=0;                   AC_SUBST([REPLACE_SINF])
   REPLACE_SINHF=0;                  AC_SUBST([REPLACE_SINHF])
+  REPLACE_SINL=0;                   AC_SUBST([REPLACE_SINL])
   REPLACE_SQRTF=0;                  AC_SUBST([REPLACE_SQRTF])
   REPLACE_SQRTL=0;                  AC_SUBST([REPLACE_SQRTL])
   REPLACE_TANF=0;                   AC_SUBST([REPLACE_TANF])