diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | math/math.h | 32 |
2 files changed, 47 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f862d9c890..44d55184cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2017-11-03 Joseph Myers <joseph@codesourcery.com> + + * math/math.h [__HAVE_DISTINCT_FLOAT16 + || __HAVE_DISTINCT_FLOAT32 || __HAVE_DISTINCT_FLOAT64 + || __HAVE_DISTINCT_FLOAT32X || __HAVE_DISTINCT_FLOAT64X + || __HAVE_DISTINCT_FLOAT128X]: Use #error. + [__NO_LONG_DOUBLE_MATH && __HAVE_DISTINCT_FLOAT128]: Likewise. + [__HAVE_DISTINCT_FLOAT128 && !__HAVE_GENERIC_SELECTION + && __HAVE_FLOATN_NOT_TYPEDEF]: Likewise. + [__HAVE_DISTINCT_FLOAT128 && __HAVE_GENERIC_SELECTION] + (__MATH_TG_F32): New macro. + [__HAVE_DISTINCT_FLOAT128 && __HAVE_GENERIC_SELECTION] + (__MATH_TG_F64X): Likewise. + [__HAVE_DISTINCT_FLOAT128 && __HAVE_GENERIC_SELECTION] + (__MATH_TG): Use __MATH_TG_F32 and __MATH_TG_F64X. + 2017-11-03 Dmitry V. Levin <ldv@altlinux.org> * po/de.po: Update translations. diff --git a/math/math.h b/math/math.h index 326fd8ebe1..f6d1feed78 100644 --- a/math/math.h +++ b/math/math.h @@ -489,6 +489,14 @@ extern long double __REDIRECT_NTH (nexttowardl, extern int signgam; #endif +#if (__HAVE_DISTINCT_FLOAT16 \ + || __HAVE_DISTINCT_FLOAT32 \ + || __HAVE_DISTINCT_FLOAT64 \ + || __HAVE_DISTINCT_FLOAT32X \ + || __HAVE_DISTINCT_FLOAT64X \ + || __HAVE_DISTINCT_FLOAT128X) +# error "Unsupported _FloatN or _FloatNx types for <math.h>." +#endif /* Depending on the type of TG_ARG, call an appropriately suffixed version of FUNC with arguments (including parentheses) ARGS. @@ -500,17 +508,39 @@ extern int signgam; return the same type (FUNC may include a cast if necessary rather than being a single identifier). */ #ifdef __NO_LONG_DOUBLE_MATH +# if __HAVE_DISTINCT_FLOAT128 +# error "Distinct _Float128 without distinct long double not supported." +# endif # define __MATH_TG(TG_ARG, FUNC, ARGS) \ (sizeof (TG_ARG) == sizeof (float) ? FUNC ## f ARGS : FUNC ARGS) #elif __HAVE_DISTINCT_FLOAT128 # if __HAVE_GENERIC_SELECTION -# define __MATH_TG(TG_ARG, FUNC, ARGS) \ +# if __HAVE_FLOATN_NOT_TYPEDEF && __HAVE_FLOAT32 +# define __MATH_TG_F32(FUNC, ARGS) _Float32: FUNC ## f ARGS, +# else +# define __MATH_TG_F32(FUNC, ARGS) +# endif +# if __HAVE_FLOATN_NOT_TYPEDEF && __HAVE_FLOAT64X +# if __HAVE_FLOAT64X_LONG_DOUBLE +# define __MATH_TG_F64X(FUNC, ARGS) _Float64x: FUNC ## l ARGS, +# else +# define __MATH_TG_F64X(FUNC, ARGS) _Float64x: FUNC ## f128 ARGS, +# endif +# else +# define __MATH_TG_F64X(FUNC, ARGS) +# endif +# define __MATH_TG(TG_ARG, FUNC, ARGS) \ _Generic ((TG_ARG), \ float: FUNC ## f ARGS, \ + __MATH_TG_F32 (FUNC, ARGS) \ default: FUNC ARGS, \ long double: FUNC ## l ARGS, \ + __MATH_TG_F64X (FUNC, ARGS) \ _Float128: FUNC ## f128 ARGS) # else +# if __HAVE_FLOATN_NOT_TYPEDEF +# error "Non-typedef _FloatN but no _Generic." +# endif # define __MATH_TG(TG_ARG, FUNC, ARGS) \ __builtin_choose_expr \ (__builtin_types_compatible_p (__typeof (TG_ARG), float), \ |