New module 'round-ieee'.

* modules/round-ieee: New file.
* m4/round.m4 (gl_FUNC_ROUND): If gl_FUNC_ROUND_IEEE is also used, test
whether round works according to ISO C 99 with IEC 60559.
* m4/round-ieee.m4: New file.
* modules/round-ieee-tests: New file.
* tests/test-round-ieee.c: New file, based on tests/test-roundf-ieee.c.
* tests/test-round1.c (main): Remove signbit tests.
* modules/round-tests (Depends-on): Remove 'signbit'.
* doc/posix-functions/round.texi: Mention the new module.

diff --git a/ChangeLog b/ChangeLog
index 22c775296b5134d1f64704072ea327d8f3482c6b..2a7c2d2e5d41a2eb40b50649efef6bf308e2c0b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-21  Bruno Haible  <bruno@clisp.org>
+
+       New module 'round-ieee'.
+       * modules/round-ieee: New file.
+       * m4/round.m4 (gl_FUNC_ROUND): If gl_FUNC_ROUND_IEEE is also used, test
+       whether round works according to ISO C 99 with IEC 60559.
+       * m4/round-ieee.m4: New file.
+       * modules/round-ieee-tests: New file.
+       * tests/test-round-ieee.c: New file, based on tests/test-roundf-ieee.c.
+       * tests/test-round1.c (main): Remove signbit tests.
+       * modules/round-tests (Depends-on): Remove 'signbit'.
+       * doc/posix-functions/round.texi: Mention the new module.
+
 2010-12-21  Bruno Haible  <bruno@clisp.org>
 
        New module 'trunc-ieee'.

diff --git a/doc/posix-functions/round.texi b/doc/posix-functions/round.texi
index 913490e4a7bb5598ced8517f76ea7fde38647f76..cf3189b3143b5f13e314b8b1daac59687d56908b 100644 (file)
--- a/doc/posix-functions/round.texi
+++ b/doc/posix-functions/round.texi
@@ -4,9 +4,9 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/round.html}
 
-Gnulib module: round
+Gnulib module: round or round-ieee
 
-Portability problems fixed by Gnulib:
+Portability problems fixed by either Gnulib module @code{round} or @code{round-ieee}:
 @itemize
 @item
 This function is missing on some platforms:
@@ -19,6 +19,14 @@ This functions returns a wrong result for x = 1/2 - 2^-54 on some platforms:
 NetBSD 3.0, AIX 7.1.
 @end itemize
 
+Portability problems fixed by Gnulib module @code{round-ieee}:
+@itemize
+@item
+This function returns a positive zero for a minus zero argument
+on some platforms:
+OSF/1 5.1.
+@end itemize
+
 Portability problems not fixed by Gnulib:
 @itemize
 @end itemize

diff --git a/m4/round-ieee.m4 b/m4/round-ieee.m4
new file mode 100644 (file)
index 0000000..68830b9
--- /dev/null
+++ b/m4/round-ieee.m4
@@ -0,0 +1,15 @@
+# round-ieee.m4 serial 1
+dnl Copyright (C) 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.
+
+dnl This macro is in a separate file (not in round.m4 and not inlined in the
+dnl module description), so that gl_FUNC_ROUND can test whether 'aclocal' has
+dnl found uses of this macro.
+
+AC_DEFUN([gl_FUNC_ROUND_IEEE],
+[
+  m4_divert_text([INIT_PREPARE], [gl_round_required=ieee])
+  AC_REQUIRE([gl_FUNC_ROUND])
+])

diff --git a/m4/round.m4 b/m4/round.m4
index 1d1b91c1a1161f1943314d2e45094d94cc249c11..5f19c5aa68c9fee46db4be7191cb9cbd8686b869 100644 (file)
--- a/m4/round.m4
+++ b/m4/round.m4
@@ -1,4 +1,4 @@
-# round.m4 serial 9
+# round.m4 serial 10
 dnl Copyright (C) 2007, 2009-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,
