[BZ #2510, BZ #2830, BZ #3137, BZ #3313, BZ #3426, BZ #3465, BZ #3480, BZ #3483,...

[thirdparty/glibc.git] / sysdeps / ieee754 / ldbl-128 / s_nexttoward.c

diff --git a/sysdeps/ieee754/ldbl-128/s_nexttoward.c b/sysdeps/ieee754/ldbl-128/s_nexttoward.c
index 178505c58ff6c5834cb46a8fd80fac9a3ef4eaa3..553e4019732db89dfc2394031b1f5a29b51e2b7c 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/s_nexttoward.c
+++ b/sysdeps/ieee754/ldbl-128/s_nexttoward.c
@@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: $";
  */
 
 #include "math.h"
-#include <math_private.h>
+#include "math_private.h"
 #include <float.h>
 
 #ifdef __STDC__
@@ -53,12 +53,10 @@ static char rcsid[] = "$NetBSD: $";
           return x+y;
        if((long double) x==y) return y;        /* x=y, return y */
        if((ix|lx)==0) {                        /* x == 0 */
-           double u;
+           double x2;
            INSERT_WORDS(x,(u_int32_t)((hy>>32)&0x80000000),1);/* return +-minsub */
-           u = math_opt_barrier (x);
-           u = u * u;
-           math_force_eval (u);                /* raise underflow flag */
-           return x;
+           x2 = x*x;
+           if(x2==x) return x2; else return x; /* raise underflow flag */
        }
        if(hx>=0) {                             /* x > 0 */
            if (hy<0||(ix>>20)>(iy>>48)-0x3c00
@@ -89,13 +87,16 @@ static char rcsid[] = "$NetBSD: $";
        if(hy>=0x7ff00000) {
          x = x+x;      /* overflow  */
          if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
-           /* Force conversion to double.  */
-           asm ("" : "+m"(x));
+           /* Force conversion to float.  */
+           asm ("" : "=m"(x) : "m"(x));
          return x;
        }
-       if(hy<0x00100000) {
-           double u = x*x;                     /* underflow */
-           math_force_eval (u);                /* raise underflow flag */
+       if(hy<0x00100000) {             /* underflow */
+           double x2 = x*x;
+           if(x2!=x) {         /* raise underflow flag */
+               INSERT_WORDS(x2,hx,lx);
+               return x2;
+           }
        }
        INSERT_WORDS(x,hx,lx);
        return x;