diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-08-29 14:15:37 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-08-29 14:15:37 +0000 |
| commit | 7daada0319613fec8c2a10b28eed911f4d359a6a (patch) | |
| tree | 322a791c6c073650b01d41ac91e54a1be5887edd /ChangeLog | |
| parent | 1cf1232cd4721dc155a5cf7d571e5b1dae506430 (diff) | |
| download | glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.tar glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.tar.gz glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.tar.bz2 glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.zip | |
Fix bits/math-finite.h _MSUF_ expansion namespace (bug 22028).
The current bits/math-finite.h approach to defining functions for
different types, involving math.h defining _MSUF_ and _MSUFTO_ for the
function suffixes involved, is not namespace-clean if one of those
suffixes (f, l, f128) is defined as a macro by the user before math.h
is included; too many levels of macro expansion occur. Instead, those
suffixes should appear directly in the expansion of the macro using ##
so they don't get expanded even if defined as macros by the user (that
is, math.h should be defining __REDIRFROM_X and __REDIRTO_X directly
to use those suffixes rather than suffixes being passed as an argument
by macro callers). This patch makes that change.
Tested for x86_64.
[BZ #22028]
* math/math.h [__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0]
(_MSUF_): Remove macro.
[__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0] (_MSUFTO_):
Likewise.
[__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0]
(__REDIRFROM_X): New macro.
[__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0] (__REDIRTO_X):
Likewise.
* math/bits/math-finite.h (__REDIRFROM_X): Remove macro.
(__REDIRTO_X): Likewise.
(__MATH_REDIRCALL): Do not pass _MSUF_ or _MSUFTO_ macro
arguments.
(__MATH_REDIRCALL_2): Likewise.
(__MATH_REDIRCALL_INTERNAL): Likewise.
(__REDIRFROM (lgamma, , _MSUF_)): Likewise.
(__REDIRFROM (gamma, , _MSUF_)): Likweise.
(__REDIRFROM (__gamma, _r_finite, _MSUF_)): Likewise.
(__REDIRFROM (tgamma, , _MSUF_)): Likewise.
* math/test-finite-macros.c: New file.
* math/Makefile (tests): Add test-finite-macros.
(CFLAGS-test-finite-macros.c): New variable.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 25 |
1 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,28 @@ +2017-08-29 Joseph Myers <joseph@codesourcery.com> + + [BZ #22028] + * math/math.h [__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0] + (_MSUF_): Remove macro. + [__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0] (_MSUFTO_): + Likewise. + [__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0] + (__REDIRFROM_X): New macro. + [__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0] (__REDIRTO_X): + Likewise. + * math/bits/math-finite.h (__REDIRFROM_X): Remove macro. + (__REDIRTO_X): Likewise. + (__MATH_REDIRCALL): Do not pass _MSUF_ or _MSUFTO_ macro + arguments. + (__MATH_REDIRCALL_2): Likewise. + (__MATH_REDIRCALL_INTERNAL): Likewise. + (__REDIRFROM (lgamma, , _MSUF_)): Likewise. + (__REDIRFROM (gamma, , _MSUF_)): Likweise. + (__REDIRFROM (__gamma, _r_finite, _MSUF_)): Likewise. + (__REDIRFROM (tgamma, , _MSUF_)): Likewise. + * math/test-finite-macros.c: New file. + * math/Makefile (tests): Add test-finite-macros. + (CFLAGS-test-finite-macros.c): New variable. + 2017-08-29 Patsy Franklin <pfrankli@redhat.com> Jeff Law <law@redhat.com> |