diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | bits/libc-header-start.h | 10 | ||||
| -rw-r--r-- | bits/math-finite.h | 2 | ||||
| -rw-r--r-- | math/bits/mathcalls.h | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 71b254158d..be6c9b3090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2019-08-13 Joseph Myers <joseph@codesourcery.com> + + * bits/libc-header-start.h (__GLIBC_USE_IEC_60559_FUNCS_EXT): + Update comment. + (__GLIBC_USE_IEC_60559_FUNCS_EXT_C2X): New macro. + * bits/math-finite.h [__GLIBC_USE (IEC_60559_FUNCS_EXT)]: Change + to [__GLIBC_USE (IEC_60559_FUNCS_EXT_C2X)]. + * math/bits/mathcalls.h [__GLIBC_USE (IEC_60559_FUNCS_EXT)]: + Likewise. + 2019-08-13 Florian Weimer <fweimer@redhat.com> * login/utmp_file.c (LOCK_FILE, LOCKING_FAILED, UNLOCK_FILE): diff --git a/bits/libc-header-start.h b/bits/libc-header-start.h index f2acc5333e..2c7c6e00e0 100644 --- a/bits/libc-header-start.h +++ b/bits/libc-header-start.h @@ -60,13 +60,21 @@ #endif /* ISO/IEC TS 18661-4:2015 defines the - __STDC_WANT_IEC_60559_FUNCS_EXT__ macro. */ + __STDC_WANT_IEC_60559_FUNCS_EXT__ macro. Other than the reduction + functions, the symbols from this TS are enabled unconditionally in + C2X. */ #undef __GLIBC_USE_IEC_60559_FUNCS_EXT #if defined __USE_GNU || defined __STDC_WANT_IEC_60559_FUNCS_EXT__ # define __GLIBC_USE_IEC_60559_FUNCS_EXT 1 #else # define __GLIBC_USE_IEC_60559_FUNCS_EXT 0 #endif +#undef __GLIBC_USE_IEC_60559_FUNCS_EXT_C2X +#if __GLIBC_USE (IEC_60559_FUNCS_EXT) || __GLIBC_USE (ISOC2X) +# define __GLIBC_USE_IEC_60559_FUNCS_EXT_C2X 1 +#else +# define __GLIBC_USE_IEC_60559_FUNCS_EXT_C2X 0 +#endif /* ISO/IEC TS 18661-3:2015 defines the __STDC_WANT_IEC_60559_TYPES_EXT__ macro. */ diff --git a/bits/math-finite.h b/bits/math-finite.h index 6141c12537..54cec8f8d8 100644 --- a/bits/math-finite.h +++ b/bits/math-finite.h @@ -67,7 +67,7 @@ __MATH_REDIRCALL (cosh, , (_Mdouble_)); /* exp. */ __MATH_REDIRCALL (exp, , (_Mdouble_)); -#if __GLIBC_USE (IEC_60559_FUNCS_EXT) +#if __GLIBC_USE (IEC_60559_FUNCS_EXT_C2X) /* exp10. */ __MATH_REDIRCALL (exp10, , (_Mdouble_)); #endif diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h index 3d1dc07d98..47808a2915 100644 --- a/math/bits/mathcalls.h +++ b/math/bits/mathcalls.h @@ -109,7 +109,7 @@ __MATHCALL (log10,, (_Mdouble_ __x)); /* Break VALUE into integral and fractional parts. */ __MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr)) __nonnull ((2)); -#if __GLIBC_USE (IEC_60559_FUNCS_EXT) +#if __GLIBC_USE (IEC_60559_FUNCS_EXT_C2X) /* Compute exponent to base ten. */ __MATHCALL (exp10,, (_Mdouble_ __x)); #endif |