diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-04-06 14:33:14 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-12-13 10:08:46 -0300 |
| commit | 104d2005d5b7fb13a970905ca3f4a7e7e783cf1a (patch) | |
| tree | 7af83f8b5fe473d72e1d0ec72c5ac45b4d0351b6 /sysdeps/ieee754/dbl-64 | |
| parent | 2f44eef584a4c9650ce772258dedde902c00dae2 (diff) | |
| download | glibc-104d2005d5b7fb13a970905ca3f4a7e7e783cf1a.tar.gz glibc-104d2005d5b7fb13a970905ca3f4a7e7e783cf1a.tar.xz glibc-104d2005d5b7fb13a970905ca3f4a7e7e783cf1a.zip | |
math: Remove the error handling wrapper from hypot and hypotf
The error handling is moved to sysdeps/ieee754 version with no SVID support. The compatibility symbol versions still use the wrapper with SVID error handling around the new code. There is no new symbol version nor compatibility code on !LIBM_SVID_COMPAT targets (e.g. riscv). Only ia64 is unchanged, since it still uses the arch specific __libm_error_region on its implementation. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu.
Diffstat (limited to 'sysdeps/ieee754/dbl-64')
| -rw-r--r-- | sysdeps/ieee754/dbl-64/e_hypot.c | 25 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/w_hypot.c | 1 |
2 files changed, 22 insertions, 4 deletions
diff --git a/sysdeps/ieee754/dbl-64/e_hypot.c b/sysdeps/ieee754/dbl-64/e_hypot.c index 0bdab989e4..a822ec2065 100644 --- a/sysdeps/ieee754/dbl-64/e_hypot.c +++ b/sysdeps/ieee754/dbl-64/e_hypot.c @@ -34,12 +34,15 @@ [1] https://arxiv.org/pdf/1904.09481.pdf */ +#include <errno.h> #include <math.h> #include <math_private.h> #include <math-underflow.h> #include <math-narrow-eval.h> #include <math-use-builtins.h> +#include <math-svid-compat.h> #include <libm-alias-finite.h> +#include <libm-alias-double.h> #include "math_config.h" #define SCALE 0x1p-600 @@ -47,6 +50,14 @@ #define TINY_VAL 0x1p-459 #define EPS 0x1p-54 +static inline double +handle_errno (double r) +{ + if (isinf (r)) + __set_errno (ERANGE); + return r; +} + /* Hypot kernel. The inputs must be adjusted so that ax >= ay >= 0 and squaring ax, ay and (ax - ay) does not overflow or underflow. */ static inline double @@ -83,7 +94,7 @@ kernel (double ax, double ay) } double -__ieee754_hypot (double x, double y) +__hypot (double x, double y) { if (!isfinite(x) || !isfinite(y)) { @@ -103,9 +114,10 @@ __ieee754_hypot (double x, double y) if (__glibc_unlikely (ax > LARGE_VAL)) { if (__glibc_unlikely (ay <= ax * EPS)) - return math_narrow_eval (ax + ay); + return handle_errno (math_narrow_eval (ax + ay)); - return math_narrow_eval (kernel (ax * SCALE, ay * SCALE) / SCALE); + return handle_errno (math_narrow_eval (kernel (ax * SCALE, ay * SCALE) + / SCALE)); } /* If ay is tiny, scale both inputs up. */ @@ -125,6 +137,11 @@ __ieee754_hypot (double x, double y) return kernel (ax, ay); } -#ifndef __ieee754_hypot +strong_alias (__hypot, __ieee754_hypot) libm_alias_finite (__ieee754_hypot, __hypot) +#if LIBM_SVID_COMPAT +versioned_symbol (libm, __hypot, hypot, GLIBC_2_35); +libm_alias_double_other (__hypot, hypot) +#else +libm_alias_double (__hypot, hypot) #endif diff --git a/sysdeps/ieee754/dbl-64/w_hypot.c b/sysdeps/ieee754/dbl-64/w_hypot.c new file mode 100644 index 0000000000..1cc8931700 --- /dev/null +++ b/sysdeps/ieee754/dbl-64/w_hypot.c @@ -0,0 +1 @@ +/* Not needed. */ |