diff options
Diffstat (limited to 'gnulib-m4/isnanf.m4')
| -rw-r--r-- | gnulib-m4/isnanf.m4 | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/gnulib-m4/isnanf.m4 b/gnulib-m4/isnanf.m4 index 09c3e5e..1509fb4 100644 --- a/gnulib-m4/isnanf.m4 +++ b/gnulib-m4/isnanf.m4 @@ -1,5 +1,5 @@ -# isnanf.m4 serial 14 -dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. +# isnanf.m4 serial 10 +dnl Copyright (C) 2007-2010 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. @@ -17,7 +17,6 @@ AC_DEFUN([gl_FUNC_ISNANF], ISNANF_LIBM=-lm fi fi - dnl The variable gl_func_isnanf set here is used by isnan.m4. if test $gl_cv_func_isnanf_no_libm = yes \ || test $gl_cv_func_isnanf_in_libm = yes; then save_LIBS="$LIBS" @@ -33,6 +32,7 @@ AC_DEFUN([gl_FUNC_ISNANF], fi if test $gl_func_isnanf != yes; then HAVE_ISNANF=0 + gl_BUILD_ISNANF fi AC_SUBST([ISNANF_LIBM]) ]) @@ -51,17 +51,17 @@ AC_DEFUN([gl_FUNC_ISNANF_NO_LIBM], *) false;; esac }; then - gl_func_isnanf_no_libm=yes AC_DEFINE([HAVE_ISNANF_IN_LIBC], [1], [Define if the isnan(float) function is available in libc.]) else - gl_func_isnanf_no_libm=no + gl_BUILD_ISNANF fi ]) -dnl Prerequisites of replacement isnanf definition. It does not need -lm. -AC_DEFUN([gl_PREREQ_ISNANF], +dnl Pull in replacement isnanf definition. It does not need -lm. +AC_DEFUN([gl_BUILD_ISNANF], [ + AC_LIBOBJ([isnanf]) gl_FLOAT_EXPONENT_LOCATION ]) @@ -71,18 +71,16 @@ AC_DEFUN([gl_HAVE_ISNANF_NO_LIBM], AC_CACHE_CHECK([whether isnan(float) can be used without linking with libm], [gl_cv_func_isnanf_no_libm], [ - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <math.h> - #if __GNUC__ >= 4 - # undef isnanf - # define isnanf(x) __builtin_isnanf ((float)(x)) - #elif defined isnan - # undef isnanf - # define isnanf(x) isnan ((float)(x)) - #endif - float x;]], - [[return isnanf (x);]])], + AC_TRY_LINK([#include <math.h> + #if __GNUC__ >= 4 + # undef isnanf + # define isnanf(x) __builtin_isnanf ((float)(x)) + #elif defined isnan + # undef isnanf + # define isnanf(x) isnan ((float)(x)) + #endif + float x;], + [return isnanf (x);], [gl_cv_func_isnanf_no_libm=yes], [gl_cv_func_isnanf_no_libm=no]) ]) @@ -96,18 +94,16 @@ AC_DEFUN([gl_HAVE_ISNANF_IN_LIBM], [ save_LIBS="$LIBS" LIBS="$LIBS -lm" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <math.h> - #if __GNUC__ >= 4 - # undef isnanf - # define isnanf(x) __builtin_isnanf ((float)(x)) - #elif defined isnan - # undef isnanf - # define isnanf(x) isnan ((float)(x)) - #endif - float x;]], - [[return isnanf (x);]])], + AC_TRY_LINK([#include <math.h> + #if __GNUC__ >= 4 + # undef isnanf + # define isnanf(x) __builtin_isnanf ((float)(x)) + #elif defined isnan + # undef isnanf + # define isnanf(x) isnan ((float)(x)) + #endif + float x;], + [return isnanf (x);], [gl_cv_func_isnanf_in_libm=yes], [gl_cv_func_isnanf_in_libm=no]) LIBS="$save_LIBS" @@ -124,8 +120,7 @@ AC_DEFUN([gl_ISNANF_WORKS], AC_REQUIRE([gl_FLOAT_EXPONENT_LOCATION]) AC_CACHE_CHECK([whether isnan(float) works], [gl_cv_func_isnanf_works], [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + AC_TRY_RUN([ #include <math.h> #if __GNUC__ >= 4 # undef isnanf @@ -150,13 +145,13 @@ NaN () typedef union { unsigned int word[NWORDS]; float value; } memory_float; int main() { - int result = 0; + memory_float m; if (isnanf (1.0f / 0.0f)) - result |= 1; + return 1; if (!isnanf (NaN ())) - result |= 2; + return 1; #if defined FLT_EXPBIT0_WORD && defined FLT_EXPBIT0_BIT /* The isnanf function should be immune against changes in the sign bit and @@ -164,21 +159,17 @@ int main() a sign bit or a mantissa bit. */ if (FLT_EXPBIT0_WORD == 0 && FLT_EXPBIT0_BIT > 0) { - memory_float m; - m.value = NaN (); /* Set the bits below the exponent to 01111...111. */ m.word[0] &= -1U << FLT_EXPBIT0_BIT; m.word[0] |= 1U << (FLT_EXPBIT0_BIT - 1) - 1; if (!isnanf (m.value)) - result |= 4; + return 1; } #endif - return result; -}]])], - [gl_cv_func_isnanf_works=yes], - [gl_cv_func_isnanf_works=no], + return 0; +}], [gl_cv_func_isnanf_works=yes], [gl_cv_func_isnanf_works=no], [case "$host_os" in irix* | solaris*) gl_cv_func_isnanf_works="guessing no";; *) gl_cv_func_isnanf_works="guessing yes";; |