aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-12-20 15:00:24 -0800
committerH.J. Lu <hjl.tools@gmail.com>2021-12-23 06:45:47 -0800
commit6e30181b4a3ab6c56da0378b65f4d60504982300 (patch)
tree74d8259530d69b3a855ef67da9df377fae0f658c /math
parenta4b413135535c83a25a8b2d661bf1c75006dfa15 (diff)
downloadglibc-6e30181b4a3ab6c56da0378b65f4d60504982300.zip
glibc-6e30181b4a3ab6c56da0378b65f4d60504982300.tar.gz
glibc-6e30181b4a3ab6c56da0378b65f4d60504982300.tar.bz2
math: Properly cast X_TLOSS to float [BZ #28713]
Add #define AS_FLOAT_CONSTANT_1(x) x##f #define AS_FLOAT_CONSTANT(x) AS_FLOAT_CONSTANT_1(x) to cast X_TLOSS to float at compile-time to fix: FAIL: math/test-float-j0 FAIL: math/test-float-jn FAIL: math/test-float-y0 FAIL: math/test-float-y1 FAIL: math/test-float-yn FAIL: math/test-float32-j0 FAIL: math/test-float32-jn FAIL: math/test-float32-y0 FAIL: math/test-float32-y1 FAIL: math/test-float32-yn when compiling with GCC 12. Reviewed-by: Paul Zimmermann <Paul.Zimmermann@inria.fr>
Diffstat (limited to 'math')
-rw-r--r--math/math-svid-compat.h2
-rw-r--r--math/w_j0f_compat.c5
-rw-r--r--math/w_j1f_compat.c5
-rw-r--r--math/w_jnf_compat.c5
4 files changed, 11 insertions, 6 deletions
diff --git a/math/math-svid-compat.h b/math/math-svid-compat.h
index 5c18cb1..876cadd 100644
--- a/math/math-svid-compat.h
+++ b/math/math-svid-compat.h
@@ -49,6 +49,8 @@ extern int matherr (struct exception *__exc);
extern int __matherr (struct exception *__exc);
#define X_TLOSS 1.41484755040568800000e+16
+#define AS_FLOAT_CONSTANT_1(x) x##f
+#define AS_FLOAT_CONSTANT(x) AS_FLOAT_CONSTANT_1(x)
/* Types of exceptions in the `type' field. */
#define DOMAIN 1
diff --git a/math/w_j0f_compat.c b/math/w_j0f_compat.c
index d375f3b..3257533 100644
--- a/math/w_j0f_compat.c
+++ b/math/w_j0f_compat.c
@@ -27,7 +27,8 @@
float
__j0f (float x)
{
- if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+ if (__builtin_expect (isgreater (fabsf (x),
+ AS_FLOAT_CONSTANT (X_TLOSS)), 0)
&& _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
/* j0(|x|>X_TLOSS) */
return __kernel_standard_f (x, x, 134);
@@ -42,7 +43,7 @@ float
__y0f (float x)
{
if (__builtin_expect (islessequal (x, 0.0f)
- || isgreater (x, (float) X_TLOSS), 0)
+ || isgreater (x, AS_FLOAT_CONSTANT (X_TLOSS)), 0)
&& _LIB_VERSION != _IEEE_)
{
if (x < 0.0f)
diff --git a/math/w_j1f_compat.c b/math/w_j1f_compat.c
index 81e56b7..025ed3a 100644
--- a/math/w_j1f_compat.c
+++ b/math/w_j1f_compat.c
@@ -27,7 +27,8 @@
float
__j1f (float x)
{
- if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
+ if (__builtin_expect (isgreater (fabsf (x),
+ AS_FLOAT_CONSTANT (X_TLOSS)), 0)
&& _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
/* j1(|x|>X_TLOSS) */
return __kernel_standard_f (x, x, 136);
@@ -42,7 +43,7 @@ float
__y1f (float x)
{
if (__builtin_expect (islessequal (x, 0.0f)
- || isgreater (x, (float) X_TLOSS), 0)
+ || isgreater (x, AS_FLOAT_CONSTANT (X_TLOSS)), 0)
&& _LIB_VERSION != _IEEE_)
{
if (x < 0.0f)
diff --git a/math/w_jnf_compat.c b/math/w_jnf_compat.c
index 296e631..ee9e80c 100644
--- a/math/w_jnf_compat.c
+++ b/math/w_jnf_compat.c
@@ -27,7 +27,8 @@
float
__jnf (int n, float x)
{
- if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+ if (__builtin_expect (isgreater (fabsf (x),
+ AS_FLOAT_CONSTANT (X_TLOSS)), 0)
&& _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_)
/* jn(n,|x|>X_TLOSS) */
return __kernel_standard_f (n, x, 138);
@@ -42,7 +43,7 @@ float
__ynf (int n, float x)
{
if (__builtin_expect (islessequal (x, 0.0f)
- || isgreater (x, (float) X_TLOSS), 0)
+ || isgreater (x, AS_FLOAT_CONSTANT (X_TLOSS)), 0)
&& _LIB_VERSION != _IEEE_)
{
if (x < 0.0f)