patches/glibc/2.9/270-ldbl-nexttowardf.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Dec 31 18:47:37 2011 +0100 (2011-12-31)
changeset 2829 0c3c95f911ec
parent 1201 c9967a6e3b25
permissions -rw-r--r--
docs: credit Konrad EISELE for the initial multilib support

Konrad submitted an initial patch adding multlib support:
http://sourceware.org/ml/crossgcc/2011-11/msg00040.html

The patch was full of good ideas, but had a few issues, so
I (Yann E. MORIN) started it all from scatch, re-using part
of the original patch. This got implemented in this series:
hg log -r 446a17b5dd1e:e47d17391ae3

As I forgot to credit Konrad in these changelogs, update the
docs so that the work by Konrad gets credited. Without his
initial effort, we would probably not have had multlib support
so soon. Thank you Konrad!

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/1073_all_glibc-ldbl-nexttowardf.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
ripped from Debian
yann@1201
     5
yann@1201
     6
this change was made to generic __nexttowardf, but not the long double version
yann@1201
     7
yann@1201
     8
2008-05-05  Aurelien Jarno  <aurelien@aurel32.net>
yann@1201
     9
yann@1201
    10
	* sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Include float.h.
yann@1201
    11
	(__nexttowardf): Use math_opt_barrier and
yann@1201
    12
	math_force_eval macros.  If FLT_EVAL_METHOD is not 0, force
yann@1201
    13
	x to float using asm.
yann@1201
    14
yann@1201
    15
-= END original header =-
yann@1201
    16
yann@1201
    17
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
    18
--- glibc-2_9.orig/sysdeps/ieee754/ldbl-128/s_nexttowardf.c	1999-07-14 02:09:42.000000000 +0200
yann@1201
    19
+++ glibc-2_9/sysdeps/ieee754/ldbl-128/s_nexttowardf.c	2009-02-02 22:00:59.000000000 +0100
yann@1201
    20
@@ -19,7 +19,8 @@
yann@1201
    21
 #endif
yann@1201
    22
 
yann@1201
    23
 #include "math.h"
yann@1201
    24
-#include "math_private.h"
yann@1201
    25
+#include <math_private.h>
yann@1201
    26
+#include <float.h>
yann@1201
    27
 
yann@1201
    28
 #ifdef __STDC__
yann@1201
    29
 	float __nexttowardf(float x, long double y)
yann@1201
    30
@@ -44,10 +45,12 @@
yann@1201
    31
 	   return x+y;
yann@1201
    32
 	if((long double) x==y) return y;	/* x=y, return y */
yann@1201
    33
 	if(ix==0) {				/* x == 0 */
yann@1201
    34
-	    float x2;
yann@1201
    35
+	    float u;
yann@1201
    36
 	    SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/
yann@1201
    37
-	    x2 = x*x;
yann@1201
    38
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
yann@1201
    39
+	    u = math_opt_barrier (x);
yann@1201
    40
+	    u = u * u;
yann@1201
    41
+	    math_force_eval (u);		/* raise underflow flag */
yann@1201
    42
+	    return x;
yann@1201
    43
 	}
yann@1201
    44
 	if(hx>=0) {				/* x > 0 */
yann@1201
    45
 	    if(hy<0||(ix>>23)>(iy>>48)-0x3f80
yann@1201
    46
@@ -67,13 +70,16 @@
yann@1201
    47
 	    }
yann@1201
    48
 	}
yann@1201
    49
 	hy = hx&0x7f800000;
yann@1201
    50
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
yann@1201
    51
+	if(hy>=0x7f800000) {
yann@1201
    52
+	  x = x+x;	/* overflow  */
yann@1201
    53
+	  if (FLT_EVAL_METHOD != 0)
yann@1201
    54
+	    /* Force conversion to float.  */
yann@1201
    55
+	    asm ("" : "+m"(x));
yann@1201
    56
+	  return x;
yann@1201
    57
+	}
yann@1201
    58
 	if(hy<0x00800000) {		/* underflow */
yann@1201
    59
-	    float x2 = x*x;
yann@1201
    60
-	    if(x2!=x) {		/* raise underflow flag */
yann@1201
    61
-	        SET_FLOAT_WORD(x2,hx);
yann@1201
    62
-		return x2;
yann@1201
    63
-	    }
yann@1201
    64
+	    float u = x*x;
yann@1201
    65
+	    math_force_eval (u);	/* raise underflow flag */
yann@1201
    66
 	}
yann@1201
    67
 	SET_FLOAT_WORD(x,hx);
yann@1201
    68
 	return x;