Split helper classification macros from mathcalls.h

The classification macros: finite, fpclassify, iseqsig, isinf, isnan,
issignaling, and signbit are defined by ISO C11 and declared in
mathcalls.h for each of the floating-point types: float, double, and
long double.

TS 18661-3 does not mention these macros for float128, however support
for them must be present when _Float128 is present.  This is true,
even when the feature test macro __STDC_WANT_IEC_60559_TYPES_EXT__ is
false.  Other function declarations in mathcalls.h, on the other hand,
depend on __STDC_WANT_IEC_60559_TYPES_EXT__.

This patch splits the helper functions (__finite, __fpclassify,
__iseqsig, __isinf, __isnan, __issignaling, and __signbit) from
mathcalls.h, so that these helper functions can be declared for
_Float128, even when __STDC_WANT_IEC_60559_TYPES_EXT__ is false.

Tested for powerpc64le, s390x, and x86_64.

	* include/bits/mathcalls-helper-functions.h: New file.
	* math/Makefile (headers): Add bits/mathcalls-helper-functions.h.
	* math/bits/mathcalls.h (__finite, __fpclassify, __iseqsig)
	(__isinf, __isnan, __issignaling, __signbit): Move declarations to
	math/bits/mathcalls-helper-functions.h.
	* math/bits/mathcalls-helper-functions.h: New file.
	* math/math.h: Include bits/mathcalls-helper-functions.h for
	float, double, and long double.

diff --git a/ChangeLog b/ChangeLog
index 6a1e23633043fff686b27c22a0d3c149390ab2b7..9885c590832a46a4b9a82b3601912cf59a36e4d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-03-14  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
+
+       * include/bits/mathcalls-helper-functions.h: New file.
+       * math/Makefile (headers): Add bits/mathcalls-helper-functions.h.
+       * math/bits/mathcalls.h (__finite, __fpclassify, __iseqsig)
+       (__isinf, __isnan, __issignaling, __signbit): Move declarations to
+       math/bits/mathcalls-helper-functions.h.
+       * math/bits/mathcalls-helper-functions.h: New file.
+       * math/math.h: Include bits/mathcalls-helper-functions.h for
+       float, double, and long double.
+
 2017-03-15  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
        * math/s_iseqsig_template.c (__iseqsig): Use __feraiseexcept

diff --git a/include/bits/mathcalls-helper-functions.h b/include/bits/mathcalls-helper-functions.h
new file mode 100644 (file)
index 0000000..bb71f7f
--- /dev/null
+++ b/include/bits/mathcalls-helper-functions.h
@@ -0,0 +1 @@
+#include <math/bits/mathcalls-helper-functions.h>

diff --git a/math/Makefile b/math/Makefile
index 29e7436162639a15ff8f0171b614e7b998bf0b0d..97080a760cf1cdfa31936d4d4fc865887dcdb626 100644 (file)
--- a/math/Makefile
+++ b/math/Makefile
@@ -29,7 +29,7 @@ headers               := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
                   bits/math-finite.h bits/math-vector.h \
                   bits/libm-simd-decl-stubs.h bits/iscanonical.h \
                   bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \
-                  bits/long-double.h
+                  bits/long-double.h bits/mathcalls-helper-functions.h
 
 # FPU support code.
 aux            := setfpucw fpu_control

