From 33cfac68b39b6d6aad1046afa605fec41f95a1e5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 8 Mar 2012 12:02:35 +0100 Subject: [PATCH] remainderf: Override buggy system function on IRIX 6.5. * m4/remainderf.m4 (gl_FUNC_REMAINDERF_WORKS): New macro. (gl_FUNC_REMAINDERF): Invoke it. Don't assume remainderf() is declared when it exists. * doc/posix-functions/remainderf.texi: Mention the IRIX problems. --- ChangeLog | 8 ++++ doc/posix-functions/remainderf.texi | 8 +++- m4/remainderf.m4 | 67 ++++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6163638ef..9169b51b67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-03-08 Bruno Haible + + remainderf: Override buggy system function on IRIX 6.5. + * m4/remainderf.m4 (gl_FUNC_REMAINDERF_WORKS): New macro. + (gl_FUNC_REMAINDERF): Invoke it. Don't assume remainderf() is declared + when it exists. + * doc/posix-functions/remainderf.texi: Mention the IRIX problems. + 2012-03-08 Jim Meyering test-readtokens.c: avoid const-related compilation warnings diff --git a/doc/posix-functions/remainderf.texi b/doc/posix-functions/remainderf.texi index 22283190c7..ba85c07f8c 100644 --- a/doc/posix-functions/remainderf.texi +++ b/doc/posix-functions/remainderf.texi @@ -10,7 +10,13 @@ Portability problems fixed by either Gnulib module @code{remainderf} or @code{re @itemize @item This function is missing on some platforms: -Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 9, MSVC 9. +Minix 3.1.8, AIX 5.1, HP-UX 11, older IRIX 6.5, Solaris 9, MSVC 9. +@item +This function is not declared on some platforms: +IRIX 6.5. +@item +This function may go into an endless loop on some platforms: +IRIX 6.5. @end itemize Portability problems fixed by Gnulib module @code{remainderf-ieee}: diff --git a/m4/remainderf.m4 b/m4/remainderf.m4 index b9f4d63de0..8cb15ecbe3 100644 --- a/m4/remainderf.m4 +++ b/m4/remainderf.m4 @@ -1,4 +1,4 @@ -# remainderf.m4 serial 4 +# remainderf.m4 serial 5 dnl Copyright (C) 2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,6 +26,11 @@ AC_DEFUN([gl_FUNC_REMAINDERF], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include + extern + #ifdef __cplusplus + "C" + #endif + float remainderf (float, float); float (*funcptr) (float, float) = remainderf; float x; float y;]], @@ -37,6 +42,16 @@ AC_DEFUN([gl_FUNC_REMAINDERF], LIBS="$save_LIBS" if test $gl_cv_func_remainderf = yes; then REMAINDERF_LIBM="$REMAINDER_LIBM" + + save_LIBS="$LIBS" + LIBS="$LIBS $REMAINDERF_LIBM" + gl_FUNC_REMAINDERF_WORKS + LIBS="$save_LIBS" + case "$gl_cv_func_remainderf_works" in + *yes) ;; + *) REPLACE_REMAINDERF=1 ;; + esac + m4_ifdef([gl_FUNC_REMAINDERF_IEEE], [ if test $gl_remainderf_required = ieee && test $REPLACE_REMAINDERF = 0; then AC_CACHE_CHECK([whether remainderf works according to ISO C 99 with IEC 60559], @@ -50,6 +65,11 @@ AC_DEFUN([gl_FUNC_REMAINDERF], # define __NO_MATH_INLINES 1 /* for glibc */ #endif #include +extern +#ifdef __cplusplus +"C" +#endif +float remainderf (float, float); /* Compare two numbers with ==. This is a separate function because IRIX 6.5 "cc -O" miscompiles an 'x == x' test. */ @@ -117,3 +137,48 @@ int main (int argc, char *argv[]) fi AC_SUBST([REMAINDERF_LIBM]) ]) + +dnl Test whether remainderf() works. +dnl It runs into an endless loop on IRIX 6.5. +AC_DEFUN([gl_FUNC_REMAINDERF_WORKS], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CHECK_FUNCS_ONCE([alarm]) + AC_CACHE_CHECK([whether remainderf works], [gl_cv_func_remainderf_works], + [ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#if HAVE_ALARM +# include +#endif +extern +#ifdef __cplusplus +"C" +#endif +float remainderf (float, float); +volatile float x; +volatile float y; +float z; +int main () +{ +#if HAVE_ALARM + alarm (5); +#endif + /* This test fails on IRIX 6.5. */ + x = 9.316161e+37f; + y = 0.5475547314f; + z = remainderf (x, y); + return 0; +} +]])], + [gl_cv_func_remainderf_works=yes], + [gl_cv_func_remainderf_works=no], + [case "$host_os" in + irix*) gl_cv_func_remainderf_works="guessing no";; + *) gl_cv_func_remainderf_works="guessing yes";; + esac + ]) + ]) +]) -- 2.39.5