From e73e42a61d1dbf1a80ba2fd95fef2aa98de6f48b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 19 Jun 2011 12:48:10 +0200 Subject: [PATCH] floor*-ieee, ceil*-ieee, trunc*-ieee, round*-ieee: More robust checks. * m4/floorf.m4 (gl_FUNC_FLOORF): In the test whether the function is IEEE compliant, avoid compiler optimizations. * m4/floor.m4 (gl_FUNC_FLOOR): Likewise. * m4/ceilf.m4 (gl_FUNC_CEILF): Likewise. * m4/ceil.m4 (gl_FUNC_CEIL): Likewise. * m4/ceill.m4 (gl_FUNC_CEILL): Likewise. * m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. * m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. * m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. * m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. * m4/round.m4 (gl_FUNC_ROUND): Likewise. * m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. --- ChangeLog | 16 ++++++++++++++++ m4/ceil.m4 | 10 ++++++---- m4/ceilf.m4 | 10 ++++++---- m4/ceill.m4 | 8 +++++--- m4/floor.m4 | 8 +++++--- m4/floorf.m4 | 8 +++++--- m4/round.m4 | 8 +++++--- m4/roundf.m4 | 8 +++++--- m4/roundl.m4 | 8 +++++--- m4/trunc.m4 | 8 +++++--- m4/truncf.m4 | 8 +++++--- m4/truncl.m4 | 8 +++++--- 12 files changed, 73 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 650925212..012678c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2011-06-19 Bruno Haible + floor*-ieee, ceil*-ieee, trunc*-ieee, round*-ieee: More robust checks. + * m4/floorf.m4 (gl_FUNC_FLOORF): In the test whether the function is + IEEE compliant, avoid compiler optimizations. + * m4/floor.m4 (gl_FUNC_FLOOR): Likewise. + * m4/ceilf.m4 (gl_FUNC_CEILF): Likewise. + * m4/ceil.m4 (gl_FUNC_CEIL): Likewise. + * m4/ceill.m4 (gl_FUNC_CEILL): Likewise. + * m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. + * m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. + * m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. + * m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. + * m4/round.m4 (gl_FUNC_ROUND): Likewise. + * m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. + +2011-06-19 Bruno Haible + ceilf-ieee: Work around bug on AIX 7.1. * m4/ceilf.m4 (gl_FUNC_CEILF): Test also the sign of ceilf (-0.3f). * doc/posix-functions/ceilf.texi: Mention the AIX 7.1 problem. diff --git a/m4/ceil.m4 b/m4/ceil.m4 index fd335d2ce..b9052976f 100644 --- a/m4/ceil.m4 +++ b/m4/ceil.m4 @@ -1,4 +1,4 @@ -# ceil.m4 serial 7 +# ceil.m4 serial 8 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -28,14 +28,16 @@ AC_DEFUN([gl_FUNC_CEIL], #include ]gl_DOUBLE_MINUS_ZERO_CODE[ ]gl_DOUBLE_SIGNBIT_CODE[ -int main() +static double dummy (double f) { return 0; } +int main (int argc, char *argv[]) { + double (*my_ceil) (double) = argc ? ceil : dummy; int result = 0; /* Test whether ceil (-0.0) is -0.0. */ - if (signbitd (minus_zerod) && !signbitd (ceil (minus_zerod))) + if (signbitd (minus_zerod) && !signbitd (my_ceil (minus_zerod))) result |= 1; /* Test whether ceil (-0.3) is -0.0. */ - if (signbitd (-0.3) && !signbitd (ceil (-0.3))) + if (signbitd (-0.3) && !signbitd (my_ceil (-0.3))) result |= 2; return result; } diff --git a/m4/ceilf.m4 b/m4/ceilf.m4 index 66bac6948..8b74a6d24 100644 --- a/m4/ceilf.m4 +++ b/m4/ceilf.m4 @@ -1,4 +1,4 @@ -# ceilf.m4 serial 10 +# ceilf.m4 serial 11 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -35,14 +35,16 @@ AC_DEFUN([gl_FUNC_CEILF], #include ]gl_FLOAT_MINUS_ZERO_CODE[ ]gl_FLOAT_SIGNBIT_CODE[ -int main() +static float dummy (float f) { return 0; } +int main (int argc, char *argv[]) { + float (*my_ceilf) (float) = argc ? ceilf : dummy; int result = 0; /* Test whether ceilf (-0.0f) is -0.0f. */ - if (signbitf (minus_zerof) && !signbitf (ceilf (minus_zerof))) + if (signbitf (minus_zerof) && !signbitf (my_ceilf (minus_zerof))) result |= 1; /* Test whether ceilf (-0.3f) is -0.0f. */ - if (signbitf (-0.3f) && !signbitf (ceilf (-0.3f))) + if (signbitf (-0.3f) && !signbitf (my_ceilf (-0.3f))) result |= 2; return result; } diff --git a/m4/ceill.m4 b/m4/ceill.m4 index 8116de109..6b5682092 100644 --- a/m4/ceill.m4 +++ b/m4/ceill.m4 @@ -1,4 +1,4 @@ -# ceill.m4 serial 9 +# ceill.m4 serial 10 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -35,10 +35,12 @@ AC_DEFUN([gl_FUNC_CEILL], #include ]gl_LONG_DOUBLE_MINUS_ZERO_CODE[ ]gl_LONG_DOUBLE_SIGNBIT_CODE[ -int main() +static long double dummy (long double f) { return 0; } +int main (int argc, char *argv[]) { + long double (*my_ceill) (long double) = argc ? ceill : dummy; /* Test whether ceill (-0.3L) is -0.0L. */ - if (signbitl (minus_zerol) && !signbitl (ceill (-0.3L))) + if (signbitl (minus_zerol) && !signbitl (my_ceill (-0.3L))) return 1; return 0; } diff --git a/m4/floor.m4 b/m4/floor.m4 index 62d19fed7..5de0da277 100644 --- a/m4/floor.m4 +++ b/m4/floor.m4 @@ -1,4 +1,4 @@ -# floor.m4 serial 6 +# floor.m4 serial 7 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -28,10 +28,12 @@ AC_DEFUN([gl_FUNC_FLOOR], #include ]gl_DOUBLE_MINUS_ZERO_CODE[ ]gl_DOUBLE_SIGNBIT_CODE[ -int main() +static double dummy (double f) { return 0; } +int main (int argc, char *argv[]) { + double (*my_floor) (double) = argc ? floor : dummy; /* Test whether floor (-0.0) is -0.0. */ - if (signbitd (minus_zerod) && !signbitd (floor (minus_zerod))) + if (signbitd (minus_zerod) && !signbitd (my_floor (minus_zerod))) return 1; return 0; } diff --git a/m4/floorf.m4 b/m4/floorf.m4 index d426569c1..aa76f8cae 100644 --- a/m4/floorf.m4 +++ b/m4/floorf.m4 @@ -1,4 +1,4 @@ -# floorf.m4 serial 9 +# floorf.m4 serial 10 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -35,10 +35,12 @@ AC_DEFUN([gl_FUNC_FLOORF], #include ]gl_FLOAT_MINUS_ZERO_CODE[ ]gl_FLOAT_SIGNBIT_CODE[ -int main() +static float dummy (float f) { return 0; } +int main (int argc, char *argv[]) { + float (*my_floorf) (float) = argc ? floorf : dummy; /* Test whether floorf (-0.0f) is -0.0f. */ - if (signbitf (minus_zerof) && !signbitf (floorf (minus_zerof))) + if (signbitf (minus_zerof) && !signbitf (my_floorf (minus_zerof))) return 1; return 0; } diff --git a/m4/round.m4 b/m4/round.m4 index d8abbcdb5..9f6691f41 100644 --- a/m4/round.m4 +++ b/m4/round.m4 @@ -1,4 +1,4 @@ -# round.m4 serial 11 +# round.m4 serial 12 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -69,10 +69,12 @@ int main() #include ]gl_DOUBLE_MINUS_ZERO_CODE[ ]gl_DOUBLE_SIGNBIT_CODE[ -int main() +static double dummy (double f) { return 0; } +int main (int argc, char *argv[]) { + double (*my_round) (double) = argc ? round : dummy; /* Test whether round (-0.0) is -0.0. */ - if (signbitd (minus_zerod) && !signbitd (round (minus_zerod))) + if (signbitd (minus_zerod) && !signbitd (my_round (minus_zerod))) return 1; return 0; } diff --git a/m4/roundf.m4 b/m4/roundf.m4 index 0ff964608..83dffd1a8 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,4 +1,4 @@ -# roundf.m4 serial 11 +# roundf.m4 serial 12 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -66,10 +66,12 @@ int main() #include ]gl_FLOAT_MINUS_ZERO_CODE[ ]gl_FLOAT_SIGNBIT_CODE[ -int main() +static float dummy (float f) { return 0; } +int main (int argc, char *argv[]) { + float (*my_roundf) (float) = argc ? roundf : dummy; /* Test whether roundf (-0.0f) is -0.0f. */ - if (signbitf (minus_zerof) && !signbitf (roundf (minus_zerof))) + if (signbitf (minus_zerof) && !signbitf (my_roundf (minus_zerof))) return 1; return 0; } diff --git a/m4/roundl.m4 b/m4/roundl.m4 index 790e0fecc..4f47e3389 100644 --- a/m4/roundl.m4 +++ b/m4/roundl.m4 @@ -1,4 +1,4 @@ -# roundl.m4 serial 9 +# roundl.m4 serial 10 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -31,10 +31,12 @@ AC_DEFUN([gl_FUNC_ROUNDL], #include ]gl_LONG_DOUBLE_MINUS_ZERO_CODE[ ]gl_LONG_DOUBLE_SIGNBIT_CODE[ -int main() +static long double dummy (long double f) { return 0; } +int main (int argc, char *argv[]) { + long double (*my_roundl) (long double) = argc ? roundl : dummy; /* Test whether roundl (-0.0L) is -0.0L. */ - if (signbitl (minus_zerol) && !signbitl (roundl (minus_zerol))) + if (signbitl (minus_zerol) && !signbitl (my_roundl (minus_zerol))) return 1; return 0; } diff --git a/m4/trunc.m4 b/m4/trunc.m4 index 953f5b131..62311015b 100644 --- a/m4/trunc.m4 +++ b/m4/trunc.m4 @@ -1,4 +1,4 @@ -# trunc.m4 serial 6 +# trunc.m4 serial 7 dnl Copyright (C) 2007, 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -56,10 +56,12 @@ AC_DEFUN([gl_FUNC_TRUNC], #include ]gl_DOUBLE_MINUS_ZERO_CODE[ ]gl_DOUBLE_SIGNBIT_CODE[ -int main() +static double dummy (double f) { return 0; } +int main (int argc, char *argv[]) { + double (*my_trunc) (double) = argc ? trunc : dummy; /* Test whether trunc (-0.0) is -0.0. */ - if (signbitd (minus_zerod) && !signbitd (trunc (minus_zerod))) + if (signbitd (minus_zerod) && !signbitd (my_trunc (minus_zerod))) return 1; return 0; } diff --git a/m4/truncf.m4 b/m4/truncf.m4 index 3920fcd46..67f8bb6b0 100644 --- a/m4/truncf.m4 +++ b/m4/truncf.m4 @@ -1,4 +1,4 @@ -# truncf.m4 serial 5 +# truncf.m4 serial 6 dnl Copyright (C) 2007, 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -56,10 +56,12 @@ AC_DEFUN([gl_FUNC_TRUNCF], #include ]gl_FLOAT_MINUS_ZERO_CODE[ ]gl_FLOAT_SIGNBIT_CODE[ -int main() +static float dummy (float f) { return 0; } +int main (int argc, char *argv[]) { + float (*my_truncf) (float) = argc ? truncf : dummy; /* Test whether truncf (-0.0f) is -0.0f. */ - if (signbitf (minus_zerof) && !signbitf (truncf (minus_zerof))) + if (signbitf (minus_zerof) && !signbitf (my_truncf (minus_zerof))) return 1; return 0; } diff --git a/m4/truncl.m4 b/m4/truncl.m4 index 2b6988b2e..c594236af 100644 --- a/m4/truncl.m4 +++ b/m4/truncl.m4 @@ -1,4 +1,4 @@ -# truncl.m4 serial 7 +# truncl.m4 serial 8 dnl Copyright (C) 2007-2008, 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -84,10 +84,12 @@ int main() #include ]gl_LONG_DOUBLE_MINUS_ZERO_CODE[ ]gl_LONG_DOUBLE_SIGNBIT_CODE[ -int main() +static long double dummy (long double f) { return 0; } +int main (int argc, char *argv[]) { + long double (*my_truncl) (long double) = argc ? truncl : dummy; /* Test whether truncl (-0.3L) is -0.0L. */ - if (signbitl (minus_zerol) && !signbitl (truncl (-0.3L))) + if (signbitl (minus_zerol) && !signbitl (my_truncl (-0.3L))) return 1; return 0; } -- 2.11.0