diff --git a/math/bits/mathcalls-helper-functions.h b/math/bits/mathcalls-helper-functions.h
new file mode 100644 (file)
index 0000000..dec2d99
--- /dev/null
+++ b/math/bits/mathcalls-helper-functions.h
@@ -0,0 +1,43 @@
+/* Prototype declarations for math classification macros helpers.
+   Copyright (C) 2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+
+/* Classify given number.  */
+__MATHDECL_1 (int, __fpclassify,, (_Mdouble_ __value))
+     __attribute__ ((__const__));
+
+/* Test for negative number.  */
+__MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
+     __attribute__ ((__const__));
+
+/* Return 0 if VALUE is finite or NaN, +1 if it
+   is +Infinity, -1 if it is -Infinity.  */
+__MATHDECL_1 (int, __isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
+
+/* Return nonzero if VALUE is finite and not NaN.  Used by isfinite macro.  */
+__MATHDECL_1 (int, __finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
+
+/* Return nonzero if VALUE is not a number.  */
+__MATHDECL_1 (int, __isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
+
+/* Test equality.  */
+__MATHDECL_1 (int, __iseqsig,, (_Mdouble_ __x, _Mdouble_ __y));
+
+/* Test for signaling NaN.  */
+__MATHDECL_1 (int, __issignaling,, (_Mdouble_ __value))
+     __attribute__ ((__const__));

diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 3d3b4142b994e7f6253999318edb969153115f80..fe315fd3d1d6a836c4c2b6fc50ece2a9421a36a1 100644 (file)
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -187,14 +187,6 @@ __MATHCALLX (floor,, (_Mdouble_ __x), (__const__));
 
 /* Floating-point modulo remainder of X/Y.  */
 __MATHCALL (fmod,, (_Mdouble_ __x, _Mdouble_ __y));
-
-
-/* Return 0 if VALUE is finite or NaN, +1 if it
-   is +Infinity, -1 if it is -Infinity.  */
-__MATHDECL_1 (int,__isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
-
-/* Return nonzero if VALUE is finite and not NaN.  */
-__MATHDECL_1 (int,__finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
 _Mdouble_END_NAMESPACE
 
 #ifdef __USE_MISC
@@ -232,9 +224,6 @@ __END_NAMESPACE_C99
 #endif
 
 
-/* Return nonzero if VALUE is not a number.  */
-__MATHDECL_1 (int,__isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
-
 #if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 # if (!defined __cplusplus \
       || __cplusplus < 201103L /* isnan conflicts with C++11.  */ \
@@ -366,16 +355,6 @@ __MATHCALLX (fmax,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
 /* Return minimum numeric value from X and Y.  */
 __MATHCALLX (fmin,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
 
-
-/* Classify given number.  */
-__MATHDECL_1 (int, __fpclassify,, (_Mdouble_ __value))
-     __attribute__ ((__const__));
-
-/* Test for negative number.  */
-__MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
-     __attribute__ ((__const__));
-
-
 /* Multiply-add function computed as a ternary operation.  */
 __MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
 #endif /* Use ISO C99.  */
@@ -416,13 +395,6 @@ __MATHCALLX (fmaxmag,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
 /* Return value with minimum magnitude.  */
 __MATHCALLX (fminmag,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
 
-/* Test equality.  */
-__MATHDECL_1 (int, __iseqsig,, (_Mdouble_ __x, _Mdouble_ __y));
-
-/* Test for signaling NaN.  */
-__MATHDECL_1 (int, __issignaling,, (_Mdouble_ __value))
-     __attribute__ ((__const__));
-
 /* Total order operation.  */
 __MATHDECL_1 (int, totalorder,, (_Mdouble_ __x, _Mdouble_ __y))
      __attribute__ ((__const__));

diff --git a/math/math.h b/math/math.h
index 09f0ce821e5ec16f99e13aab19dfd7d487ee0208..fde307005cb2eeb92579ba2d259bd0a0da505ac3 100644 (file)
--- a/math/math.h
+++ b/math/math.h
@@ -210,6 +210,7 @@ enum
 #define __MATH_DECLARING_DOUBLE  1
 #define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_STD
 #define _Mdouble_END_NAMESPACE   __END_NAMESPACE_STD
+#include <bits/mathcalls-helper-functions.h>
 #include <bits/mathcalls.h>
 #undef _Mdouble_
 #undef _Mdouble_BEGIN_NAMESPACE
@@ -231,6 +232,7 @@ enum
 # define __MATH_DECLARING_DOUBLE  0
 # define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99
 # define _Mdouble_END_NAMESPACE   __END_NAMESPACE_C99
+# include <bits/mathcalls-helper-functions.h>
 # include <bits/mathcalls.h>
 # undef        _Mdouble_
 # undef _Mdouble_BEGIN_NAMESPACE
@@ -278,6 +280,7 @@ extern long double __REDIRECT_NTH (nexttowardl,
 #  define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_C99
 #  define _Mdouble_END_NAMESPACE   __END_NAMESPACE_C99
 #  define __MATH_DECLARE_LDOUBLE   1
+#  include <bits/mathcalls-helper-functions.h>
 #  include <bits/mathcalls.h>
 #  undef _Mdouble_
 #  undef _Mdouble_BEGIN_NAMESPACE