patches/glibc/ports-2.10.1/210-ldbl-nexttowardf.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:06:16 2011 +0200 (2011-05-19)
changeset 2461 ec30b191f0e3
permissions -rw-r--r--
complibs/ppl: build only C and C++ interfaces for PPL

By default, PPL wants to build interfaces for any of a variety of
langauges it finds on the local host (python, java, possibly perl, also
more esoteric languages such as ocaml and prolog).

These extra interfaces can double the compile time for the library. For
single-process builds, I found a savings of more than 40%:

default / j1: 716s total, 143.2s avg, 0.52s stdev
just_c / j1: 406s total, 81.2s avg, 0.33s stdev
just_c_cpp / j1: 413s total, 82.6s avg, 0.22s stdev

And for multi-process builds, it approached 50%:

default / j4: 625s total, 125.0s avg, 0.57s stdev
just_c / j4: 338s total, 67.6s avg, 1.25s stdev
just_c_cpp / j4: 327s total, 65.4s avg, 0.36s stdev

Since the PPL we build within ct-ng is only used by GCC, we only need to
build the C and C++ interfaces.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
yann@1625
     1
ripped from Debian
yann@1625
     2
yann@1625
     3
this change was made to generic __nexttowardf, but not the long double version
yann@1625
     4
yann@1625
     5
2008-05-05  Aurelien Jarno  <aurelien@aurel32.net>
yann@1625
     6
yann@1625
     7
	* sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Include float.h.
yann@1625
     8
	(__nexttowardf): Use math_opt_barrier and
yann@1625
     9
	math_force_eval macros.  If FLT_EVAL_METHOD is not 0, force
yann@1625
    10
	x to float using asm.
yann@1625
    11
yann@1625
    12
 sysdeps/ieee754/ldbl-128/s_nexttowardf.c |   26 ++++++++++++++++----------
yann@1625
    13
 1 file changed, 16 insertions(+), 10 deletions(-)
yann@1625
    14
yann@1625
    15
diff -durN glibc-2.10.1.orig/sysdeps/ieee754/ldbl-128/s_nexttowardf.c glibc-2.10.1/sysdeps/ieee754/ldbl-128/s_nexttowardf.c
yann@1625
    16
--- glibc-2.10.1.orig/sysdeps/ieee754/ldbl-128/s_nexttowardf.c	1999-07-14 02:09:42.000000000 +0200
yann@1625
    17
+++ glibc-2.10.1/sysdeps/ieee754/ldbl-128/s_nexttowardf.c	2009-11-13 00:50:06.000000000 +0100
yann@1625
    18
@@ -19,7 +19,8 @@
yann@1625
    19
 #endif
yann@1625
    20
 
yann@1625
    21
 #include "math.h"
yann@1625
    22
-#include "math_private.h"
yann@1625
    23
+#include <math_private.h>
yann@1625
    24
+#include <float.h>
yann@1625
    25
 
yann@1625
    26
 #ifdef __STDC__
yann@1625
    27
 	float __nexttowardf(float x, long double y)
yann@1625
    28
@@ -44,10 +45,12 @@
yann@1625
    29
 	   return x+y;
yann@1625
    30
 	if((long double) x==y) return y;	/* x=y, return y */
yann@1625
    31
 	if(ix==0) {				/* x == 0 */
yann@1625
    32
-	    float x2;
yann@1625
    33
+	    float u;
yann@1625
    34
 	    SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/
yann@1625
    35
-	    x2 = x*x;
yann@1625
    36
-	    if(x2==x) return x2; else return x;	/* raise underflow flag */
yann@1625
    37
+	    u = math_opt_barrier (x);
yann@1625
    38
+	    u = u * u;
yann@1625
    39
+	    math_force_eval (u);		/* raise underflow flag */
yann@1625
    40
+	    return x;
yann@1625
    41
 	}
yann@1625
    42
 	if(hx>=0) {				/* x > 0 */
yann@1625
    43
 	    if(hy<0||(ix>>23)>(iy>>48)-0x3f80
yann@1625
    44
@@ -67,13 +70,16 @@
yann@1625
    45
 	    }
yann@1625
    46
 	}
yann@1625
    47
 	hy = hx&0x7f800000;
yann@1625
    48
-	if(hy>=0x7f800000) return x+x;	/* overflow  */
yann@1625
    49
+	if(hy>=0x7f800000) {
yann@1625
    50
+	  x = x+x;	/* overflow  */
yann@1625
    51
+	  if (FLT_EVAL_METHOD != 0)
yann@1625
    52
+	    /* Force conversion to float.  */
yann@1625
    53
+	    asm ("" : "+m"(x));
yann@1625
    54
+	  return x;
yann@1625
    55
+	}
yann@1625
    56
 	if(hy<0x00800000) {		/* underflow */
yann@1625
    57
-	    float x2 = x*x;
yann@1625
    58
-	    if(x2!=x) {		/* raise underflow flag */
yann@1625
    59
-	        SET_FLOAT_WORD(x2,hx);
yann@1625
    60
-		return x2;
yann@1625
    61
-	    }
yann@1625
    62
+	    float u = x*x;
yann@1625
    63
+	    math_force_eval (u);	/* raise underflow flag */
yann@1625
    64
 	}
yann@1625
    65
 	SET_FLOAT_WORD(x,hx);
yann@1625
    66
 	return x;