Mercurial > gnulib
changeset 40112:cccb8f07c744
expl: Work around inaccurate implementation on NetBSD.
* lib/math.in.h (expl): Test also REPLACE_EXPL.
* m4/expl.m4 (gl_FUNC_EXPL): Add test for a certain accuracy. Set
REPLACE_EXPL.
* m4/math_h.m4 (gl_MATH_H_DEFAULTS): Initialize REPLACE_EXPL.
* modules/math (Makefile.in): Substitute REPLACE_EXPL.
* modules/expl (Depends-on, configure.ac): Test REPLACE_EXPL.
* doc/posix-functions/expl.texi: Mention the NetBSD bug.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 20 Jan 2019 22:04:01 +0100 |
parents | 234fea508b0e |
children | 7ca21aacb634 |
files | ChangeLog doc/posix-functions/expl.texi lib/math.in.h m4/expl.m4 m4/math_h.m4 modules/expl modules/math |
diffstat | 7 files changed, 127 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 20 21:45:29 2019 +0100 +++ b/ChangeLog Sun Jan 20 22:04:01 2019 +0100 @@ -1,3 +1,14 @@ +2019-01-20 Bruno Haible <bruno@clisp.org> + + expl: Work around inaccurate implementation on NetBSD. + * lib/math.in.h (expl): Test also REPLACE_EXPL. + * m4/expl.m4 (gl_FUNC_EXPL): Add test for a certain accuracy. Set + REPLACE_EXPL. + * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Initialize REPLACE_EXPL. + * modules/math (Makefile.in): Substitute REPLACE_EXPL. + * modules/expl (Depends-on, configure.ac): Test REPLACE_EXPL. + * doc/posix-functions/expl.texi: Mention the NetBSD bug. + 2019-01-20 Bruno Haible <bruno@clisp.org> exp2l: Work around inaccurate implementation on NetBSD.
--- a/doc/posix-functions/expl.texi Sun Jan 20 21:45:29 2019 +0100 +++ b/doc/posix-functions/expl.texi Sun Jan 20 22:04:01 2019 +0100 @@ -23,6 +23,10 @@ @item This function is not declared on some platforms: Mac OS X 10.3. +@item +This function produces results which are accurate to only 16 digits on some +platforms: +NetBSD 8.0. @end itemize Portability problems not fixed by Gnulib:
--- a/lib/math.in.h Sun Jan 20 21:45:29 2019 +0100 +++ b/lib/math.in.h Sun Jan 20 22:04:01 2019 +0100 @@ -627,11 +627,20 @@ #endif #if @GNULIB_EXPL@ -# if !@HAVE_EXPL@ || !@HAVE_DECL_EXPL@ -# undef expl +# if @REPLACE_EXPL@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef expl +# define expl rpl_expl +# endif +_GL_FUNCDECL_RPL (expl, long double, (long double x)); +_GL_CXXALIAS_RPL (expl, long double, (long double x)); +# else +# if !@HAVE_EXPL@ || !@HAVE_DECL_EXPL@ +# undef expl _GL_FUNCDECL_SYS (expl, long double, (long double x)); +# endif +_GL_CXXALIAS_SYS (expl, long double, (long double x)); # endif -_GL_CXXALIAS_SYS (expl, long double, (long double x)); _GL_CXXALIASWARN (expl); #elif defined GNULIB_POSIXCHECK # undef expl
--- a/m4/expl.m4 Sun Jan 20 21:45:29 2019 +0100 +++ b/m4/expl.m4 Sun Jan 20 22:04:01 2019 +0100 @@ -1,4 +1,4 @@ -# expl.m4 serial 11 +# expl.m4 serial 12 dnl Copyright (C) 2010-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -96,9 +96,99 @@ dnl Also check whether it's declared. dnl Mac OS X 10.3 has expl() in libc but doesn't declare it in <math.h>. AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [[#include <math.h>]]) + if test $REPLACE_EXPL = 0; then + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether expl works], + [gl_cv_func_expl_works], + [ + save_LIBS="$LIBS" + LIBS="$LIBS $EXPL_LIBM" + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#ifndef __NO_MATH_INLINES +# define __NO_MATH_INLINES 1 /* for glibc */ +#endif +#include <float.h> +#include <math.h> +/* Override the values of <float.h>, like done in float.in.h. */ +#if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__) +# undef LDBL_MANT_DIG +# define LDBL_MANT_DIG 64 +# undef LDBL_MIN_EXP +# define LDBL_MIN_EXP (-16381) +# undef LDBL_MAX_EXP +# define LDBL_MAX_EXP 16384 +#endif +#if defined __i386__ && (defined __FreeBSD__ || defined __DragonFly__) +# undef LDBL_MANT_DIG +# define LDBL_MANT_DIG 64 +# undef LDBL_MIN_EXP +# define LDBL_MIN_EXP (-16381) +# undef LDBL_MAX_EXP +# define LDBL_MAX_EXP 16384 +#endif +#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__ +# undef LDBL_MIN_EXP +# define LDBL_MIN_EXP DBL_MIN_EXP +#endif +#if defined __sgi && (LDBL_MANT_DIG >= 106) +# undef LDBL_MANT_DIG +# define LDBL_MANT_DIG 106 +# if defined __GNUC__ +# undef LDBL_MIN_EXP +# define LDBL_MIN_EXP DBL_MIN_EXP +# endif +#endif +#undef expl +extern +#ifdef __cplusplus +"C" +#endif +long double expl (long double); +static long double dummy (long double x) { return 0; } +int main (int argc, char *argv[]) +{ + long double (* volatile my_expl) (long double) = argc ? expl : dummy; + int result = 0; + /* This test fails on NetBSD 8.0. */ + { + const long double TWO_LDBL_MANT_DIG = /* 2^LDBL_MANT_DIG */ + (long double) (1U << ((LDBL_MANT_DIG - 1) / 5)) + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 1) / 5)) + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 2) / 5)) + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 3) / 5)) + * (long double) (1U << ((LDBL_MANT_DIG - 1 + 4) / 5)); + long double x = 11.358L; + long double err = (my_expl (x) * my_expl (- x) - 1.0L) * TWO_LDBL_MANT_DIG; + if (!(err >= -100.0L && err <= 100.0L)) + result |= 1; + } + return result; +} + ]])], + [gl_cv_func_expl_works=yes], + [gl_cv_func_expl_works=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_expl_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_expl_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_expl_works="guessing no" ;; + esac + ]) + LIBS="$save_LIBS" + ]) + case "$gl_cv_func_expl_works" in + *yes) ;; + *) REPLACE_EXPL=1 ;; + esac + fi else HAVE_DECL_EXPL=0 HAVE_EXPL=0 + fi + if test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; then dnl Find libraries needed to link lib/expl.c. if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then AC_REQUIRE([gl_FUNC_EXP])
--- a/m4/math_h.m4 Sun Jan 20 21:45:29 2019 +0100 +++ b/m4/math_h.m4 Sun Jan 20 22:04:01 2019 +0100 @@ -1,4 +1,4 @@ -# math_h.m4 serial 116 +# math_h.m4 serial 117 dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -268,6 +268,7 @@ REPLACE_COSF=0; AC_SUBST([REPLACE_COSF]) REPLACE_COSHF=0; AC_SUBST([REPLACE_COSHF]) REPLACE_EXPF=0; AC_SUBST([REPLACE_EXPF]) + REPLACE_EXPL=0; AC_SUBST([REPLACE_EXPL]) REPLACE_EXPM1=0; AC_SUBST([REPLACE_EXPM1]) REPLACE_EXPM1F=0; AC_SUBST([REPLACE_EXPM1F]) REPLACE_EXP2=0; AC_SUBST([REPLACE_EXP2])
--- a/modules/expl Sun Jan 20 21:45:29 2019 +0100 +++ b/modules/expl Sun Jan 20 22:04:01 2019 +0100 @@ -9,15 +9,15 @@ Depends-on: math extensions -exp [test $HAVE_EXPL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1] -float [test $HAVE_EXPL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] -isnanl [test $HAVE_EXPL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] -roundl [test $HAVE_EXPL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] -ldexpl [test $HAVE_EXPL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +exp [{ test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1] +float [{ test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +isnanl [{ test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +roundl [{ test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +ldexpl [{ test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; } && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] configure.ac: gl_FUNC_EXPL -if test $HAVE_EXPL = 0; then +if test $HAVE_EXPL = 0 || test $REPLACE_EXPL = 1; then AC_LIBOBJ([expl]) AC_LIBOBJ([expl-table]) fi
--- a/modules/math Sun Jan 20 21:45:29 2019 +0100 +++ b/modules/math Sun Jan 20 22:04:01 2019 +0100 @@ -237,6 +237,7 @@ -e 's|@''REPLACE_COSF''@|$(REPLACE_COSF)|g' \ -e 's|@''REPLACE_COSHF''@|$(REPLACE_COSHF)|g' \ -e 's|@''REPLACE_EXPF''@|$(REPLACE_EXPF)|g' \ + -e 's|@''REPLACE_EXPL''@|$(REPLACE_EXPL)|g' \ -e 's|@''REPLACE_EXPM1''@|$(REPLACE_EXPM1)|g' \ -e 's|@''REPLACE_EXPM1F''@|$(REPLACE_EXPM1F)|g' \ -e 's|@''REPLACE_EXP2''@|$(REPLACE_EXP2)|g' \