@@ -6,6 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_ROUND],
 [
+  m4_divert_text([DEFAULTS], [gl_round_required=plain])
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
   dnl Persuade glibc <math.h> to declare round().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -53,6 +54,40 @@ int main()
     if test "$ROUND_LIBM" = missing; then
       REPLACE_ROUND=1
     fi
+    m4_ifdef([gl_FUNC_ROUND_IEEE], [
+      if test $gl_round_required = ieee && test $REPLACE_ROUND = 0; then
+        AC_CACHE_CHECK([whether round works according to ISO C 99 with IEC 60559],
+          [gl_cv_func_round_ieee],
+          [
+            save_LIBS="$LIBS"
+            LIBS="$LIBS $ROUND_LIBM"
+            AC_RUN_IFELSE(
+              [AC_LANG_SOURCE([[
+#ifndef __NO_MATH_INLINES
+# define __NO_MATH_INLINES 1 /* for glibc */
+#endif
+#include <math.h>
+]gl_DOUBLE_MINUS_ZERO_CODE[
+]gl_DOUBLE_SIGNBIT_CODE[
+int main()
+{
+  /* Test whether round (-0.0) is -0.0.  */
+  if (signbitd (minus_zerod) && !signbitd (round (minus_zerod)))
+    return 1;
+  return 0;
+}
+              ]])],
+              [gl_cv_func_round_ieee=yes],
+              [gl_cv_func_round_ieee=no],
+              [gl_cv_func_round_ieee="guessing no"])
+            LIBS="$save_LIBS"
+          ])
+        case "$gl_cv_func_round_ieee" in
+          *yes) ;;
+          *) REPLACE_ROUND=1 ;;
+        esac
+      fi
+    ])
   else
     HAVE_DECL_ROUND=0
   fi

diff --git a/modules/round-ieee b/modules/round-ieee
new file mode 100644 (file)
index 0000000..3cdedca
--- /dev/null
+++ b/modules/round-ieee
@@ -0,0 +1,27 @@
+Description:
+round() function according to ISO C 99 with IEC 60559.
+
+Files:
+m4/round-ieee.m4
+m4/minus-zero.m4
+m4/signbit.m4
+
+Depends-on:
+round
+
+configure.ac:
+gl_FUNC_ROUND_IEEE
+
+Makefile.am:
+
+Include:
+<math.h>
+
+Link:
+$(ROUND_LIBM)
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible

diff --git a/modules/round-ieee-tests b/modules/round-ieee-tests
new file mode 100644 (file)
index 0000000..6e32da5
--- /dev/null
+++ b/modules/round-ieee-tests
@@ -0,0 +1,15 @@
+Files:
+tests/test-round-ieee.c
+tests/minus-zero.h
+tests/macros.h
+
+Depends-on:
+float
+signbit
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-round-ieee
+check_PROGRAMS += test-round-ieee
+test_round_ieee_LDADD = $(LDADD) @ROUND_LIBM@

diff --git a/modules/round-tests b/modules/round-tests
index cf3d9604f048155967b949d85f5fd5199104adfd..9e154c8cc1b4fbefe140be287a6f2be63fbb7ef7 100644 (file)
--- a/modules/round-tests
+++ b/modules/round-tests
@@ -8,7 +8,6 @@ tests/macros.h
 
 Depends-on:
 isnand-nolibm
-signbit
 stdbool
 stdint
 verify

diff --git a/tests/test-round-ieee.c b/tests/test-round-ieee.c
new file mode 100644 (file)
index 0000000..0d5ad86
--- /dev/null
+++ b/tests/test-round-ieee.c
@@ -0,0 +1,33 @@
+/* Test of rounding to nearest, breaking ties away from zero.
+   Copyright (C) 2010 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+#include <math.h>
+
+#include "minus-zero.h"
+#include "macros.h"
+
+int
+main ()
+{
+  /* Zero.  */
+  ASSERT (!signbit (round (0.0)));
+  ASSERT (!!signbit (round (minus_zerod)) == !!signbit (minus_zerod));
+
+  return 0;
+}

diff --git a/tests/test-round1.c b/tests/test-round1.c
index 4711a743615ddfa810ce4e99f67e5c87e4a20905..86fd1de7ab53f5882ce221ccf1c9484461e5476a 100644 (file)
--- a/tests/test-round1.c
+++ b/tests/test-round1.c
@@ -35,9 +35,7 @@ main ()
 {
   /* Zero.  */
   ASSERT (round (0.0) == 0.0);
-  ASSERT (!signbit (round (0.0)));
   ASSERT (round (minus_zerod) == 0.0);
-  ASSERT (!!signbit (minus_zerod) == !!signbit (round (minus_zerod)));
   /* Positive numbers.  */
   ASSERT (round (0.3) == 0.0);
   ASSERT (round (0.5) == 1.0);