+2017-10-30 Joseph Myers <joseph@codesourcery.com>
+
+ * math/math.h [!_Mfloat_] (_Mfloat_): Do not define.
+ [!_Mlong_double_] (_Mlong_double_): Likewise.
+ [!_Mfloat16_] (_Mfloat16_): Likewise.
+ [!_Mfloat32_] (_Mfloat32_): Likewise.
+ [!_Mfloat64_] (_Mfloat64_): Likewise.
+ [!_Mfloat128_] (_Mfloat128_): Likewise.
+ [!_Mfloat32x_] (_Mfloat32x_): Likewise.
+ [!_Mfloat64x_] (_Mfloat64x_): Likewise.
+ [!_Mfloat128x_] (_Mfloat128x_): Likewise.
+ (_Mdouble_): Define without indirection through those macros.
+ * math/complex.h [!_Mfloat_] (_Mfloat_): Do not define.
+ [!_Mfloat128_] (_Mfloat128_): Likewise.
+ [_Mlong_double_] (_Mlong_double_): Likewise.
+ (_Mdouble_): Define without indirection through those macros.
+ * math/Makefile [$(long-double-fcts) != yes] (math-CPPFLAGS): Do
+ not add -D_Mlong_double_=double.
+ * include/math.h [_ISOMAC] (_Mlong_double_): Do not undefine.
+ * math/test-signgam-finite-c99.c (_Mlong_double_): Likewise.
+
2017-10-30 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86/libc-start.c: Add /* !SHARED */.
#undef __MATH_PRECNAME
/* Now the float versions. */
-#ifndef _Mfloat_
-# define _Mfloat_ float
-#endif
-#define _Mdouble_ _Mfloat_
+#define _Mdouble_ float
#define __MATH_PRECNAME(name) name##f
#include <bits/cmathcalls.h>
#undef _Mdouble_
#if (__HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !defined _LIBC)) \
&& __GLIBC_USE (IEC_60559_TYPES_EXT)
-# ifndef _Mfloat128_
-# define _Mfloat128_ _Float128
-# endif
/* GCC < 7 requires extra convincing to expose a complex float128 type. */
# ifdef __CFLOAT128
# undef _Mdouble_complex_
# define _Mdouble_complex_ __CFLOAT128
# endif
-# define _Mdouble_ _Mfloat128_
+# define _Mdouble_ _Float128
# define __MATH_PRECNAME(name) name##f128
# include <bits/cmathcalls.h>
# undef _Mdouble_
extern type __REDIRECT_NTH(__MATH_PRECNAME(function), args, function)
# endif
-# ifndef _Mlong_double_
-# define _Mlong_double_ long double
-# endif
-# define _Mdouble_ _Mlong_double_
+# define _Mdouble_ long double
# define __MATH_PRECNAME(name) name##l
# include <bits/cmathcalls.h>
#endif
/* Include the file of declarations again, this time using `float'
instead of `double' and appending f to each function name. */
-# ifndef _Mfloat_
-# define _Mfloat_ float
-# endif
-# define _Mdouble_ _Mfloat_
+# define _Mdouble_ float
# define __MATH_PRECNAME(name,r) name##f##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 0
/* Include the file of declarations again, this time using `long double'
instead of `double' and appending l to each function name. */
-# ifndef _Mlong_double_
-# define _Mlong_double_ long double
-# endif
-# define _Mdouble_ _Mlong_double_
+# define _Mdouble_ long double
# define __MATH_PRECNAME(name,r) name##l##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 0
types. */
#if __HAVE_DISTINCT_FLOAT16 || (__HAVE_FLOAT16 && !defined _LIBC)
-# ifndef _Mfloat16_
-# define _Mfloat16_ _Float16
-# endif
-# define _Mdouble_ _Mfloat16_
+# define _Mdouble_ _Float16
# define __MATH_PRECNAME(name,r) name##f16##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1
#endif /* __HAVE_DISTINCT_FLOAT16 || (__HAVE_FLOAT16 && !_LIBC). */
#if __HAVE_DISTINCT_FLOAT32 || (__HAVE_FLOAT32 && !defined _LIBC)
-# ifndef _Mfloat32_
-# define _Mfloat32_ _Float32
-# endif
-# define _Mdouble_ _Mfloat32_
+# define _Mdouble_ _Float32
# define __MATH_PRECNAME(name,r) name##f32##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1
#endif /* __HAVE_DISTINCT_FLOAT32 || (__HAVE_FLOAT32 && !_LIBC). */
#if __HAVE_DISTINCT_FLOAT64 || (__HAVE_FLOAT64 && !defined _LIBC)
-# ifndef _Mfloat64_
-# define _Mfloat64_ _Float64
-# endif
-# define _Mdouble_ _Mfloat64_
+# define _Mdouble_ _Float64
# define __MATH_PRECNAME(name,r) name##f64##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1
#endif /* __HAVE_DISTINCT_FLOAT64 || (__HAVE_FLOAT64 && !_LIBC). */
#if __HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !defined _LIBC)
-# ifndef _Mfloat128_
-# define _Mfloat128_ _Float128
-# endif
-# define _Mdouble_ _Mfloat128_
+# define _Mdouble_ _Float128
# define __MATH_PRECNAME(name,r) name##f128##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1
#endif /* __HAVE_DISTINCT_FLOAT128 || (__HAVE_FLOAT128 && !_LIBC). */
#if __HAVE_DISTINCT_FLOAT32X || (__HAVE_FLOAT32X && !defined _LIBC)
-# ifndef _Mfloat32x_
-# define _Mfloat32x_ _Float32x
-# endif
-# define _Mdouble_ _Mfloat32x_
+# define _Mdouble_ _Float32x
# define __MATH_PRECNAME(name,r) name##f32x##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1
#endif /* __HAVE_DISTINCT_FLOAT32X || (__HAVE_FLOAT32X && !_LIBC). */
#if __HAVE_DISTINCT_FLOAT64X || (__HAVE_FLOAT64X && !defined _LIBC)
-# ifndef _Mfloat64x_
-# define _Mfloat64x_ _Float64x
-# endif
-# define _Mdouble_ _Mfloat64x_
+# define _Mdouble_ _Float64x
# define __MATH_PRECNAME(name,r) name##f64x##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1
#endif /* __HAVE_DISTINCT_FLOAT64X || (__HAVE_FLOAT64X && !_LIBC). */
#if __HAVE_DISTINCT_FLOAT128X || (__HAVE_FLOAT128X && !defined _LIBC)
-# ifndef _Mfloat128x_
-# define _Mfloat128x_ _Float128x
-# endif
-# define _Mdouble_ _Mfloat128x_
+# define _Mdouble_ _Float128x
# define __MATH_PRECNAME(name,r) name##f128x##r
# define __MATH_DECLARING_DOUBLE 0
# define __MATH_DECLARING_FLOATN 1