From 88e23c503ac776ac63d93451557ac2da3939851b Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 7 Feb 2006 11:37:15 +0000 Subject: re PR bootstrap/26050 (Use of u_int32_t in libgcc-math breaks bootstrap on Solaris 10/x86) 2006-02-07 Richard Guenther PR bootstrap/26050 * configure.ac: Generate gstdint.h using GCC_HEADER_STDINT. * configure: Re-generate. * Makefile.in: Likewise. * aclocal.m4: Likewise. * i386/Makefile.am: Adjust include path. * i386/Makefile.in: Re-generate. * include/math_private.h: Do not include sys/types.h. Include gstdint.h. Use uint32_t instead of u_int32_t. * flt-32/e_expf.c: Do not include inttypes.h * flt-32/e_sqrtf.c: Use uint32_t instead of u_int32_t. * flt-32/s_floorf.c: Likewise. * flt-32/e_atan2f.c: Likewise. * flt-32/e_powf.c: Likewise. * flt-32/e_rem_pio2f.c: Likewise. * flt-32/e_log10f.c: Likewise. * dbl-64/s_floor.c: Likewise. * dbl-64/e_log10.c: Likewise. * dbl-64/e_rem_pio2.c: Likewise. From-SVN: r110694 --- libgcc-math/flt-32/e_atan2f.c | 2 +- libgcc-math/flt-32/e_expf.c | 1 - libgcc-math/flt-32/e_log10f.c | 2 +- libgcc-math/flt-32/e_powf.c | 6 +++--- libgcc-math/flt-32/e_rem_pio2f.c | 2 +- libgcc-math/flt-32/e_sqrtf.c | 2 +- libgcc-math/flt-32/s_floorf.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) (limited to 'libgcc-math/flt-32') diff --git a/libgcc-math/flt-32/e_atan2f.c b/libgcc-math/flt-32/e_atan2f.c index c0cafb1..a80d3a3 100644 --- a/libgcc-math/flt-32/e_atan2f.c +++ b/libgcc-math/flt-32/e_atan2f.c @@ -93,7 +93,7 @@ pi_lo = -8.7422776573e-08; /* 0xb3bbbd2e */ switch (m) { case 0: return z ; /* atan(+,+) */ case 1: { - u_int32_t zh; + uint32_t zh; GET_FLOAT_WORD(zh,z); SET_FLOAT_WORD(z,zh ^ 0x80000000); } diff --git a/libgcc-math/flt-32/e_expf.c b/libgcc-math/flt-32/e_expf.c index 8ebe1ea..7974900 100644 --- a/libgcc-math/flt-32/e_expf.c +++ b/libgcc-math/flt-32/e_expf.c @@ -53,7 +53,6 @@ #include #include #include -#include #include extern const float __exp_deltatable[178]; diff --git a/libgcc-math/flt-32/e_log10f.c b/libgcc-math/flt-32/e_log10f.c index cea3d91..4e09962 100644 --- a/libgcc-math/flt-32/e_log10f.c +++ b/libgcc-math/flt-32/e_log10f.c @@ -58,7 +58,7 @@ static float zero = 0.0; } if (hx >= 0x7f800000) return x+x; k += (hx>>23)-127; - i = ((u_int32_t)k&0x80000000)>>31; + i = ((uint32_t)k&0x80000000)>>31; hx = (hx&0x007fffff)|((0x7f-i)<<23); y = (float)(k+i); SET_FLOAT_WORD(x,hx); diff --git a/libgcc-math/flt-32/e_powf.c b/libgcc-math/flt-32/e_powf.c index fb0bbc6..5be75f2 100644 --- a/libgcc-math/flt-32/e_powf.c +++ b/libgcc-math/flt-32/e_powf.c @@ -133,7 +133,7 @@ ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/ } /* (x<0)**(non-int) is NaN */ - if(((((u_int32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x); + if(((((uint32_t)hx>>31)-1)|yisint)==0) return (x-x)/(x-x); /* |y| is huge */ if(iy>0x4d000000) { /* if |y| > 2**27 */ @@ -204,7 +204,7 @@ ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/ } s = one; /* s (sign of result -ve**odd) = -1 else = 1 */ - if(((((u_int32_t)hx>>31)-1)|(yisint-1))==0) + if(((((uint32_t)hx>>31)-1)|(yisint-1))==0) s = -one; /* (-ve)**(odd int) */ /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ @@ -221,7 +221,7 @@ ivln2_l = 7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/ } else if ((j&0x7fffffff)>0x43160000) /* z <= -150 */ return s*tiny*tiny; /* underflow */ - else if ((u_int32_t) j==0xc3160000){ /* z == -150 */ + else if ((uint32_t) j==0xc3160000){ /* z == -150 */ if(p_l<=z-p_h) return s*tiny*tiny; /* underflow */ } /* diff --git a/libgcc-math/flt-32/e_rem_pio2f.c b/libgcc-math/flt-32/e_rem_pio2f.c index 4b8c446..6c2dd33 100644 --- a/libgcc-math/flt-32/e_rem_pio2f.c +++ b/libgcc-math/flt-32/e_rem_pio2f.c @@ -148,7 +148,7 @@ pio2_3t = 6.1232342629e-17; /* 0x248d3132 */ if(n<32&&(int32_t)(ix&0xffffff00)!=npio2_hw[n-1]) { y[0] = r-w; /* quick check no cancellation */ } else { - u_int32_t high; + uint32_t high; j = ix>>23; y[0] = r-w; GET_FLOAT_WORD(high,y[0]); diff --git a/libgcc-math/flt-32/e_sqrtf.c b/libgcc-math/flt-32/e_sqrtf.c index 7648ef4..793f2ad 100644 --- a/libgcc-math/flt-32/e_sqrtf.c +++ b/libgcc-math/flt-32/e_sqrtf.c @@ -36,7 +36,7 @@ static float one = 1.0, tiny=1.0e-30; float z; int32_t sign = (int)0x80000000; int32_t ix,s,q,m,t,i; - u_int32_t r; + uint32_t r; GET_FLOAT_WORD(ix,x); diff --git a/libgcc-math/flt-32/s_floorf.c b/libgcc-math/flt-32/s_floorf.c index e8822b0..b2c21cb 100644 --- a/libgcc-math/flt-32/s_floorf.c +++ b/libgcc-math/flt-32/s_floorf.c @@ -43,7 +43,7 @@ static float huge = 1.0e30; #endif { int32_t i0,j0; - u_int32_t i; + uint32_t i; GET_FLOAT_WORD(i0,x); j0 = ((i0>>23)&0xff)-0x7f; if(j0<23) { -- cgit v1.1