From 2a77a467b273c1a72fa204a8fcc6d22e6e20bb1c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 29 Nov 2013 16:32:49 +0000 Subject: Fix exp10 errno setting on underflow (bug 6787). --- math/libm-test.inc | 6 ++++-- math/w_exp10.c | 2 +- math/w_exp10f.c | 2 +- math/w_exp10l.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'math') diff --git a/math/libm-test.inc b/math/libm-test.inc index 7c599c101c..6e9d37ad22 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -8134,10 +8134,12 @@ static const struct test_f_f_data exp10_test_data[] = TEST_f_f (exp10, 4932, 1.0e4932L), TEST_f_f (exp10, -4932, 1.0e-4932L, UNDERFLOW_EXCEPTION), #endif + TEST_f_f (exp10, 1e5, plus_infty, OVERFLOW_EXCEPTION|ERRNO_ERANGE), + TEST_f_f (exp10, -1e5, 0, UNDERFLOW_EXCEPTION|ERRNO_ERANGE), TEST_f_f (exp10, 1e6, plus_infty, OVERFLOW_EXCEPTION|ERRNO_ERANGE), - TEST_f_f (exp10, -1e6, 0, UNDERFLOW_EXCEPTION), + TEST_f_f (exp10, -1e6, 0, UNDERFLOW_EXCEPTION|ERRNO_ERANGE), TEST_f_f (exp10, max_value, plus_infty, OVERFLOW_EXCEPTION|ERRNO_ERANGE), - TEST_f_f (exp10, -max_value, 0, UNDERFLOW_EXCEPTION), + TEST_f_f (exp10, -max_value, 0, UNDERFLOW_EXCEPTION|ERRNO_ERANGE), TEST_f_f (exp10, 0.75L, 5.62341325190349080394951039776481231L), }; diff --git a/math/w_exp10.c b/math/w_exp10.c index 3db012d1f1..17823f57ef 100644 --- a/math/w_exp10.c +++ b/math/w_exp10.c @@ -28,7 +28,7 @@ double __exp10 (double x) { double z = __ieee754_exp10 (x); - if (__builtin_expect (!__finite (z), 0) + if (__builtin_expect (!__finite (z) || z == 0, 0) && __finite (x) && _LIB_VERSION != _IEEE_) /* exp10 overflow (46) if x > 0, underflow (47) if x < 0. */ return __kernel_standard (x, x, 46 + !!__signbit (x)); diff --git a/math/w_exp10f.c b/math/w_exp10f.c index 082b34faf5..e2f9185b1e 100644 --- a/math/w_exp10f.c +++ b/math/w_exp10f.c @@ -28,7 +28,7 @@ float __exp10f (float x) { float z = __ieee754_exp10f (x); - if (__builtin_expect (!__finitef (z), 0) + if (__builtin_expect (!__finitef (z) || z == 0, 0) && __finitef (x) && _LIB_VERSION != _IEEE_) /* exp10f overflow (146) if x > 0, underflow (147) if x < 0. */ return __kernel_standard_f (x, x, 146 + !!__signbitf (x)); diff --git a/math/w_exp10l.c b/math/w_exp10l.c index 10f3f81fe0..19facddee6 100644 --- a/math/w_exp10l.c +++ b/math/w_exp10l.c @@ -28,7 +28,7 @@ long double __exp10l (long double x) { long double z = __ieee754_exp10l (x); - if (__builtin_expect (!__finitel (z), 0) + if (__builtin_expect (!__finitel (z) || z == 0, 0) && __finitel (x) && _LIB_VERSION != _IEEE_) /* exp10l overflow (246) if x > 0, underflow (247) if x < 0. */ return __kernel_standard_l (x, x, 246 + !!__signbitl (x)); -- cgit 1.4.1