From 3aa0152f5ec1fd4586e86438b040705ec7a174fb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Apr 2008 16:15:49 +0200 Subject: [PATCH] Work around roundf() bug on mingw. --- ChangeLog | 6 +++++ doc/posix-functions/roundf.texi | 3 +++ m4/roundf.m4 | 39 +++++++++++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8f5487d07..a9c4fcb713 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-20 Bruno Haible + + * m4/roundf.m4 (gl_FUNC_ROUNDF): Add test whether roundf actually + works. + * doc/posix-functions/roundf.texi: Mention roundf bug on mingw. + 2008-04-20 Bruno Haible * tests/test-tsearch.c (main): Don't use initstate if it is missing. diff --git a/doc/posix-functions/roundf.texi b/doc/posix-functions/roundf.texi index 41b3a7f04c..5b593d41df 100644 --- a/doc/posix-functions/roundf.texi +++ b/doc/posix-functions/roundf.texi @@ -11,6 +11,9 @@ Portability problems fixed by Gnulib: @item This function is missing on some platforms: FreeBSD 5.2.1, OpenBSD 3.8, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 4.0, Solaris 9, Interix 3.5. +@item +This functions returns a wrong result for x = 1/2 - 2^-25 on some platforms: +mingw. @end itemize Portability problems not fixed by Gnulib: diff --git a/m4/roundf.m4 b/m4/roundf.m4 index 650311e3cc..02c80d70b5 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,5 +1,5 @@ -# roundf.m4 serial 4 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# roundf.m4 serial 5 +dnl Copyright (C) 2007-2008 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. @@ -13,6 +13,41 @@ AC_DEFUN([gl_FUNC_ROUNDF], if test "$ac_cv_have_decl_roundf" = yes; then gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = roundf (x);]) fi + if test "$ac_cv_have_decl_roundf" = yes && test "$ROUNDF_LIBM" != missing; then + dnl Test whether roundf() produces correct results. On mingw, for + dnl x = 1/2 - 2^-25, the system's roundf() returns a wrong result. + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether roundf works], [gl_cv_func_roundf_works], + [ + save_LIBS="$LIBS" + LIBS="$LIBS $ROUNDF_LIBM" + AC_TRY_RUN([ +#include +#include +int main() +{ + /* 2^FLT_MANT_DIG. */ + static const float TWO_MANT_DIG = + /* Assume FLT_MANT_DIG <= 3 * 31. + Use the identity n = floor(n/3) + floor((n+1)/3) + floor((n+2)/3). */ + (float) (1U << (FLT_MANT_DIG / 3)) + * (float) (1U << ((FLT_MANT_DIG + 1) / 3)) + * (float) (1U << ((FLT_MANT_DIG + 2) / 3)); + volatile float x = 0.5f - 0.5f / TWO_MANT_DIG; + exit (x < 0.5f && roundf (x) != 0.0f); +}], [gl_cv_func_roundf_works=yes], [gl_cv_func_roundf_works=no], + [case "$host_os" in + mingw*) gl_cv_func_roundf_works="guessing no";; + *) gl_cv_func_roundf_works="guessing yes";; + esac + ]) + LIBS="$save_LIBS" + ]) + case "$gl_cv_func_roundf_works" in + *no) ROUNDF_LIBM=missing ;; + esac + fi if test "$ac_cv_have_decl_roundf" != yes || test "$ROUNDF_LIBM" = missing; then REPLACE_ROUNDF=1 AC_LIBOBJ([roundf]) -- 2.30.2