diff options
author | Joseph Myers <joseph@codesourcery.com> | 2016-12-14 22:41:26 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2016-12-14 22:41:26 +0000 |
commit | f02bb0004c5b1944333fd8e74ac1efda3074084b (patch) | |
tree | 8d8a014f21c16954053431f52588ef8267a5753b /math/s_fmin_template.c | |
parent | 0acb8a2a855395c25b1feef2470f4d7ca4bed589 (diff) | |
download | glibc-f02bb0004c5b1944333fd8e74ac1efda3074084b.tar glibc-f02bb0004c5b1944333fd8e74ac1efda3074084b.tar.gz glibc-f02bb0004c5b1944333fd8e74ac1efda3074084b.tar.bz2 glibc-f02bb0004c5b1944333fd8e74ac1efda3074084b.zip |
Fix generic fmax, fmin sNaN handling (bug 20947).
Various fmax and fmin function implementations mishandle sNaN
arguments:
(a) When both arguments are NaNs, the return value should be a qNaN,
but sometimes it is an sNaN if at least one argument is an sNaN.
(b) Under TS 18661-1 semantics, if either argument is an sNaN then the
result should be a qNaN (whereas if one argument is a qNaN and the
other is not a NaN, the result should be the non-NaN argument).
Various implementations treat sNaNs like qNaNs here.
This patch fixes the generic implementations used in the absence of
architecture-specific versions.
Tested for mips64 and powerpc (together with testcases that I'll add
along with the x86_64 / x86 fixes).
[BZ #20947]
* math/s_fmax_template.c (M_DECL_FUNC (__fmax)): Add the arguments
when either is a signaling NaN.
* math/s_fmin_template.c (M_DECL_FUNC (__fmin)): Likewise.
Diffstat (limited to 'math/s_fmin_template.c')
-rw-r--r-- | math/s_fmin_template.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/math/s_fmin_template.c b/math/s_fmin_template.c index b70989ac74..82009bb7e8 100644 --- a/math/s_fmin_template.c +++ b/math/s_fmin_template.c @@ -23,7 +23,14 @@ FLOAT M_DECL_FUNC (__fmin) (FLOAT x, FLOAT y) { - return (islessequal (x, y) || isnan (y)) ? x : y; + if (islessequal (x, y)) + return x; + else if (isgreater (x, y)) + return y; + else if (issignaling (x) || issignaling (y)) + return x + y; + else + return isnan (y) ? x : y; } declare_mgen_alias (__fmin, fmin); |