yann@1201: Original patch from: gentoo/src/patchsets/glibc/2.9/1073_all_glibc-ldbl-nexttowardf.patch yann@1201: yann@1201: -= BEGIN original header =- yann@1201: ripped from Debian yann@1201: yann@1201: this change was made to generic __nexttowardf, but not the long double version yann@1201: yann@1201: 2008-05-05 Aurelien Jarno yann@1201: yann@1201: * sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Include float.h. yann@1201: (__nexttowardf): Use math_opt_barrier and yann@1201: math_force_eval macros. If FLT_EVAL_METHOD is not 0, force yann@1201: x to float using asm. yann@1201: yann@1201: -= END original header =- yann@1201: yann@1201: diff -durN glibc-2_9.orig/sysdeps/ieee754/ldbl-128/s_nexttowardf.c glibc-2_9/sysdeps/ieee754/ldbl-128/s_nexttowardf.c yann@1201: --- glibc-2_9.orig/sysdeps/ieee754/ldbl-128/s_nexttowardf.c 1999-07-14 02:09:42.000000000 +0200 yann@1201: +++ glibc-2_9/sysdeps/ieee754/ldbl-128/s_nexttowardf.c 2009-02-02 22:00:59.000000000 +0100 yann@1201: @@ -19,7 +19,8 @@ yann@1201: #endif yann@1201: yann@1201: #include "math.h" yann@1201: -#include "math_private.h" yann@1201: +#include yann@1201: +#include yann@1201: yann@1201: #ifdef __STDC__ yann@1201: float __nexttowardf(float x, long double y) yann@1201: @@ -44,10 +45,12 @@ yann@1201: return x+y; yann@1201: if((long double) x==y) return y; /* x=y, return y */ yann@1201: if(ix==0) { /* x == 0 */ yann@1201: - float x2; yann@1201: + float u; yann@1201: SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/ yann@1201: - x2 = x*x; yann@1201: - if(x2==x) return x2; else return x; /* raise underflow flag */ yann@1201: + u = math_opt_barrier (x); yann@1201: + u = u * u; yann@1201: + math_force_eval (u); /* raise underflow flag */ yann@1201: + return x; yann@1201: } yann@1201: if(hx>=0) { /* x > 0 */ yann@1201: if(hy<0||(ix>>23)>(iy>>48)-0x3f80 yann@1201: @@ -67,13 +70,16 @@ yann@1201: } yann@1201: } yann@1201: hy = hx&0x7f800000; yann@1201: - if(hy>=0x7f800000) return x+x; /* overflow */ yann@1201: + if(hy>=0x7f800000) { yann@1201: + x = x+x; /* overflow */ yann@1201: + if (FLT_EVAL_METHOD != 0) yann@1201: + /* Force conversion to float. */ yann@1201: + asm ("" : "+m"(x)); yann@1201: + return x; yann@1201: + } yann@1201: if(hy<0x00800000) { /* underflow */ yann@1201: - float x2 = x*x; yann@1201: - if(x2!=x) { /* raise underflow flag */ yann@1201: - SET_FLOAT_WORD(x2,hx); yann@1201: - return x2; yann@1201: - } yann@1201: + float u = x*x; yann@1201: + math_force_eval (u); /* raise underflow flag */ yann@1201: } yann@1201: SET_FLOAT_WORD(x,hx); yann@1201: return x;