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 /math/Makefile | |
| parent | 1cf1232cd4721dc155a5cf7d571e5b1dae506430 (diff) | |
| download | glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.zip glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.tar.gz glibc-7daada0319613fec8c2a10b28eed911f4d359a6a.tar.bz2 | |
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 'math/Makefile')
| -rw-r--r-- | math/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/math/Makefile b/math/Makefile index 9e88cfc..c47a3a4 100644 --- a/math/Makefile +++ b/math/Makefile @@ -196,7 +196,7 @@ tests = test-matherr-3 test-fenv basic-test \ test-femode-traps test-iszero-excess-precision \ test-iseqsig-excess-precision test-flt-eval-method \ test-fp-ilogb-constants test-fp-llogb-constants \ - test-fe-snans-always-signal $(tests-static) + test-fe-snans-always-signal test-finite-macros $(tests-static) tests-static = test-fpucw-static test-fpucw-ieee-static \ test-signgam-uchar-static test-signgam-uchar-init-static \ test-signgam-uint-static test-signgam-uint-init-static \ @@ -363,6 +363,8 @@ CFLAGS-test-flt-eval-method.c = -fexcess-precision=standard CFLAGS-test-fe-snans-always-signal.c = -fsignaling-nans +CFLAGS-test-finite-macros.c = -ffinite-math-only + include ../Rules gen-all-calls = $(gen-libm-calls) $(gen-calls) |