.

[thirdparty/glibc.git] / sysdeps / ieee754 / ldbl-opt / s_nexttowardfd.c

diff --git a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
index d52526f7190ebffc22aa724c4b0baf47871d1d94..68027f26fa3c36660b0356b54b766d51002cbf2a 100644 (file)
--- a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
+++ b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
@@ -20,7 +20,10 @@
  *   Special cases:
  */
 
+#include <math.h>
+#include <math_private.h>
 #include <math_ldbl_opt.h>
+#include <float.h>
 
 float __nldbl_nexttowardf(float x, double y);
 
@@ -39,10 +42,12 @@ float __nldbl_nexttowardf(float x, double y)
           return x+y;
        if((double) x==y) return y;             /* x=y, return y */
        if(ix==0) {                             /* x == 0 */
-           float x2;
+           float u;
            SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
-           x2 = x*x;
-           if(x2==x) return x2; else return x; /* raise underflow flag */
+           u = math_opt_barrier (x);
+           u = u * u;
+           math_force_eval (u);                /* raise underflow flag */
+           return x;
        }
        if(hx>=0) {                             /* x > 0 */
            if(hy<0||(ix>>23)>(iy>>20)-0x380
@@ -60,13 +65,16 @@ float __nldbl_nexttowardf(float x, double y)
                hx += 1;
        }
        hy = hx&0x7f800000;
-       if(hy>=0x7f800000) return x+x;  /* overflow  */
-       if(hy<0x00800000) {             /* underflow */
-           float x2 = x*x;
-           if(x2!=x) {         /* raise underflow flag */
-               SET_FLOAT_WORD(x2,hx);
-               return x2;
-           }
+       if(hy>=0x7f800000) {
+         x = x+x;      /* overflow  */
+         if (FLT_EVAL_METHOD != 0)
+           /* Force conversion to float.  */
+           asm ("" : "+m"(x));
+         return x;
+       }
+       if(hy<0x00800000) {
+           float u = x*x;                      /* underflow */
+           math_force_eval (u);                /* raise underflow flag */
        }
        SET_FLOAT_WORD(x,hx);
        return x;