diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-08-03 19:55:04 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-08-03 19:55:04 +0000 |
| commit | 24ab7723b8d3ca8072cadbddc003e80d6cf7edf1 (patch) | |
| tree | 8d85c3f704864fbde9421e94d1cc93855ee866b0 /sysdeps/ieee754 | |
| parent | 08897a57a8dc494dcef8cd6a643899f327e555f2 (diff) | |
| download | glibc-24ab7723b8d3ca8072cadbddc003e80d6cf7edf1.tar.gz glibc-24ab7723b8d3ca8072cadbddc003e80d6cf7edf1.tar.xz glibc-24ab7723b8d3ca8072cadbddc003e80d6cf7edf1.zip | |
Consistently use uintN_t not u_intN_t in libm.
This patch changes libm code to make consistent use of C99 uintN_t types instead of sometimes using those and sometimes using the older nonstandard u_intN_t names. This makes sense as a cleanup in its own right, and also facilitates merges to GCC's libquadmath (which gets the types from stdint.h and so may not have u_intN_t available at all). Tested for x86_64, and with build-many-glibcs.py. * math/s_nextafter.c (__nextafter): Use uintN_t instead of u_intN_t. * math/s_nexttowardf.c (__nexttowardf): Likewise. * sysdeps/generic/math_private.h (ieee_double_shape_type): Likewise. (ieee_float_shape_type): Likewise. * sysdeps/i386/fpu/s_fpclassifyl.c (__fpclassifyl): Likewise. * sysdeps/i386/fpu/s_isnanl.c (__isnanl): Likewise. * sysdeps/i386/fpu/s_nextafterl.c (__nextafterl): Likewise. * sysdeps/i386/fpu/s_nexttoward.c (__nexttoward): Likewise. * sysdeps/i386/fpu/s_nexttowardf.c (__nexttowardf): Likewise. * sysdeps/ieee754/dbl-64/e_acosh.c (__ieee754_acosh): Likewise. * sysdeps/ieee754/dbl-64/e_cosh.c (__ieee754_cosh): Likewise. * sysdeps/ieee754/dbl-64/e_fmod.c (__ieee754_fmod): Likewise. * sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r): Likewise. * sysdeps/ieee754/dbl-64/e_hypot.c (__ieee754_hypot): Likewise. * sysdeps/ieee754/dbl-64/e_jn.c (__ieee754_jn): Likewise. (__ieee754_yn): Likewise. * sysdeps/ieee754/dbl-64/e_log10.c (__ieee754_log10): Likewise. * sysdeps/ieee754/dbl-64/e_log2.c (__ieee754_log2): Likewise. * sysdeps/ieee754/dbl-64/e_rem_pio2.c (__ieee754_rem_pio2): Likewise. * sysdeps/ieee754/dbl-64/e_sinh.c (__ieee754_sinh): Likewise. * sysdeps/ieee754/dbl-64/s_ceil.c (__ceil): Likewise. * sysdeps/ieee754/dbl-64/s_copysign.c (__copysign): Likewise. * sysdeps/ieee754/dbl-64/s_erf.c (__erf): Likewise. (__erfc): Likewise. * sysdeps/ieee754/dbl-64/s_expm1.c (__expm1): Likewise. * sysdeps/ieee754/dbl-64/s_finite.c (FINITE): Likewise. * sysdeps/ieee754/dbl-64/s_floor.c (__floor): Likewise. * sysdeps/ieee754/dbl-64/s_fpclassify.c (__fpclassify): Likewise. * sysdeps/ieee754/dbl-64/s_isnan.c (__isnan): Likewise. * sysdeps/ieee754/dbl-64/s_issignaling.c (__issignaling): Likewise. * sysdeps/ieee754/dbl-64/s_llrint.c (__llrint): Likewise. * sysdeps/ieee754/dbl-64/s_llround.c (__llround): Likewise. * sysdeps/ieee754/dbl-64/s_lrint.c (__lrint): Likewise. * sysdeps/ieee754/dbl-64/s_lround.c (__lround): Likewise. * sysdeps/ieee754/dbl-64/s_modf.c (__modf): Likewise. * sysdeps/ieee754/dbl-64/s_nextup.c (__nextup): Likewise. * sysdeps/ieee754/dbl-64/s_remquo.c (__remquo): Likewise. * sysdeps/ieee754/dbl-64/s_round.c (__round): Likewise. * sysdeps/ieee754/dbl-64/s_trunc.c (__trunc): Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_issignaling.c (__issignaling): Likewise. * sysdeps/ieee754/flt-32/e_atan2f.c (__ieee754_atan2f): Likewise. * sysdeps/ieee754/flt-32/e_fmodf.c (__ieee754_fmodf): Likewise. * sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r): Likewise. * sysdeps/ieee754/flt-32/e_jnf.c (__ieee754_ynf): Likewise. * sysdeps/ieee754/flt-32/e_log10f.c (__ieee754_log10f): Likewise. * sysdeps/ieee754/flt-32/e_powf.c (__ieee754_powf): Likewise. * sysdeps/ieee754/flt-32/e_rem_pio2f.c (__ieee754_rem_pio2f): Likewise. * sysdeps/ieee754/flt-32/e_remainderf.c (__ieee754_remainderf): Likewise. * sysdeps/ieee754/flt-32/e_sqrtf.c (__ieee754_sqrtf): Likewise. * sysdeps/ieee754/flt-32/s_ceilf.c (__ceilf): Likewise. * sysdeps/ieee754/flt-32/s_copysignf.c (__copysignf): Likewise. * sysdeps/ieee754/flt-32/s_erff.c (__erff): Likewise. (__erfcf): Likewise. * sysdeps/ieee754/flt-32/s_expm1f.c (__expm1f): Likewise. * sysdeps/ieee754/flt-32/s_finitef.c (FINITEF): Likewise. * sysdeps/ieee754/flt-32/s_floorf.c (__floorf): Likewise. * sysdeps/ieee754/flt-32/s_fpclassifyf.c (__fpclassifyf): Likewise. * sysdeps/ieee754/flt-32/s_isnanf.c (__isnanf): Likewise. * sysdeps/ieee754/flt-32/s_issignalingf.c (__issignalingf): Likewise. * sysdeps/ieee754/flt-32/s_llrintf.c (__llrintf): Likewise. * sysdeps/ieee754/flt-32/s_llroundf.c (__llroundf): Likewise. * sysdeps/ieee754/flt-32/s_lrintf.c (__lrintf): Likewise. * sysdeps/ieee754/flt-32/s_lroundf.c (__lroundf): Likewise. * sysdeps/ieee754/flt-32/s_modff.c (__modff): Likewise. * sysdeps/ieee754/flt-32/s_remquof.c (__remquof): Likewise. * sysdeps/ieee754/flt-32/s_roundf.c (__roundf): Likewise. * sysdeps/ieee754/ldbl-128/e_acoshl.c (__ieee754_acoshl): Likewise. * sysdeps/ieee754/ldbl-128/e_atan2l.c (__ieee754_atan2l): Likewise. * sysdeps/ieee754/ldbl-128/e_atanhl.c (__ieee754_atanhl): Likewise. * sysdeps/ieee754/ldbl-128/e_fmodl.c (__ieee754_fmodl): Likewise. * sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r): Likewise. * sysdeps/ieee754/ldbl-128/e_hypotl.c (__ieee754_hypotl): Likewise. * sysdeps/ieee754/ldbl-128/e_jnl.c (__ieee754_jnl): Likewise. (__ieee754_ynl): Likewise. * sysdeps/ieee754/ldbl-128/e_powl.c (__ieee754_powl): Likewise. * sysdeps/ieee754/ldbl-128/e_rem_pio2l.c (__ieee754_rem_pio2l): Likewise. * sysdeps/ieee754/ldbl-128/e_remainderl.c (__ieee754_remainderl): Likewise. * sysdeps/ieee754/ldbl-128/e_sinhl.c (__ieee754_sinhl): Likewise. * sysdeps/ieee754/ldbl-128/k_cosl.c (__kernel_cosl): Likewise. * sysdeps/ieee754/ldbl-128/k_sincosl.c (__kernel_sincosl): Likewise. * sysdeps/ieee754/ldbl-128/k_sinl.c (__kernel_sinl): Likewise. * sysdeps/ieee754/ldbl-128/s_ceill.c (__ceill): Likewise. * sysdeps/ieee754/ldbl-128/s_copysignl.c (__copysignl): Likewise. * sysdeps/ieee754/ldbl-128/s_erfl.c (__erfcl): Likewise. * sysdeps/ieee754/ldbl-128/s_fabsl.c (__fabsl): Likewise. * sysdeps/ieee754/ldbl-128/s_finitel.c (__finitel): Likewise. * sysdeps/ieee754/ldbl-128/s_floorl.c (__floorl): Likewise. * sysdeps/ieee754/ldbl-128/s_fpclassifyl.c (__fpclassifyl): Likewise. * sysdeps/ieee754/ldbl-128/s_frexpl.c (__frexpl): Likewise. * sysdeps/ieee754/ldbl-128/s_isnanl.c (__isnanl): Likewise. * sysdeps/ieee754/ldbl-128/s_issignalingl.c (__issignalingl): Likewise. * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Likewise. * sysdeps/ieee754/ldbl-128/s_llroundl.c (__llroundl): Likewise. * sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise. * sysdeps/ieee754/ldbl-128/s_lroundl.c (__lroundl): Likewise. * sysdeps/ieee754/ldbl-128/s_modfl.c (__modfl): Likewise. * sysdeps/ieee754/ldbl-128/s_nearbyintl.c (__nearbyintl): Likewise. * sysdeps/ieee754/ldbl-128/s_nextafterl.c (__nextafterl): Likewise. * sysdeps/ieee754/ldbl-128/s_nexttoward.c (__nexttoward): Likewise. * sysdeps/ieee754/ldbl-128/s_nexttowardf.c (__nexttowardf): Likewise. * sysdeps/ieee754/ldbl-128/s_nextupl.c (__nextupl): Likewise. * sysdeps/ieee754/ldbl-128/s_remquol.c (__remquol): Likewise. * sysdeps/ieee754/ldbl-128/s_rintl.c (__rintl): Likewise. * sysdeps/ieee754/ldbl-128/s_roundl.c (__roundl): Likewise. * sysdeps/ieee754/ldbl-128/s_tanhl.c (__tanhl): Likewise. * sysdeps/ieee754/ldbl-128/s_truncl.c (__truncl): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_fmodl.c (__ieee754_fmodl): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_powl.c (__ieee754_powl): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c (__ieee754_rem_pio2l): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_remainderl.c (__ieee754_remainderl): Likewise. * sysdeps/ieee754/ldbl-128ibm/k_cosl.c (__kernel_cosl): Likewise. * sysdeps/ieee754/ldbl-128ibm/k_sinl.c (__kernel_sinl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fabsl.c (__fabsl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c (___fpclassifyl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_modfl.c (__modfl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c (__nexttowardf): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_remquol.c (__remquol): Likewise. * sysdeps/ieee754/ldbl-96/e_acoshl.c (__ieee754_acoshl): Likewise. * sysdeps/ieee754/ldbl-96/e_asinl.c (__ieee754_asinl): Likewise. * sysdeps/ieee754/ldbl-96/e_atanhl.c (__ieee754_atanhl): Likewise. * sysdeps/ieee754/ldbl-96/e_coshl.c (__ieee754_coshl): Likewise. * sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r): Likewise. * sysdeps/ieee754/ldbl-96/e_hypotl.c (__ieee754_hypotl): Likewise. * sysdeps/ieee754/ldbl-96/e_j0l.c (__ieee754_j0l): Likewise. (__ieee754_y0l): Likewise. (pzero): Likewise. (qzero): Likewise. * sysdeps/ieee754/ldbl-96/e_j1l.c (__ieee754_j1l): Likewise. (__ieee754_y1l): Likewise. (pone): Likewise. (qone): Likewise. * sysdeps/ieee754/ldbl-96/e_jnl.c (__ieee754_jnl): Likewise. (__ieee754_ynl): Likewise. * sysdeps/ieee754/ldbl-96/e_lgammal_r.c (sin_pi): Likewise. (__ieee754_lgammal_r): Likewise. * sysdeps/ieee754/ldbl-96/e_rem_pio2l.c (__ieee754_rem_pio2l): Likewise. * sysdeps/ieee754/ldbl-96/e_sinhl.c (__ieee754_sinhl): Likewise. * sysdeps/ieee754/ldbl-96/s_copysignl.c (__copysignl): Likewise. * sysdeps/ieee754/ldbl-96/s_erfl.c (__erfl): Likewise. (__erfcl): Likewise. * sysdeps/ieee754/ldbl-96/s_frexpl.c (__frexpl): Likewise. * sysdeps/ieee754/ldbl-96/s_issignalingl.c (__issignalingl): Likewise. * sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Likewise. * sysdeps/ieee754/ldbl-96/s_llroundl.c (__llroundl): Likewise. * sysdeps/ieee754/ldbl-96/s_lrintl.c (__lrintl): Likewise. * sysdeps/ieee754/ldbl-96/s_lroundl.c (__lroundl): Likewise. * sysdeps/ieee754/ldbl-96/s_modfl.c (__modfl): Likewise. * sysdeps/ieee754/ldbl-96/s_nexttoward.c (__nexttoward): Likewise. * sysdeps/ieee754/ldbl-96/s_nexttowardf.c (__nexttowardf): Likewise. * sysdeps/ieee754/ldbl-96/s_nextupl.c (__nextupl): Likewise. * sysdeps/ieee754/ldbl-96/s_remquol.c (__remquol): Likewise. * sysdeps/ieee754/ldbl-96/s_roundl.c (__roundl): Likewise. * sysdeps/ieee754/ldbl-96/s_tanhl.c (__tanhl): Likewise. * sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c (__nldbl_nexttowardf): Likewise. * sysdeps/m68k/m680x0/fpu/e_pow.c (s(__ieee754_pow)): Likewise. * sysdeps/m68k/m680x0/fpu/s_fpclassifyl.c (__fpclassifyl): Likewise. * sysdeps/m68k/m680x0/fpu/s_llrint.c (__llrint): Likewise. * sysdeps/m68k/m680x0/fpu/s_llrintf.c (__llrintf): Likewise. * sysdeps/m68k/m680x0/fpu/s_llrintl.c (__llrintl): Likewise. * sysdeps/m68k/m680x0/fpu/s_nextafterl.c (__nextafterl): Likewise. * sysdeps/x86/fpu/powl_helper.c (__powl_helper): Likewise.
Diffstat (limited to 'sysdeps/ieee754')
133 files changed, 228 insertions, 228 deletions
diff --git a/sysdeps/ieee754/dbl-64/e_acosh.c b/sysdeps/ieee754/dbl-64/e_acosh.c index c1f3590f75..51916f221a 100644 --- a/sysdeps/ieee754/dbl-64/e_acosh.c +++ b/sysdeps/ieee754/dbl-64/e_acosh.c @@ -36,7 +36,7 @@ __ieee754_acosh (double x) { double t; int32_t hx; - u_int32_t lx; + uint32_t lx; EXTRACT_WORDS (hx, lx, x); if (hx < 0x3ff00000) /* x < 1 */ { diff --git a/sysdeps/ieee754/dbl-64/e_cosh.c b/sysdeps/ieee754/dbl-64/e_cosh.c index 52a5d5007d..bd940c7314 100644 --- a/sysdeps/ieee754/dbl-64/e_cosh.c +++ b/sysdeps/ieee754/dbl-64/e_cosh.c @@ -41,7 +41,7 @@ __ieee754_cosh (double x) { double t, w; int32_t ix; - u_int32_t lx; + uint32_t lx; /* High word of |x|. */ GET_HIGH_WORD (ix, x); @@ -71,7 +71,7 @@ __ieee754_cosh (double x) /* |x| in [log(maxdouble), overflowthresold] */ GET_LOW_WORD (lx, x); - if (ix < 0x408633ce || ((ix == 0x408633ce) && (lx <= (u_int32_t) 0x8fb9f87d))) + if (ix < 0x408633ce || ((ix == 0x408633ce) && (lx <= (uint32_t) 0x8fb9f87d))) { w = __ieee754_exp (half * fabs (x)); t = half * w; diff --git a/sysdeps/ieee754/dbl-64/e_fmod.c b/sysdeps/ieee754/dbl-64/e_fmod.c index e82b302200..1a8c14dc2a 100644 --- a/sysdeps/ieee754/dbl-64/e_fmod.c +++ b/sysdeps/ieee754/dbl-64/e_fmod.c @@ -24,7 +24,7 @@ double __ieee754_fmod (double x, double y) { int32_t n, hx, hy, hz, ix, iy, sx, i; - u_int32_t lx, ly, lz; + uint32_t lx, ly, lz; EXTRACT_WORDS (hx, lx, x); EXTRACT_WORDS (hy, ly, y); @@ -41,7 +41,7 @@ __ieee754_fmod (double x, double y) if ((hx < hy) || (lx < ly)) return x; /* |x|<|y| return x */ if (lx == ly) - return Zero[(u_int32_t) sx >> 31]; /* |x|=|y| return x*0*/ + return Zero[(uint32_t) sx >> 31]; /* |x|=|y| return x*0*/ } /* determine ix = ilogb(x) */ @@ -125,7 +125,7 @@ __ieee754_fmod (double x, double y) else { if ((hz | lz) == 0) /* return sign(x)*0 */ - return Zero[(u_int32_t) sx >> 31]; + return Zero[(uint32_t) sx >> 31]; hx = hz + hz + (lz >> 31); lx = lz + lz; } } @@ -138,7 +138,7 @@ __ieee754_fmod (double x, double y) /* convert back to floating value and restore the sign */ if ((hx | lx) == 0) /* return sign(x)*0 */ - return Zero[(u_int32_t) sx >> 31]; + return Zero[(uint32_t) sx >> 31]; while (hx < 0x00100000) /* normalize x */ { hx = hx + hx + (lx >> 31); lx = lx + lx; @@ -154,7 +154,7 @@ __ieee754_fmod (double x, double y) n = -1022 - iy; if (n <= 20) { - lx = (lx >> n) | ((u_int32_t) hx << (32 - n)); + lx = (lx >> n) | ((uint32_t) hx << (32 - n)); hx >>= n; } else if (n <= 31) diff --git a/sysdeps/ieee754/dbl-64/e_gamma_r.c b/sysdeps/ieee754/dbl-64/e_gamma_r.c index 818fa94766..e6988a678a 100644 --- a/sysdeps/ieee754/dbl-64/e_gamma_r.c +++ b/sysdeps/ieee754/dbl-64/e_gamma_r.c @@ -114,7 +114,7 @@ double __ieee754_gamma_r (double x, int *signgamp) { int32_t hx; - u_int32_t lx; + uint32_t lx; double ret; EXTRACT_WORDS (hx, lx, x); @@ -126,7 +126,7 @@ __ieee754_gamma_r (double x, int *signgamp) return 1.0 / x; } if (__builtin_expect (hx < 0, 0) - && (u_int32_t) hx < 0xfff00000 && __rint (x) == x) + && (uint32_t) hx < 0xfff00000 && __rint (x) == x) { /* Return value for integer x < 0 is NaN with invalid exception. */ *signgamp = 0; diff --git a/sysdeps/ieee754/dbl-64/e_hypot.c b/sysdeps/ieee754/dbl-64/e_hypot.c index 76eb408348..698f004f62 100644 --- a/sysdeps/ieee754/dbl-64/e_hypot.c +++ b/sysdeps/ieee754/dbl-64/e_hypot.c @@ -74,7 +74,7 @@ __ieee754_hypot (double x, double y) { if (ha >= 0x7ff00000) /* Inf or NaN */ { - u_int32_t low; + uint32_t low; w = a + b; /* for sNaN */ if (issignaling (a) || issignaling (b)) return w; @@ -95,7 +95,7 @@ __ieee754_hypot (double x, double y) { if (hb <= 0x000fffff) /* subnormal b or 0 */ { - u_int32_t low; + uint32_t low; GET_LOW_WORD (low, b); if ((hb | low) == 0) return a; @@ -147,7 +147,7 @@ __ieee754_hypot (double x, double y) } if (k != 0) { - u_int32_t high; + uint32_t high; t1 = 1.0; GET_HIGH_WORD (high, t1); SET_HIGH_WORD (t1, high + (k << 20)); diff --git a/sysdeps/ieee754/dbl-64/e_jn.c b/sysdeps/ieee754/dbl-64/e_jn.c index 3fecf82f10..3ac91df2b0 100644 --- a/sysdeps/ieee754/dbl-64/e_jn.c +++ b/sysdeps/ieee754/dbl-64/e_jn.c @@ -61,7 +61,7 @@ __ieee754_jn (int n, double x) EXTRACT_WORDS (hx, lx, x); ix = 0x7fffffff & hx; /* if J(n,NaN) is NaN */ - if (__glibc_unlikely ((ix | ((u_int32_t) (lx | -lx)) >> 31) > 0x7ff00000)) + if (__glibc_unlikely ((ix | ((uint32_t) (lx | -lx)) >> 31) > 0x7ff00000)) return x + x; if (n < 0) { @@ -266,7 +266,7 @@ __ieee754_yn (int n, double x) EXTRACT_WORDS (hx, lx, x); ix = 0x7fffffff & hx; /* if Y(n,NaN) is NaN */ - if (__glibc_unlikely ((ix | ((u_int32_t) (lx | -lx)) >> 31) > 0x7ff00000)) + if (__glibc_unlikely ((ix | ((uint32_t) (lx | -lx)) >> 31) > 0x7ff00000)) return x + x; if (__glibc_unlikely ((ix | lx) == 0)) return -HUGE_VAL + x; @@ -318,7 +318,7 @@ __ieee754_yn (int n, double x) } else { - u_int32_t high; + uint32_t high; a = __ieee754_y0 (x); b = __ieee754_y1 (x); /* quit if b is -inf */ diff --git a/sysdeps/ieee754/dbl-64/e_log10.c b/sysdeps/ieee754/dbl-64/e_log10.c index bf40bca874..dfb7d056ca 100644 --- a/sysdeps/ieee754/dbl-64/e_log10.c +++ b/sysdeps/ieee754/dbl-64/e_log10.c @@ -57,7 +57,7 @@ __ieee754_log10 (double x) { double y, z; int32_t i, k, hx; - u_int32_t lx; + uint32_t lx; EXTRACT_WORDS (hx, lx, x); @@ -75,7 +75,7 @@ __ieee754_log10 (double x) if (__glibc_unlikely (hx >= 0x7ff00000)) return x + x; k += (hx >> 20) - 1023; - i = ((u_int32_t) k & 0x80000000) >> 31; + i = ((uint32_t) k & 0x80000000) >> 31; hx = (hx & 0x000fffff) | ((0x3ff - i) << 20); y = (double) (k + i); if (FIX_INT_FP_CONVERT_ZERO && y == 0.0) diff --git a/sysdeps/ieee754/dbl-64/e_log2.c b/sysdeps/ieee754/dbl-64/e_log2.c index 5af68d8ecc..2f3da129f8 100644 --- a/sysdeps/ieee754/dbl-64/e_log2.c +++ b/sysdeps/ieee754/dbl-64/e_log2.c @@ -75,7 +75,7 @@ __ieee754_log2 (double x) { double hfsq, f, s, z, R, w, t1, t2, dk; int32_t k, hx, i, j; - u_int32_t lx; + uint32_t lx; EXTRACT_WORDS (hx, lx, x); diff --git a/sysdeps/ieee754/dbl-64/e_rem_pio2.c b/sysdeps/ieee754/dbl-64/e_rem_pio2.c index 2f55ca294b..81a3d073d4 100644 --- a/sysdeps/ieee754/dbl-64/e_rem_pio2.c +++ b/sysdeps/ieee754/dbl-64/e_rem_pio2.c @@ -74,7 +74,7 @@ __ieee754_rem_pio2 (double x, double *y) double z, w, t, r, fn; double tx[3]; int32_t e0, i, j, nx, n, ix, hx; - u_int32_t low; + uint32_t low; GET_HIGH_WORD (hx, x); /* high word of x */ ix = hx & 0x7fffffff; @@ -130,7 +130,7 @@ __ieee754_rem_pio2 (double x, double *y) } else { - u_int32_t high; + uint32_t high; j = ix >> 20; y[0] = r - w; GET_HIGH_WORD (high, y[0]); diff --git a/sysdeps/ieee754/dbl-64/e_sinh.c b/sysdeps/ieee754/dbl-64/e_sinh.c index 8479bdd9b8..e9371b820b 100644 --- a/sysdeps/ieee754/dbl-64/e_sinh.c +++ b/sysdeps/ieee754/dbl-64/e_sinh.c @@ -43,7 +43,7 @@ __ieee754_sinh (double x) { double t, w, h; int32_t ix, jx; - u_int32_t lx; + uint32_t lx; /* High word of |x|. */ GET_HIGH_WORD (jx, x); @@ -77,7 +77,7 @@ __ieee754_sinh (double x) /* |x| in [log(maxdouble), overflowthresold] */ GET_LOW_WORD (lx, x); - if (ix < 0x408633ce || ((ix == 0x408633ce) && (lx <= (u_int32_t) 0x8fb9f87d))) + if (ix < 0x408633ce || ((ix == 0x408633ce) && (lx <= (uint32_t) 0x8fb9f87d))) { w = __ieee754_exp (0.5 * fabs (x)); t = h * w; diff --git a/sysdeps/ieee754/dbl-64/s_ceil.c b/sysdeps/ieee754/dbl-64/s_ceil.c index c291c26f57..36f5abe2ed 100644 --- a/sysdeps/ieee754/dbl-64/s_ceil.c +++ b/sysdeps/ieee754/dbl-64/s_ceil.c @@ -24,7 +24,7 @@ double __ceil (double x) { int32_t i0, i1, j0; - u_int32_t i, j; + uint32_t i, j; EXTRACT_WORDS (i0, i1, x); j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; if (j0 < 20) @@ -60,7 +60,7 @@ __ceil (double x) } else { - i = ((u_int32_t) (0xffffffff)) >> (j0 - 20); + i = ((uint32_t) (0xffffffff)) >> (j0 - 20); if ((i1 & i) == 0) return x; /* x is integral */ if (i0 > 0) diff --git a/sysdeps/ieee754/dbl-64/s_copysign.c b/sysdeps/ieee754/dbl-64/s_copysign.c index 9caf24e8f2..7755e0d984 100644 --- a/sysdeps/ieee754/dbl-64/s_copysign.c +++ b/sysdeps/ieee754/dbl-64/s_copysign.c @@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $ double __copysign (double x, double y) { - u_int32_t hx, hy; + uint32_t hx, hy; GET_HIGH_WORD (hx, x); GET_HIGH_WORD (hy, y); SET_HIGH_WORD (x, (hx & 0x7fffffff) | (hy & 0x80000000)); diff --git a/sysdeps/ieee754/dbl-64/s_erf.c b/sysdeps/ieee754/dbl-64/s_erf.c index b4975a8af8..676b6f96e9 100644 --- a/sysdeps/ieee754/dbl-64/s_erf.c +++ b/sysdeps/ieee754/dbl-64/s_erf.c @@ -201,7 +201,7 @@ __erf (double x) ix = hx & 0x7fffffff; if (ix >= 0x7ff00000) /* erf(nan)=nan */ { - i = ((u_int32_t) hx >> 31) << 1; + i = ((uint32_t) hx >> 31) << 1; return (double) (1 - i) + one / x; /* erf(+-inf)=+-1 */ } @@ -309,7 +309,7 @@ __erfc (double x) ix = hx & 0x7fffffff; if (ix >= 0x7ff00000) /* erfc(nan)=nan */ { /* erfc(+-inf)=0,2 */ - double ret = (double) (((u_int32_t) hx >> 31) << 1) + one / x; + double ret = (double) (((uint32_t) hx >> 31) << 1) + one / x; if (FIX_INT_FP_CONVERT_ZERO && ret == 0.0) return 0.0; return ret; diff --git a/sysdeps/ieee754/dbl-64/s_expm1.c b/sysdeps/ieee754/dbl-64/s_expm1.c index 54d771007a..25370d3e78 100644 --- a/sysdeps/ieee754/dbl-64/s_expm1.c +++ b/sysdeps/ieee754/dbl-64/s_expm1.c @@ -132,7 +132,7 @@ __expm1 (double x) { double y, hi, lo, c, t, e, hxs, hfx, r1, h2, h4, R1, R2, R3; int32_t k, xsb; - u_int32_t hx; + uint32_t hx; GET_HIGH_WORD (hx, x); xsb = hx & 0x80000000; /* sign bit of x */ @@ -149,7 +149,7 @@ __expm1 (double x) { if (hx >= 0x7ff00000) { - u_int32_t low; + uint32_t low; GET_LOW_WORD (low, x); if (((hx & 0xfffff) | low) != 0) return x + x; /* NaN */ @@ -228,7 +228,7 @@ __expm1 (double x) } if (k <= -2 || k > 56) /* suffice to return exp(x)-1 */ { - u_int32_t high; + uint32_t high; y = one - (e - x); GET_HIGH_WORD (high, y); SET_HIGH_WORD (y, high + (k << 20)); /* add k to y's exponent */ @@ -237,7 +237,7 @@ __expm1 (double x) t = one; if (k < 20) { - u_int32_t high; + uint32_t high; SET_HIGH_WORD (t, 0x3ff00000 - (0x200000 >> k)); /* t=1-2^-k */ y = t - (e - x); GET_HIGH_WORD (high, y); @@ -245,7 +245,7 @@ __expm1 (double x) } else { - u_int32_t high; + uint32_t high; SET_HIGH_WORD (t, ((0x3ff - k) << 20)); /* 2^-k */ y = x - (e + t); y += one; diff --git a/sysdeps/ieee754/dbl-64/s_finite.c b/sysdeps/ieee754/dbl-64/s_finite.c index 69141db75d..eed80c6449 100644 --- a/sysdeps/ieee754/dbl-64/s_finite.c +++ b/sysdeps/ieee754/dbl-64/s_finite.c @@ -33,7 +33,7 @@ int FINITE(double x) { int32_t hx; GET_HIGH_WORD (hx, x); - return (int) ((u_int32_t) ((hx & 0x7ff00000) - 0x7ff00000) >> 31); + return (int) ((uint32_t) ((hx & 0x7ff00000) - 0x7ff00000) >> 31); } hidden_def (__finite) weak_alias (__finite, finite) diff --git a/sysdeps/ieee754/dbl-64/s_floor.c b/sysdeps/ieee754/dbl-64/s_floor.c index 8f86aa31ee..e80bc9ee92 100644 --- a/sysdeps/ieee754/dbl-64/s_floor.c +++ b/sysdeps/ieee754/dbl-64/s_floor.c @@ -24,7 +24,7 @@ double __floor (double x) { int32_t i0, i1, j0; - u_int32_t i, j; + uint32_t i, j; EXTRACT_WORDS (i0, i1, x); j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; if (j0 < 20) @@ -60,7 +60,7 @@ __floor (double x) } else { - i = ((u_int32_t) (0xffffffff)) >> (j0 - 20); + i = ((uint32_t) (0xffffffff)) >> (j0 - 20); if ((i1 & i) == 0) return x; /* x is integral */ if (i0 < 0) diff --git a/sysdeps/ieee754/dbl-64/s_fpclassify.c b/sysdeps/ieee754/dbl-64/s_fpclassify.c index 3fa9117ff0..6a3f3f46ab 100644 --- a/sysdeps/ieee754/dbl-64/s_fpclassify.c +++ b/sysdeps/ieee754/dbl-64/s_fpclassify.c @@ -25,7 +25,7 @@ int __fpclassify (double x) { - u_int32_t hx, lx; + uint32_t hx, lx; int retval = FP_NORMAL; EXTRACT_WORDS (hx, lx, x); diff --git a/sysdeps/ieee754/dbl-64/s_isnan.c b/sysdeps/ieee754/dbl-64/s_isnan.c index 2174d988d8..642ec3a494 100644 --- a/sysdeps/ieee754/dbl-64/s_isnan.c +++ b/sysdeps/ieee754/dbl-64/s_isnan.c @@ -30,9 +30,9 @@ __isnan (double x) int32_t hx, lx; EXTRACT_WORDS (hx, lx, x); hx &= 0x7fffffff; - hx |= (u_int32_t) (lx | (-lx)) >> 31; + hx |= (uint32_t) (lx | (-lx)) >> 31; hx = 0x7ff00000 - hx; - return (int) (((u_int32_t) hx) >> 31); + return (int) (((uint32_t) hx) >> 31); } hidden_def (__isnan) weak_alias (__isnan, isnan) diff --git a/sysdeps/ieee754/dbl-64/s_issignaling.c b/sysdeps/ieee754/dbl-64/s_issignaling.c index 09e12f9a6a..de99f6d5cf 100644 --- a/sysdeps/ieee754/dbl-64/s_issignaling.c +++ b/sysdeps/ieee754/dbl-64/s_issignaling.c @@ -24,14 +24,14 @@ int __issignaling (double x) { #if HIGH_ORDER_BIT_IS_SET_FOR_SNAN - u_int32_t hxi; + uint32_t hxi; GET_HIGH_WORD (hxi, x); /* We only have to care about the high-order bit of x's significand, because having it set (sNaN) already makes the significand different from that used to designate infinity. */ return (hxi & 0x7ff80000) == 0x7ff80000; #else - u_int32_t hxi, lxi; + uint32_t hxi, lxi; EXTRACT_WORDS (hxi, lxi, x); /* To keep the following comparison simple, toggle the quiet/signaling bit, so that it is set for sNaNs. This is inverse to IEEE 754-2008 (as well as diff --git a/sysdeps/ieee754/dbl-64/s_llrint.c b/sysdeps/ieee754/dbl-64/s_llrint.c index 08781c3acd..574c6087ee 100644 --- a/sysdeps/ieee754/dbl-64/s_llrint.c +++ b/sysdeps/ieee754/dbl-64/s_llrint.c @@ -36,7 +36,7 @@ long long int __llrint (double x) { int32_t j0; - u_int32_t i1, i0; + uint32_t i1, i0; long long int result; double w; double t; diff --git a/sysdeps/ieee754/dbl-64/s_llround.c b/sysdeps/ieee754/dbl-64/s_llround.c index 8790e9df57..4995c18740 100644 --- a/sysdeps/ieee754/dbl-64/s_llround.c +++ b/sysdeps/ieee754/dbl-64/s_llround.c @@ -29,7 +29,7 @@ long long int __llround (double x) { int32_t j0; - u_int32_t i1, i0; + uint32_t i1, i0; long long int result; int sign; @@ -56,7 +56,7 @@ __llround (double x) result = (((long long int) i0 << 32) | i1) << (j0 - 52); else { - u_int32_t j = i1 + (0x80000000 >> (j0 - 20)); + uint32_t j = i1 + (0x80000000 >> (j0 - 20)); if (j < i1) ++i0; diff --git a/sysdeps/ieee754/dbl-64/s_lrint.c b/sysdeps/ieee754/dbl-64/s_lrint.c index ac610bfbd0..d2da6f9a5d 100644 --- a/sysdeps/ieee754/dbl-64/s_lrint.c +++ b/sysdeps/ieee754/dbl-64/s_lrint.c @@ -36,7 +36,7 @@ long int __lrint (double x) { int32_t j0; - u_int32_t i0, i1; + uint32_t i0, i1; double w; double t; long int result; diff --git a/sysdeps/ieee754/dbl-64/s_lround.c b/sysdeps/ieee754/dbl-64/s_lround.c index df4775e344..1a267d880e 100644 --- a/sysdeps/ieee754/dbl-64/s_lround.c +++ b/sysdeps/ieee754/dbl-64/s_lround.c @@ -29,7 +29,7 @@ long int __lround (double x) { int32_t j0; - u_int32_t i1, i0; + uint32_t i1, i0; long int result; int sign; @@ -56,7 +56,7 @@ __lround (double x) result = ((long int) i0 << (j0 - 20)) | ((long int) i1 << (j0 - 52)); else { - u_int32_t j = i1 + (0x80000000 >> (j0 - 20)); + uint32_t j = i1 + (0x80000000 >> (j0 - 20)); if (j < i1) ++i0; diff --git a/sysdeps/ieee754/dbl-64/s_modf.c b/sysdeps/ieee754/dbl-64/s_modf.c index 0a1e13008f..0cad7b16a7 100644 --- a/sysdeps/ieee754/dbl-64/s_modf.c +++ b/sysdeps/ieee754/dbl-64/s_modf.c @@ -28,7 +28,7 @@ double __modf (double x, double *iptr) { int32_t i0, i1, j0; - u_int32_t i; + uint32_t i; EXTRACT_WORDS (i0, i1, x); j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; /* exponent of x */ if (j0 < 20) /* integer part in high x */ @@ -65,7 +65,7 @@ __modf (double x, double *iptr) } else /* fraction part in low x */ { - i = ((u_int32_t) (0xffffffff)) >> (j0 - 20); + i = ((uint32_t) (0xffffffff)) >> (j0 - 20); if ((i1 & i) == 0) /* x is integral */ { *iptr = x; diff --git a/sysdeps/ieee754/dbl-64/s_nextup.c b/sysdeps/ieee754/dbl-64/s_nextup.c index 983bd662b7..fb01859e91 100644 --- a/sysdeps/ieee754/dbl-64/s_nextup.c +++ b/sysdeps/ieee754/dbl-64/s_nextup.c @@ -24,7 +24,7 @@ double __nextup (double x) { int32_t hx, ix; - u_int32_t lx; + uint32_t lx; EXTRACT_WORDS (hx, lx, x); ix = hx & 0x7fffffff; diff --git a/sysdeps/ieee754/dbl-64/s_remquo.c b/sysdeps/ieee754/dbl-64/s_remquo.c index 2693c0e62c..4ab764da53 100644 --- a/sysdeps/ieee754/dbl-64/s_remquo.c +++ b/sysdeps/ieee754/dbl-64/s_remquo.c @@ -29,7 +29,7 @@ double __remquo (double x, double y, int *quo) { int32_t hx, hy; - u_int32_t sx, lx, ly; + uint32_t sx, lx, ly; int cquo, qs; EXTRACT_WORDS (hx, lx, x); diff --git a/sysdeps/ieee754/dbl-64/s_round.c b/sysdeps/ieee754/dbl-64/s_round.c index 390e3f7180..18c054af2c 100644 --- a/sysdeps/ieee754/dbl-64/s_round.c +++ b/sysdeps/ieee754/dbl-64/s_round.c @@ -26,7 +26,7 @@ double __round (double x) { int32_t i0, j0; - u_int32_t i1; + uint32_t i1; EXTRACT_WORDS (i0, i1, x); j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; @@ -41,7 +41,7 @@ __round (double x) } else { - u_int32_t i = 0x000fffff >> j0; + uint32_t i = 0x000fffff >> j0; if (((i0 & i) | i1) == 0) /* X is integral. */ return x; @@ -61,12 +61,12 @@ __round (double x) } else { - u_int32_t i = 0xffffffff >> (j0 - 20); + uint32_t i = 0xffffffff >> (j0 - 20); if ((i1 & i) == 0) /* X is integral. */ return x; - u_int32_t j = i1 + (1 << (51 - j0)); + uint32_t j = i1 + (1 << (51 - j0)); if (j < i1) i0 += 1; i1 = j; diff --git a/sysdeps/ieee754/dbl-64/s_trunc.c b/sysdeps/ieee754/dbl-64/s_trunc.c index 730c1b377c..72b1752356 100644 --- a/sysdeps/ieee754/dbl-64/s_trunc.c +++ b/sysdeps/ieee754/dbl-64/s_trunc.c @@ -26,7 +26,7 @@ double __trunc (double x) { int32_t i0, j0; - u_int32_t i1; + uint32_t i1; int sx; EXTRACT_WORDS (i0, i1, x); diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_issignaling.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_issignaling.c index 117f64bede..79e4cd4e5a 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_issignaling.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_issignaling.c @@ -23,7 +23,7 @@ int __issignaling (double x) { - u_int64_t xi; + uint64_t xi; EXTRACT_WORDS64 (xi, x); #if HIGH_ORDER_BIT_IS_SET_FOR_SNAN /* We only have to care about the high-order bit of x's significand, because diff --git a/sysdeps/ieee754/flt-32/e_atan2f.c b/sysdeps/ieee754/flt-32/e_atan2f.c index 29eefc0dd6..ddc5873ade 100644 --- a/sysdeps/ieee754/flt-32/e_atan2f.c +++ b/sysdeps/ieee754/flt-32/e_atan2f.c @@ -81,7 +81,7 @@ __ieee754_atan2f (float y, float x) 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/sysdeps/ieee754/flt-32/e_fmodf.c b/sysdeps/ieee754/flt-32/e_fmodf.c index 8d8fad4eb5..1a9407b517 100644 --- a/sysdeps/ieee754/flt-32/e_fmodf.c +++ b/sysdeps/ieee754/flt-32/e_fmodf.c @@ -41,7 +41,7 @@ __ieee754_fmodf (float x, float y) return (x*y)/(x*y); if(hx<hy) return x; /* |x|<|y| return x */ if(hx==hy) - return Zero[(u_int32_t)sx>>31]; /* |x|=|y| return x*0*/ + return Zero[(uint32_t)sx>>31]; /* |x|=|y| return x*0*/ /* determine ix = ilogb(x) */ if(hx<0x00800000) { /* subnormal x */ @@ -74,7 +74,7 @@ __ieee754_fmodf (float x, float y) if(hz<0){hx = hx+hx;} else { if(hz==0) /* return sign(x)*0 */ - return Zero[(u_int32_t)sx>>31]; + return Zero[(uint32_t)sx>>31]; hx = hz+hz; } } @@ -83,7 +83,7 @@ __ieee754_fmodf (float x, float y) /* convert back to floating value and restore the sign */ if(hx==0) /* return sign(x)*0 */ - return Zero[(u_int32_t)sx>>31]; + return Zero[(uint32_t)sx>>31]; while(hx<0x00800000) { /* normalize x */ hx = hx+hx; iy -= 1; diff --git a/sysdeps/ieee754/flt-32/e_gammaf_r.c b/sysdeps/ieee754/flt-32/e_gammaf_r.c index 1157dec2fe..83f1a1bf03 100644 --- a/sysdeps/ieee754/flt-32/e_gammaf_r.c +++ b/sysdeps/ieee754/flt-32/e_gammaf_r.c @@ -118,7 +118,7 @@ __ieee754_gammaf_r (float x, int *signgamp) return 1.0 / x; } if (__builtin_expect (hx < 0, 0) - && (u_int32_t) hx < 0xff800000 && __rintf (x) == x) + && (uint32_t) hx < 0xff800000 && __rintf (x) == x) { /* Return value for integer x < 0 is NaN with invalid exception. */ *signgamp = 0; diff --git a/sysdeps/ieee754/flt-32/e_jnf.c b/sysdeps/ieee754/flt-32/e_jnf.c index 4e634778d3..82b9ba3300 100644 --- a/sysdeps/ieee754/flt-32/e_jnf.c +++ b/sysdeps/ieee754/flt-32/e_jnf.c @@ -186,7 +186,7 @@ __ieee754_ynf(int n, float x) float ret; { int32_t i,hx,ix; - u_int32_t ib; + uint32_t ib; int32_t sign; float a, b, temp; diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c index aa21bbc9c5..86dd9b3d96 100644 --- a/sysdeps/ieee754/flt-32/e_log10f.c +++ b/sysdeps/ieee754/flt-32/e_log10f.c @@ -42,7 +42,7 @@ __ieee754_log10f(float x) } if (__builtin_expect(hx >= 0x7f800000, 0)) 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); if (FIX_INT_FP_CONVERT_ZERO && y == 0.0f) diff --git a/sysdeps/ieee754/flt-32/e_powf.c b/sysdeps/ieee754/flt-32/e_powf.c index 3f06020a6f..ce8e11f1ea 100644 --- a/sysdeps/ieee754/flt-32/e_powf.c +++ b/sysdeps/ieee754/flt-32/e_powf.c @@ -134,7 +134,7 @@ __ieee754_powf(float x, float y) } /* (x<0)**(non-int) is NaN */ - if(__builtin_expect(((((u_int32_t)hx>>31)-1)|yisint)==0, 0)) + if(__builtin_expect(((((uint32_t)hx>>31)-1)|yisint)==0, 0)) return (x-x)/(x-x); /* |y| is huge */ @@ -177,7 +177,7 @@ __ieee754_powf(float x, float y) } 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) */ /* compute y * d2 */ @@ -191,7 +191,7 @@ __ieee754_powf(float x, float y) } else if (__builtin_expect((j&0x7fffffff)>0x43160000, 0))/* z <= -150 */ return s*tiny*tiny; /* underflow */ - else if (__builtin_expect((u_int32_t) j==0xc3160000, 0)){/* z == -150*/ + else if (__builtin_expect((uint32_t) j==0xc3160000, 0)){/* z == -150*/ if(0.0<=(z-d1)) return s*tiny*tiny; /* underflow */ } /* diff --git a/sysdeps/ieee754/flt-32/e_rem_pio2f.c b/sysdeps/ieee754/flt-32/e_rem_pio2f.c index c4d28c8657..bd871a26c2 100644 --- a/sysdeps/ieee754/flt-32/e_rem_pio2f.c +++ b/sysdeps/ieee754/flt-32/e_rem_pio2f.c @@ -131,7 +131,7 @@ int32_t __ieee754_rem_pio2f(float x, float *y) 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/sysdeps/ieee754/flt-32/e_remainderf.c b/sysdeps/ieee754/flt-32/e_remainderf.c index cc0167862e..8e78784e0f 100644 --- a/sysdeps/ieee754/flt-32/e_remainderf.c +++ b/sysdeps/ieee754/flt-32/e_remainderf.c @@ -23,7 +23,7 @@ float __ieee754_remainderf(float x, float p) { int32_t hx,hp; - u_int32_t sx; + uint32_t sx; float p_half; GET_FLOAT_WORD(hx,x); diff --git a/sysdeps/ieee754/flt-32/e_sqrtf.c b/sysdeps/ieee754/flt-32/e_sqrtf.c index c02206ac01..6025da19cf 100644 --- a/sysdeps/ieee754/flt-32/e_sqrtf.c +++ b/sysdeps/ieee754/flt-32/e_sqrtf.c @@ -24,7 +24,7 @@ __ieee754_sqrtf(float x) 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/sysdeps/ieee754/flt-32/s_ceilf.c b/sysdeps/ieee754/flt-32/s_ceilf.c index bff26c33cb..9676dc6645 100644 --- a/sysdeps/ieee754/flt-32/s_ceilf.c +++ b/sysdeps/ieee754/flt-32/s_ceilf.c @@ -21,7 +21,7 @@ float __ceilf(float x) { int32_t i0,j0; - u_int32_t i; + uint32_t i; GET_FLOAT_WORD(i0,x); j0 = ((i0>>23)&0xff)-0x7f; diff --git a/sysdeps/ieee754/flt-32/s_copysignf.c b/sysdeps/ieee754/flt-32/s_copysignf.c index 1621836065..9b88816866 100644 --- a/sysdeps/ieee754/flt-32/s_copysignf.c +++ b/sysdeps/ieee754/flt-32/s_copysignf.c @@ -28,7 +28,7 @@ static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp float __copysignf(float x, float y) { - u_int32_t ix,iy; + uint32_t ix,iy; GET_FLOAT_WORD(ix,x); GET_FLOAT_WORD(iy,y); SET_FLOAT_WORD(x,(ix&0x7fffffff)|(iy&0x80000000)); diff --git a/sysdeps/ieee754/flt-32/s_erff.c b/sysdeps/ieee754/flt-32/s_erff.c index c8b6287503..07760c343b 100644 --- a/sysdeps/ieee754/flt-32/s_erff.c +++ b/sysdeps/ieee754/flt-32/s_erff.c @@ -104,7 +104,7 @@ float __erff(float x) GET_FLOAT_WORD(hx,x); ix = hx&0x7fffffff; if(ix>=0x7f800000) { /* erf(nan)=nan */ - i = ((u_int32_t)hx>>31)<<1; + i = ((uint32_t)hx>>31)<<1; return (float)(1-i)+one/x; /* erf(+-inf)=+-1 */ } @@ -162,7 +162,7 @@ float __erfcf(float x) ix = hx&0x7fffffff; if(ix>=0x7f800000) { /* erfc(nan)=nan */ /* erfc(+-inf)=0,2 */ - float ret = (float)(((u_int32_t)hx>>31)<<1)+one/x; + float ret = (float)(((uint32_t)hx>>31)<<1)+one/x; if (FIX_INT_FP_CONVERT_ZERO && ret == 0.0f) return 0.0f; return ret; diff --git a/sysdeps/ieee754/flt-32/s_expm1f.c b/sysdeps/ieee754/flt-32/s_expm1f.c index c515d25e28..00ca789344 100644 --- a/sysdeps/ieee754/flt-32/s_expm1f.c +++ b/sysdeps/ieee754/flt-32/s_expm1f.c @@ -39,7 +39,7 @@ __expm1f(float x) { float y,hi,lo,c,t,e,hxs,hfx,r1; int32_t k,xsb; - u_int32_t hx; + uint32_t hx; GET_FLOAT_WORD(hx,x); xsb = hx&0x80000000; /* sign bit of x */ diff --git a/sysdeps/ieee754/flt-32/s_finitef.c b/sysdeps/ieee754/flt-32/s_finitef.c index 4c5b339235..b9ae048559 100644 --- a/sysdeps/ieee754/flt-32/s_finitef.c +++ b/sysdeps/ieee754/flt-32/s_finitef.c @@ -35,7 +35,7 @@ int FINITEF(float x) { int32_t ix; GET_FLOAT_WORD(ix,x); - return (int)((u_int32_t)((ix&0x7f800000)-0x7f800000)>>31); + return (int)((uint32_t)((ix&0x7f800000)-0x7f800000)>>31); } hidden_def (__finitef) weak_alias (__finitef, finitef) diff --git a/sysdeps/ieee754/flt-32/s_floorf.c b/sysdeps/ieee754/flt-32/s_floorf.c index 69160e5e10..43e284a158 100644 --- a/sysdeps/ieee754/flt-32/s_floorf.c +++ b/sysdeps/ieee754/flt-32/s_floorf.c @@ -27,7 +27,7 @@ float __floorf(float x) { int32_t i0,j0; - u_int32_t i; + uint32_t i; GET_FLOAT_WORD(i0,x); j0 = ((i0>>23)&0xff)-0x7f; if(j0<23) { diff --git a/sysdeps/ieee754/flt-32/s_fpclassifyf.c b/sysdeps/ieee754/flt-32/s_fpclassifyf.c index 8a67c6fc0e..c33e7db322 100644 --- a/sysdeps/ieee754/flt-32/s_fpclassifyf.c +++ b/sysdeps/ieee754/flt-32/s_fpclassifyf.c @@ -25,7 +25,7 @@ int __fpclassifyf (float x) { - u_int32_t wx; + uint32_t wx; int retval = FP_NORMAL; GET_FLOAT_WORD (wx, x); diff --git a/sysdeps/ieee754/flt-32/s_isnanf.c b/sysdeps/ieee754/flt-32/s_isnanf.c index 820b31a2b4..52129735fe 100644 --- a/sysdeps/ieee754/flt-32/s_isnanf.c +++ b/sysdeps/ieee754/flt-32/s_isnanf.c @@ -32,7 +32,7 @@ int __isnanf(float x) GET_FLOAT_WORD(ix,x); ix &= 0x7fffffff; ix = 0x7f800000 - ix; - return (int)(((u_int32_t)(ix))>>31); + return (int)(((uint32_t)(ix))>>31); } hidden_def (__isnanf) weak_alias (__isnanf, isnanf) diff --git a/sysdeps/ieee754/flt-32/s_issignalingf.c b/sysdeps/ieee754/flt-32/s_issignalingf.c index cd9830eae2..a051e3aaef 100644 --- a/sysdeps/ieee754/flt-32/s_issignalingf.c +++ b/sysdeps/ieee754/flt-32/s_issignalingf.c @@ -23,7 +23,7 @@ int __issignalingf (float x) { - u_int32_t xi; + uint32_t xi; GET_FLOAT_WORD (xi, x); #if HIGH_ORDER_BIT_IS_SET_FOR_SNAN /* We only have to care about the high-order bit of x's significand, because diff --git a/sysdeps/ieee754/flt-32/s_llrintf.c b/sysdeps/ieee754/flt-32/s_llrintf.c index e0ffbfee82..fd46653ae6 100644 --- a/sysdeps/ieee754/flt-32/s_llrintf.c +++ b/sysdeps/ieee754/flt-32/s_llrintf.c @@ -36,7 +36,7 @@ long long int __llrintf (float x) { int32_t j0; - u_int32_t i0; + uint32_t i0; float w; float t; long long int result; diff --git a/sysdeps/ieee754/flt-32/s_llroundf.c b/sysdeps/ieee754/flt-32/s_llroundf.c index faee87b879..c620186183 100644 --- a/sysdeps/ieee754/flt-32/s_llroundf.c +++ b/sysdeps/ieee754/flt-32/s_llroundf.c @@ -29,7 +29,7 @@ long long int __llroundf (float x) { int32_t j0; - u_int32_t i; + uint32_t i; long long int result; int sign; diff --git a/sysdeps/ieee754/flt-32/s_lrintf.c b/sysdeps/ieee754/flt-32/s_lrintf.c index a1ed720c0f..a7f186a690 100644 --- a/sysdeps/ieee754/flt-32/s_lrintf.c +++ b/sysdeps/ieee754/flt-32/s_lrintf.c @@ -36,7 +36,7 @@ long int __lrintf (float x) { int32_t j0; - u_int32_t i0; + uint32_t i0; float w; float t; long int result; diff --git a/sysdeps/ieee754/flt-32/s_lroundf.c b/sysdeps/ieee754/flt-32/s_lroundf.c index 81cb7ab10f..d18fcbe0b5 100644 --- a/sysdeps/ieee754/flt-32/s_lroundf.c +++ b/sysdeps/ieee754/flt-32/s_lroundf.c @@ -29,7 +29,7 @@ long int __lroundf (float x) { int32_t j0; - u_int32_t i; + uint32_t i; long int result; int sign; diff --git a/sysdeps/ieee754/flt-32/s_modff.c b/sysdeps/ieee754/flt-32/s_modff.c index 23f6a902b3..9bbc8e61ef 100644 --- a/sysdeps/ieee754/flt-32/s_modff.c +++ b/sysdeps/ieee754/flt-32/s_modff.c @@ -22,7 +22,7 @@ float __modff(float x, float *iptr) { int32_t i0,j0; - u_int32_t i; + uint32_t i; GET_FLOAT_WORD(i0,x); j0 = ((i0>>23)&0xff)-0x7f; /* exponent of x */ if(__builtin_expect(j0<23, 1)) { /* integer part in x */ @@ -32,7 +32,7 @@ __modff(float x, float *iptr) } else { i = (0x007fffff)>>j0; if((i0&i)==0) { /* x is integral */ - u_int32_t ix; + uint32_t ix; *iptr = x; GET_FLOAT_WORD(ix,x); SET_FLOAT_WORD(x,ix&0x80000000); /* return +-0 */ diff --git a/sysdeps/ieee754/flt-32/s_remquof.c b/sysdeps/ieee754/flt-32/s_remquof.c index 8e398dc6c5..ef81133f23 100644 --- a/sysdeps/ieee754/flt-32/s_remquof.c +++ b/sysdeps/ieee754/flt-32/s_remquof.c @@ -29,7 +29,7 @@ float __remquof (float x, float y, int *quo) { int32_t hx,hy; - u_int32_t sx; + uint32_t sx; int cquo, qs; GET_FLOAT_WORD (hx, x); diff --git a/sysdeps/ieee754/flt-32/s_roundf.c b/sysdeps/ieee754/flt-32/s_roundf.c index 7ea0d97756..4f60621643 100644 --- a/sysdeps/ieee754/flt-32/s_roundf.c +++ b/sysdeps/ieee754/flt-32/s_roundf.c @@ -39,7 +39,7 @@ __roundf (float x) } else { - u_int32_t i = 0x007fffff >> j0; + uint32_t i = 0x007fffff >> j0; if ((i0 & i) == 0) /* X is integral. */ return x; diff --git a/sysdeps/ieee754/ldbl-128/e_acoshl.c b/sysdeps/ieee754/ldbl-128/e_acoshl.c index 7c79d437a2..10576c9a46 100644 --- a/sysdeps/ieee754/ldbl-128/e_acoshl.c +++ b/sysdeps/ieee754/ldbl-128/e_acoshl.c @@ -38,7 +38,7 @@ _Float128 __ieee754_acoshl(_Float128 x) { _Float128 t; - u_int64_t lx; + uint64_t lx; int64_t hx; GET_LDOUBLE_WORDS64(hx,lx,x); if(hx<0x3fff000000000000LL) { /* x < 1 */ diff --git a/sysdeps/ieee754/ldbl-128/e_atan2l.c b/sysdeps/ieee754/ldbl-128/e_atan2l.c index faecd1a63b..8b4afa4bd5 100644 --- a/sysdeps/ieee754/ldbl-128/e_atan2l.c +++ b/sysdeps/ieee754/ldbl-128/e_atan2l.c @@ -56,7 +56,7 @@ __ieee754_atan2l(_Float128 y, _Float128 x) { _Float128 z; int64_t k,m,hx,hy,ix,iy; - u_int64_t lx,ly; + uint64_t lx,ly; GET_LDOUBLE_WORDS64(hx,lx,x); ix = hx&0x7fffffffffffffffLL; @@ -109,7 +109,7 @@ __ieee754_atan2l(_Float128 y, _Float128 x) switch (m) { case 0: return z ; /* atan(+,+) */ case 1: { - u_int64_t zh; + uint64_t zh; GET_LDOUBLE_MSW64(zh,z); SET_LDOUBLE_MSW64(z,zh ^ 0x8000000000000000ULL); } diff --git a/sysdeps/ieee754/ldbl-128/e_atanhl.c b/sysdeps/ieee754/ldbl-128/e_atanhl.c index 3905af4dfc..4c8c2e22e6 100644 --- a/sysdeps/ieee754/ldbl-128/e_atanhl.c +++ b/sysdeps/ieee754/ldbl-128/e_atanhl.c @@ -44,7 +44,7 @@ _Float128 __ieee754_atanhl(_Float128 x) { _Float128 t; - u_int32_t jx, ix; + uint32_t jx, ix; ieee854_long_double_shape_type u; u.value = x; diff --git a/sysdeps/ieee754/ldbl-128/e_fmodl.c b/sysdeps/ieee754/ldbl-128/e_fmodl.c index f27cd4f8ff..73465126b4 100644 --- a/sysdeps/ieee754/ldbl-128/e_fmodl.c +++ b/sysdeps/ieee754/ldbl-128/e_fmodl.c @@ -27,7 +27,7 @@ _Float128 __ieee754_fmodl (_Float128 x, _Float128 y) { int64_t n,hx,hy,hz,ix,iy,sx,i; - u_int64_t lx,ly,lz; + uint64_t lx,ly,lz; GET_LDOUBLE_WORDS64(hx,lx,x); GET_LDOUBLE_WORDS64(hy,ly,y); @@ -42,7 +42,7 @@ __ieee754_fmodl (_Float128 x, _Float128 y) if(hx<=hy) { if((hx<hy)||(lx<ly)) return x; /* |x|<|y| return x */ if(lx==ly) - return Zero[(u_int64_t)sx>>63]; /* |x|=|y| return x*0*/ + return Zero[(uint64_t)sx>>63]; /* |x|=|y| return x*0*/ } /* determine ix = ilogb(x) */ @@ -96,7 +96,7 @@ __ieee754_fmodl (_Float128 x, _Float128 y) if(hz<0){hx = hx+hx+(lx>>63); lx = lx+lx;} else { if((hz|lz)==0) /* return sign(x)*0 */ - return Zero[(u_int64_t)sx>>63]; + return Zero[(uint64_t)sx>>63]; hx = hz+hz+(lz>>63); lx = lz+lz; } } @@ -105,7 +105,7 @@ __ieee754_fmodl (_Float128 x, _Float128 y) /* convert back to floating value and restore the sign */ if((hx|lx)==0) /* return sign(x)*0 */ - return Zero[(u_int64_t)sx>>63]; + return Zero[(uint64_t)sx>>63]; while(hx<0x0001000000000000LL) { /* normalize x */ hx = hx+hx+(lx>>63); lx = lx+lx; iy -= 1; @@ -116,7 +116,7 @@ __ieee754_fmodl (_Float128 x, _Float128 y) } else { /* subnormal output */ n = -16382 - iy; if(n<=48) { - lx = (lx>>n)|((u_int64_t)hx<<(64-n)); + lx = (lx>>n)|((uint64_t)hx<<(64-n)); hx >>= n; } else if (n<=63) { lx = (hx<<(64-n))|(lx>>n); hx = sx; diff --git a/sysdeps/ieee754/ldbl-128/e_gammal_r.c b/sysdeps/ieee754/ldbl-128/e_gammal_r.c index 3a5317ade1..963cbbf5c0 100644 --- a/sysdeps/ieee754/ldbl-128/e_gammal_r.c +++ b/sysdeps/ieee754/ldbl-128/e_gammal_r.c @@ -123,7 +123,7 @@ _Float128 __ieee754_gammal_r (_Float128 x, int *signgamp) { int64_t hx; - u_int64_t lx; + uint64_t lx; _Float128 ret; GET_LDOUBLE_WORDS64 (hx, lx, x); @@ -134,7 +134,7 @@ __ieee754_gammal_r (_Float128 x, int *signgamp) *signgamp = 0; return 1.0 / x; } - if (hx < 0 && (u_int64_t) hx < 0xffff000000000000ULL && __rintl (x) == x) + if (hx < 0 && (uint64_t) hx < 0xffff000000000000ULL && __rintl (x) == x) { /* Return value for integer x < 0 is NaN with invalid exception. */ *signgamp = 0; diff --git a/sysdeps/ieee754/ldbl-128/e_hypotl.c b/sysdeps/ieee754/ldbl-128/e_hypotl.c index 6c4e178fbe..87160e4230 100644 --- a/sysdeps/ieee754/ldbl-128/e_hypotl.c +++ b/sysdeps/ieee754/ldbl-128/e_hypotl.c @@ -65,7 +65,7 @@ __ieee754_hypotl(_Float128 x, _Float128 y) k=0; if(ha > 0x5f3f000000000000LL) { /* a>2**8000 */ if(ha >= 0x7fff000000000000LL) { /* Inf or NaN */ - u_int64_t low; + uint64_t low; w = a+b; /* for sNaN */ if (issignaling (a) || issignaling (b)) return w; @@ -83,7 +83,7 @@ __ieee754_hypotl(_Float128 x, _Float128 y) } if(hb < 0x20bf000000000000LL) { /* b < 2**-8000 */ if(hb <= 0x0000ffffffffffffLL) { /* subnormal b or 0 */ - u_int64_t low; + uint64_t low; GET_LDOUBLE_LSW64(low,b); if((hb|low)==0) return a; t1=0; @@ -128,7 +128,7 @@ __ieee754_hypotl(_Float128 x, _Float128 y) w = __ieee754_sqrtl(t1*y1-(w*(-w)-(t1*y2+t2*b))); } if(k!=0) { - u_int64_t high; + uint64_t high; t1 = 1; GET_LDOUBLE_MSW64(high,t1); SET_LDOUBLE_MSW64(t1,high+(k<<48)); diff --git a/sysdeps/ieee754/ldbl-128/e_jnl.c b/sysdeps/ieee754/ldbl-128/e_jnl.c index 470631e600..7ae671bc3e 100644 --- a/sysdeps/ieee754/ldbl-128/e_jnl.c +++ b/sysdeps/ieee754/ldbl-128/e_jnl.c @@ -71,7 +71,7 @@ static const _Float128 _Float128 __ieee754_jnl (int n, _Float128 x) { - u_int32_t se; + uint32_t se; int32_t i, ix, sgn; _Float128 a, b, temp, di, ret; _Float128 z, w; @@ -309,7 +309,7 @@ strong_alias (__ieee754_jnl, __jnl_finite) _Float128 __ieee754_ynl (int n, _Float128 x) { - u_int32_t se; + uint32_t se; int32_t i, ix; int32_t sign; _Float128 a, b, temp, ret; diff --git a/sysdeps/ieee754/ldbl-128/e_powl.c b/sysdeps/ieee754/ldbl-128/e_powl.c index a344840090..2aef955b46 100644 --- a/sysdeps/ieee754/ldbl-128/e_powl.c +++ b/sysdeps/ieee754/ldbl-128/e_powl.c @@ -151,7 +151,7 @@ __ieee754_powl (_Float128 x, _Float128 y) _Float128 y1, t1, t2, r, s, sgn, t, u, v, w; _Float128 s2, s_h, s_l, t_h, t_l, ay; int32_t i, j, k, yisint, n; - u_int32_t ix, iy; + uint32_t ix, iy; int32_t hx, hy; ieee854_long_double_shape_type o, p, q; @@ -260,12 +260,12 @@ __ieee754_powl (_Float128 x, _Float128 y) } /* (x<0)**(non-int) is NaN */ - if (((((u_int32_t) hx >> 31) - 1) | yisint) == 0) + if (((((uint32_t) hx >> 31) - 1) | yisint) == 0) return (x - x) / (x - x); /* sgn (sign of result -ve**odd) = -1 else = 1 */ sgn = one; - if (((((u_int32_t) hx >> 31) - 1) | (yisint - 1)) == 0) + if (((((uint32_t) hx >> 31) - 1) | (yisint - 1)) == 0) sgn = -one; /* (-ve)**(odd int) */ /* |y| is huge. diff --git a/sysdeps/ieee754/ldbl-128/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-128/e_rem_pio2l.c index 21b440762f..39862563cd 100644 --- a/sysdeps/ieee754/ldbl-128/e_rem_pio2l.c +++ b/sysdeps/ieee754/ldbl-128/e_rem_pio2l.c @@ -198,7 +198,7 @@ int32_t __ieee754_rem_pio2l(_Float128 x, _Float128 *y) _Float128 z, w, t; double tx[8]; int64_t exp, n, ix, hx; - u_int64_t lx; + uint64_t lx; GET_LDOUBLE_WORDS64 (hx, lx, x); ix = hx & 0x7fffffffffffffffLL; diff --git a/sysdeps/ieee754/ldbl-128/e_remainderl.c b/sysdeps/ieee754/ldbl-128/e_remainderl.c index c1c196ca9a..09b8640b78 100644 --- a/sysdeps/ieee754/ldbl-128/e_remainderl.c +++ b/sysdeps/ieee754/ldbl-128/e_remainderl.c @@ -31,7 +31,7 @@ _Float128 __ieee754_remainderl(_Float128 x, _Float128 p) { int64_t hx,hp; - u_int64_t sx,lx,lp; + uint64_t sx,lx,lp; _Float128 p_half; GET_LDOUBLE_WORDS64(hx,lx,x); diff --git a/sysdeps/ieee754/ldbl-128/e_sinhl.c b/sysdeps/ieee754/ldbl-128/e_sinhl.c index a2b30c2190..cce5b6e4fd 100644 --- a/sysdeps/ieee754/ldbl-128/e_sinhl.c +++ b/sysdeps/ieee754/ldbl-128/e_sinhl.c @@ -64,7 +64,7 @@ _Float128 __ieee754_sinhl (_Float128 x) { _Float128 t, w, h; - u_int32_t jx, ix; + uint32_t jx, ix; ieee854_long_double_shape_type u; /* Words of |x|. */ diff --git a/sysdeps/ieee754/ldbl-128/k_cosl.c b/sysdeps/ieee754/ldbl-128/k_cosl.c index b7c606379e..b300a7dc49 100644 --- a/sysdeps/ieee754/ldbl-128/k_cosl.c +++ b/sysdeps/ieee754/ldbl-128/k_cosl.c @@ -81,9 +81,9 @@ __kernel_cosl(_Float128 x, _Float128 y) { _Float128 h, l, z, sin_l, cos_l_m1; int64_t ix; - u_int32_t tix, hix, index; + uint32_t tix, hix, index; GET_LDOUBLE_MSW64 (ix, x); - tix = ((u_int64_t)ix) >> 32; + tix = ((uint64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3ffc3000) /* |x| < 0.1484375 */ { @@ -118,7 +118,7 @@ __kernel_cosl(_Float128 x, _Float128 y) case 2: index = (hix - 0x3ffc3000) >> 10; break; } - SET_LDOUBLE_WORDS64(h, ((u_int64_t)hix) << 32, 0); + SET_LDOUBLE_WORDS64(h, ((uint64_t)hix) << 32, 0); l = y - (h - x); z = l * l; sin_l = l*(ONE+z*(SSIN1+z*(SSIN2+z*(SSIN3+z*(SSIN4+z*SSIN5))))); diff --git a/sysdeps/ieee754/ldbl-128/k_sincosl.c b/sysdeps/ieee754/ldbl-128/k_sincosl.c index 03710f9e3a..63681694cb 100644 --- a/sysdeps/ieee754/ldbl-128/k_sincosl.c +++ b/sysdeps/ieee754/ldbl-128/k_sincosl.c @@ -101,9 +101,9 @@ __kernel_sincosl(_Float128 x, _Float128 y, _Float128 *sinx, _Float128 *cosx, int { _Float128 h, l, z, sin_l, cos_l_m1; int64_t ix; - u_int32_t tix, hix, index; + uint32_t tix, hix, index; GET_LDOUBLE_MSW64 (ix, x); - tix = ((u_int64_t)ix) >> 32; + tix = ((uint64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3ffc3000) /* |x| < 0.1484375 */ { @@ -149,7 +149,7 @@ __kernel_sincosl(_Float128 x, _Float128 y, _Float128 *sinx, _Float128 *cosx, int case 2: index = (hix - 0x3ffc3000) >> 10; break; } - SET_LDOUBLE_WORDS64(h, ((u_int64_t)hix) << 32, 0); + SET_LDOUBLE_WORDS64(h, ((uint64_t)hix) << 32, 0); if (iy) l = y - (h - x); else diff --git a/sysdeps/ieee754/ldbl-128/k_sinl.c b/sysdeps/ieee754/ldbl-128/k_sinl.c index 4107eeb9f9..256e2e727b 100644 --- a/sysdeps/ieee754/ldbl-128/k_sinl.c +++ b/sysdeps/ieee754/ldbl-128/k_sinl.c @@ -82,9 +82,9 @@ __kernel_sinl(_Float128 x, _Float128 y, int iy) { _Float128 h, l, z, sin_l, cos_l_m1; int64_t ix; - u_int32_t tix, hix, index; + uint32_t tix, hix, index; GET_LDOUBLE_MSW64 (ix, x); - tix = ((u_int64_t)ix) >> 32; + tix = ((uint64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3ffc3000) /* |x| < 0.1484375 */ { @@ -118,7 +118,7 @@ __kernel_sinl(_Float128 x, _Float128 y, int iy) case 2: index = (hix - 0x3ffc3000) >> 10; break; } - SET_LDOUBLE_WORDS64(h, ((u_int64_t)hix) << 32, 0); + SET_LDOUBLE_WORDS64(h, ((uint64_t)hix) << 32, 0); if (iy) l = (ix < 0 ? -y : y) - (h - x); else diff --git a/sysdeps/ieee754/ldbl-128/s_ceill.c b/sysdeps/ieee754/ldbl-128/s_ceill.c index 8034795072..8ac39fa929 100644 --- a/sysdeps/ieee754/ldbl-128/s_ceill.c +++ b/sysdeps/ieee754/ldbl-128/s_ceill.c @@ -30,7 +30,7 @@ static char rcsid[] = "$NetBSD: $"; _Float128 __ceill(_Float128 x) { int64_t i0,i1,j0; - u_int64_t i,j; + uint64_t i,j; GET_LDOUBLE_WORDS64(i0,i1,x); j0 = ((i0>>48)&0x7fff)-0x3fff; if(j0<48) { diff --git a/sysdeps/ieee754/ldbl-128/s_copysignl.c b/sysdeps/ieee754/ldbl-128/s_copysignl.c index 8ee85ea8f7..e514e3c767 100644 --- a/sysdeps/ieee754/ldbl-128/s_copysignl.c +++ b/sysdeps/ieee754/ldbl-128/s_copysignl.c @@ -28,7 +28,7 @@ static char rcsid[] = "$NetBSD: $"; _Float128 __copysignl(_Float128 x, _Float128 y) { - u_int64_t hx,hy; + uint64_t hx,hy; GET_LDOUBLE_MSW64(hx,x); GET_LDOUBLE_MSW64(hy,y); SET_LDOUBLE_MSW64(x,(hx&0x7fffffffffffffffULL) diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c index e5dfae9636..ce9e6ccc78 100644 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c @@ -819,7 +819,7 @@ __erfcl (_Float128 x) if (ix >= 0x7fff0000) { /* erfc(nan)=nan */ /* erfc(+-inf)=0,2 */ - return (_Float128) (((u_int32_t) sign >> 31) << 1) + one / x; + return (_Float128) (((uint32_t) sign >> 31) << 1) + one / x; } if (ix < 0x3ffd0000) /* |x| <1/4 */ diff --git a/sysdeps/ieee754/ldbl-128/s_fabsl.c b/sysdeps/ieee754/ldbl-128/s_fabsl.c index 0ce6f734cf..1efb7a2954 100644 --- a/sysdeps/ieee754/ldbl-128/s_fabsl.c +++ b/sysdeps/ieee754/ldbl-128/s_fabsl.c @@ -26,7 +26,7 @@ static char rcsid[] = "$NetBSD: $"; _Float128 __fabsl(_Float128 x) { - u_int64_t hx; + uint64_t hx; GET_LDOUBLE_MSW64(hx,x); SET_LDOUBLE_MSW64(x,hx&0x7fffffffffffffffLL); return x; diff --git a/sysdeps/ieee754/ldbl-128/s_finitel.c b/sysdeps/ieee754/ldbl-128/s_finitel.c index 7c699688fe..d42b37815c 100644 --- a/sysdeps/ieee754/ldbl-128/s_finitel.c +++ b/sysdeps/ieee754/ldbl-128/s_finitel.c @@ -29,8 +29,8 @@ int __finitel(_Float128 x) { int64_t hx; GET_LDOUBLE_MSW64(hx,x); - return (int)((u_int64_t)((hx&0x7fff000000000000LL) - -0x7fff000000000000LL)>>63); + return (int)((uint64_t)((hx&0x7fff000000000000LL) + -0x7fff000000000000LL)>>63); } mathx_hidden_def (__finitel) weak_alias (__finitel, finitel) diff --git a/sysdeps/ieee754/ldbl-128/s_floorl.c b/sysdeps/ieee754/ldbl-128/s_floorl.c index 13ad0848a4..77b1473519 100644 --- a/sysdeps/ieee754/ldbl-128/s_floorl.c +++ b/sysdeps/ieee754/ldbl-128/s_floorl.c @@ -30,7 +30,7 @@ static char rcsid[] = "$NetBSD: $"; _Float128 __floorl(_Float128 x) { int64_t i0,i1,j0; - u_int64_t i,j; + uint64_t i,j; GET_LDOUBLE_WORDS64(i0,i1,x); j0 = ((i0>>48)&0x7fff)-0x3fff; if(j0<48) { diff --git a/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c b/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c index daa7d79ec2..1890c026e8 100644 --- a/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c +++ b/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c @@ -26,7 +26,7 @@ int __fpclassifyl (_Float128 x) { - u_int64_t hx, lx; + uint64_t hx, lx; int retval = FP_NORMAL; GET_LDOUBLE_WORDS64 (hx, lx, x); diff --git a/sysdeps/ieee754/ldbl-128/s_frexpl.c b/sysdeps/ieee754/ldbl-128/s_frexpl.c index 47a171f551..7ac28f1685 100644 --- a/sysdeps/ieee754/ldbl-128/s_frexpl.c +++ b/sysdeps/ieee754/ldbl-128/s_frexpl.c @@ -35,7 +35,7 @@ two114 = L(2.0769187434139310514121985316880384E+34); /* 0x4071000000000000, 0 * _Float128 __frexpl(_Float128 x, int *eptr) { - u_int64_t hx, lx, ix; + uint64_t hx, lx, ix; GET_LDOUBLE_WORDS64(hx,lx,x); ix = 0x7fffffffffffffffULL&hx; *eptr = 0; diff --git a/sysdeps/ieee754/ldbl-128/s_isnanl.c b/sysdeps/ieee754/ldbl-128/s_isnanl.c index 80f97fea4c..8ebef00d24 100644 --- a/sysdeps/ieee754/ldbl-128/s_isnanl.c +++ b/sysdeps/ieee754/ldbl-128/s_isnanl.c @@ -30,9 +30,9 @@ int __isnanl(_Float128 x) int64_t hx,lx; GET_LDOUBLE_WORDS64(hx,lx,x); hx &= 0x7fffffffffffffffLL; - hx |= (u_int64_t)(lx|(-lx))>>63; + hx |= (uint64_t)(lx|(-lx))>>63; hx = 0x7fff000000000000LL - hx; - return (int)((u_int64_t)hx>>63); + return (int)((uint64_t)hx>>63); } mathx_hidden_def (__isnanl) weak_alias (__isnanl, isnanl) diff --git a/sysdeps/ieee754/ldbl-128/s_issignalingl.c b/sysdeps/ieee754/ldbl-128/s_issignalingl.c index 02d6a0ae07..71f35238c5 100644 --- a/sysdeps/ieee754/ldbl-128/s_issignalingl.c +++ b/sysdeps/ieee754/ldbl-128/s_issignalingl.c @@ -23,7 +23,7 @@ int __issignalingl (_Float128 x) { - u_int64_t hxi, lxi __attribute__ ((unused)); + uint64_t hxi, lxi __attribute__ ((unused)); GET_LDOUBLE_WORDS64 (hxi, lxi, x); #if HIGH_ORDER_BIT_IS_SET_FOR_SNAN /* We only have to care about the high-order bit of x's significand, because diff --git a/sysdeps/ieee754/ldbl-128/s_llrintl.c b/sysdeps/ieee754/ldbl-128/s_llrintl.c index d08a90a1b3..94798cf425 100644 --- a/sysdeps/ieee754/ldbl-128/s_llrintl.c +++ b/sysdeps/ieee754/ldbl-128/s_llrintl.c @@ -36,7 +36,7 @@ long long int __llrintl (_Float128 x) { int32_t j0; - u_int64_t i0,i1; + uint64_t i0,i1; _Float128 w; _Float128 t; long long int result; diff --git a/sysdeps/ieee754/ldbl-128/s_llroundl.c b/sysdeps/ieee754/ldbl-128/s_llroundl.c index bb0b5bcf4b..8b44f1f502 100644 --- a/sysdeps/ieee754/ldbl-128/s_llroundl.c +++ b/sysdeps/ieee754/ldbl-128/s_llroundl.c @@ -29,7 +29,7 @@ long long int __llroundl (_Float128 x) { int64_t j0; - u_int64_t i1, i0; + uint64_t i1, i0; long long int result; int sign; @@ -55,7 +55,7 @@ __llroundl (_Float128 x) result = ((long long int) i0 << (j0 - 48)) | (i1 << (j0 - 112)); else { - u_int64_t j = i1 + (0x8000000000000000ULL >> (j0 - 48)); + uint64_t j = i1 + (0x8000000000000000ULL >> (j0 - 48)); if (j < i1) ++i0; diff --git a/sysdeps/ieee754/ldbl-128/s_lrintl.c b/sysdeps/ieee754/ldbl-128/s_lrintl.c index c690ddc8b8..49b736bd74 100644 --- a/sysdeps/ieee754/ldbl-128/s_lrintl.c +++ b/sysdeps/ieee754/ldbl-128/s_lrintl.c @@ -36,7 +36,7 @@ long int __lrintl (_Float128 x) { int32_t j0; - u_int64_t i0,i1; + uint64_t i0,i1; _Float128 w; _Float128 t; long int result; diff --git a/sysdeps/ieee754/ldbl-128/s_lroundl.c b/sysdeps/ieee754/ldbl-128/s_lroundl.c index 419112519d..15d010681d 100644 --- a/sysdeps/ieee754/ldbl-128/s_lroundl.c +++ b/sysdeps/ieee754/ldbl-128/s_lroundl.c @@ -29,7 +29,7 @@ long int __lroundl (_Float128 x) { int64_t j0; - u_int64_t i1, i0; + uint64_t i1, i0; long int result; int sign; @@ -62,7 +62,7 @@ __lroundl (_Float128 x) result = ((long int) i0 << (j0 - 48)) | (i1 << (j0 - 112)); else { - u_int64_t j = i1 + (0x8000000000000000ULL >> (j0 - 48)); + uint64_t j = i1 + (0x8000000000000000ULL >> (j0 - 48)); if (j < i1) ++i0; diff --git a/sysdeps/ieee754/ldbl-128/s_modfl.c b/sysdeps/ieee754/ldbl-128/s_modfl.c index 01e150b24f..6f7e48b173 100644 --- a/sysdeps/ieee754/ldbl-128/s_modfl.c +++ b/sysdeps/ieee754/ldbl-128/s_modfl.c @@ -35,7 +35,7 @@ static const _Float128 one = 1.0; _Float128 __modfl(_Float128 x, _Float128 *iptr) { int64_t i0,i1,j0; - u_int64_t i; + uint64_t i; GET_LDOUBLE_WORDS64(i0,i1,x); j0 = ((i0>>48)&0x7fff)-0x3fff; /* exponent of x */ if(j0<48) { /* integer part in high x */ diff --git a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c index 1565a8183f..631b0e0c71 100644 --- a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c +++ b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c @@ -37,10 +37,10 @@ _Float128 __nearbyintl(_Float128 x) { fenv_t env; int64_t i0,j0,sx; - u_int64_t i1 __attribute__ ((unused)); + uint64_t i1 __attribute__ ((unused)); _Float128 w,t; GET_LDOUBLE_WORDS64(i0,i1,x); - sx = (((u_int64_t)i0)>>63); + sx = (((uint64_t)i0)>>63); j0 = ((i0>>48)&0x7fff)-0x3fff; if(j0<112) { if(j0<0) { diff --git a/sysdeps/ieee754/ldbl-128/s_nextafterl.c b/sysdeps/ieee754/ldbl-128/s_nextafterl.c index d29f58a7e0..6c63d17302 100644 --- a/sysdeps/ieee754/ldbl-128/s_nextafterl.c +++ b/sysdeps/ieee754/ldbl-128/s_nextafterl.c @@ -31,7 +31,7 @@ static char rcsid[] = "$NetBSD: $"; _Float128 __nextafterl(_Float128 x, _Float128 y) { int64_t hx,hy,ix,iy; - u_int64_t lx,ly; + uint64_t lx,ly; GET_LDOUBLE_WORDS64(hx,lx,x); GET_LDOUBLE_WORDS64(hy,ly,y); diff --git a/sysdeps/ieee754/ldbl-128/s_nexttoward.c b/sysdeps/ieee754/ldbl-128/s_nexttoward.c index 4343fe83f8..04d094e44b 100644 --- a/sysdeps/ieee754/ldbl-128/s_nexttoward.c +++ b/sysdeps/ieee754/ldbl-128/s_nexttoward.c @@ -34,8 +34,8 @@ double __nexttoward(double x, long double y) { int32_t hx,ix; int64_t hy,iy; - u_int32_t lx; - u_int64_t ly; + uint32_t lx; + uint64_t ly; EXTRACT_WORDS(hx,lx,x); GET_LDOUBLE_WORDS64(hy,ly,y); @@ -49,7 +49,7 @@ double __nexttoward(double x, long double y) if((long double) x==y) return y; /* x=y, return y */ if((ix|lx)==0) { /* x == 0 */ double u; - INSERT_WORDS(x,(u_int32_t)((hy>>32)&0x80000000),1);/* return +-minsub */ + INSERT_WORDS(x,(uint32_t)((hy>>32)&0x80000000),1);/* return +-minsub */ u = math_opt_barrier (x); u = u * u; math_force_eval (u); /* raise underflow flag */ diff --git a/sysdeps/ieee754/ldbl-128/s_nexttowardf.c b/sysdeps/ieee754/ldbl-128/s_nexttowardf.c index 8703359d4f..6d5121d85d 100644 --- a/sysdeps/ieee754/ldbl-128/s_nexttowardf.c +++ b/sysdeps/ieee754/ldbl-128/s_nexttowardf.c @@ -26,7 +26,7 @@ float __nexttowardf(float x, long double y) { int32_t hx,ix; int64_t hy,iy; - u_int64_t ly; + uint64_t ly; GET_FLOAT_WORD(hx,x); GET_LDOUBLE_WORDS64(hy,ly,y); @@ -40,7 +40,7 @@ float __nexttowardf(float x, long double y) if((long double) x==y) return y; /* x=y, return y */ if(ix==0) { /* x == 0 */ float u; - SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/ + SET_FLOAT_WORD(x,(uint32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/ u = math_opt_barrier (x); u = u * u; math_force_eval (u); /* raise underflow flag */ diff --git a/sysdeps/ieee754/ldbl-128/s_nextupl.c b/sysdeps/ieee754/ldbl-128/s_nextupl.c index 85f43b4eb0..9e778def53 100644 --- a/sysdeps/ieee754/ldbl-128/s_nextupl.c +++ b/sysdeps/ieee754/ldbl-128/s_nextupl.c @@ -24,7 +24,7 @@ _Float128 __nextupl (_Float128 x) { int64_t hx, ix; - u_int64_t lx; + uint64_t lx; GET_LDOUBLE_WORDS64 (hx, lx, x); ix = hx & 0x7fffffffffffffffLL; diff --git a/sysdeps/ieee754/ldbl-128/s_remquol.c b/sysdeps/ieee754/ldbl-128/s_remquol.c index d360f82dba..fdecab58b6 100644 --- a/sysdeps/ieee754/ldbl-128/s_remquol.c +++ b/sysdeps/ieee754/ldbl-128/s_remquol.c @@ -30,7 +30,7 @@ _Float128 __remquol (_Float128 x, _Float128 y, int *quo) { int64_t hx,hy; - u_int64_t sx,lx,ly,qs; + uint64_t sx,lx,ly,qs; int cquo; GET_LDOUBLE_WORDS64 (hx, lx, x); diff --git a/sysdeps/ieee754/ldbl-128/s_rintl.c b/sysdeps/ieee754/ldbl-128/s_rintl.c index 410951626b..dff5c43733 100644 --- a/sysdeps/ieee754/ldbl-128/s_rintl.c +++ b/sysdeps/ieee754/ldbl-128/s_rintl.c @@ -39,10 +39,10 @@ TWO112[2]={ _Float128 __rintl(_Float128 x) { int64_t i0,j0,sx; - u_int64_t i1 __attribute__ ((unused)); + uint64_t i1 __attribute__ ((unused)); _Float128 w,t; GET_LDOUBLE_WORDS64(i0,i1,x); - sx = (((u_int64_t)i0)>>63); + sx = (((uint64_t)i0)>>63); j0 = ((i0>>48)&0x7fff)-0x3fff; if(j0<112) { if(j0<0) { diff --git a/sysdeps/ieee754/ldbl-128/s_roundl.c b/sysdeps/ieee754/ldbl-128/s_roundl.c index 078d9b9c45..18e8b65670 100644 --- a/sysdeps/ieee754/ldbl-128/s_roundl.c +++ b/sysdeps/ieee754/ldbl-128/s_roundl.c @@ -27,7 +27,7 @@ _Float128 __roundl (_Float128 x) { int32_t j0; - u_int64_t i1, i0; + uint64_t i1, i0; GET_LDOUBLE_WORDS64 (i0, i1, x); j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; @@ -42,7 +42,7 @@ __roundl (_Float128 x) } else { - u_int64_t i = 0x0000ffffffffffffLL >> j0; + uint64_t i = 0x0000ffffffffffffLL >> j0; if (((i0 & i) | i1) == 0) /* X is integral. */ return x; @@ -62,12 +62,12 @@ __roundl (_Float128 x) } else { - u_int64_t i = -1ULL >> (j0 - 48); + uint64_t i = -1ULL >> (j0 - 48); if ((i1 & i) == 0) /* X is integral. */ return x; - u_int64_t j = i1 + (1LL << (111 - j0)); + uint64_t j = i1 + (1LL << (111 - j0)); if (j < i1) i0 += 1; i1 = j; diff --git a/sysdeps/ieee754/ldbl-128/s_tanhl.c b/sysdeps/ieee754/ldbl-128/s_tanhl.c index 0db8f5f775..861b7f82d3 100644 --- a/sysdeps/ieee754/ldbl-128/s_tanhl.c +++ b/sysdeps/ieee754/ldbl-128/s_tanhl.c @@ -51,7 +51,7 @@ _Float128 __tanhl (_Float128 x) { _Float128 t, z; - u_int32_t jx, ix; + uint32_t jx, ix; ieee854_long_double_shape_type u; /* Words of |x|. */ diff --git a/sysdeps/ieee754/ldbl-128/s_truncl.c b/sysdeps/ieee754/ldbl-128/s_truncl.c index 6d1a11e7c4..b445a280e6 100644 --- a/sysdeps/ieee754/ldbl-128/s_truncl.c +++ b/sysdeps/ieee754/ldbl-128/s_truncl.c @@ -27,7 +27,7 @@ _Float128 __truncl (_Float128 x) { int32_t j0; - u_int64_t i0, i1, sx; + uint64_t i0, i1, sx; GET_LDOUBLE_WORDS64 (i0, i1, x); sx = i0 & 0x8000000000000000ULL; diff --git a/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c b/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c index 5284fd0fd5..fae7dbe888 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c @@ -119,7 +119,7 @@ __ieee754_fmodl (long double x, long double y) if(hz<0){hx = hx+hx+(lx>>63); lx = lx+lx;} else { if((hz|lz)==0) /* return sign(x)*0 */ - return Zero[(u_int64_t)sx>>63]; + return Zero[(uint64_t)sx>>63]; hx = hz+hz+(lz>>63); lx = lz+lz; } } @@ -128,7 +128,7 @@ __ieee754_fmodl (long double x, long double y) /* convert back to floating value and restore the sign */ if((hx|lx)==0) /* return sign(x)*0 */ - return Zero[(u_int64_t)sx>>63]; + return Zero[(uint64_t)sx>>63]; while(hx<0x0001000000000000LL) { /* normalize x */ hx = hx+hx+(lx>>63); lx = lx+lx; iy -= 1; @@ -139,7 +139,7 @@ __ieee754_fmodl (long double x, long double y) n = -1022 - iy; /* We know 1 <= N <= 52, and that there are no nonzero bits in places below 2^-1074. */ - lx = (lx >> n) | ((u_int64_t) hx << (64 - n)); + lx = (lx >> n) | ((uint64_t) hx << (64 - n)); hx >>= n; x = ldbl_insert_mantissa((sx>>63), -1023, hx, lx); x *= one; /* create necessary signal */ diff --git a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c index 81dbe42c79..7a4895342a 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c @@ -134,7 +134,7 @@ __ieee754_gammal_r (long double x, int *signgamp) *signgamp = 0; return 1.0 / x; } - if (hx < 0 && (u_int64_t) hx < 0xfff0000000000000ULL && __rintl (x) == x) + if (hx < 0 && (uint64_t) hx < 0xfff0000000000000ULL && __rintl (x) == x) { /* Return value for integer x < 0 is NaN with invalid exception. */ *signgamp = 0; diff --git a/sysdeps/ieee754/ldbl-128ibm/e_powl.c b/sysdeps/ieee754/ldbl-128ibm/e_powl.c index d6fbef6997..cdcc3cdbff 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_powl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_powl.c @@ -260,12 +260,12 @@ __ieee754_powl (long double x, long double y) } /* (x<0)**(non-int) is NaN */ - if (((((u_int32_t) hx >> 31) - 1) | yisint) == 0) + if (((((uint32_t) hx >> 31) - 1) | yisint) == 0) return (x - x) / (x - x); /* sgn (sign of result -ve**odd) = -1 else = 1 */ sgn = one; - if (((((u_int32_t) hx >> 31) - 1) | (yisint - 1)) == 0) + if (((((uint32_t) hx >> 31) - 1) | (yisint - 1)) == 0) sgn = -one; /* (-ve)**(odd int) */ /* |y| is huge. diff --git a/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c index 5aa2c1c007..5cbf8cdd83 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c @@ -200,7 +200,7 @@ int32_t __ieee754_rem_pio2l(long double x, long double *y) double tx[8]; int exp; int64_t n, ix, hx, ixd; - u_int64_t lxd; + uint64_t lxd; double xhi; xhi = ldbl_high (x); diff --git a/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c b/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c index 68b8fb3519..efa83bdab7 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_remainderl.c @@ -31,7 +31,7 @@ long double __ieee754_remainderl(long double x, long double p) { int64_t hx,hp; - u_int64_t sx,lx,lp; + uint64_t sx,lx,lp; long double p_half; double xhi, xlo, phi, plo; diff --git a/sysdeps/ieee754/ldbl-128ibm/k_cosl.c b/sysdeps/ieee754/ldbl-128ibm/k_cosl.c index 0010d6274a..6140463b2d 100644 --- a/sysdeps/ieee754/ldbl-128ibm/k_cosl.c +++ b/sysdeps/ieee754/ldbl-128ibm/k_cosl.c @@ -86,7 +86,7 @@ __kernel_cosl(long double x, long double y) xhi = ldbl_high (x); EXTRACT_WORDS64 (ix, xhi); - tix = ((u_int64_t)ix) >> 32; + tix = ((uint64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3fc30000) /* |x| < 0.1484375 */ { diff --git a/sysdeps/ieee754/ldbl-128ibm/k_sinl.c b/sysdeps/ieee754/ldbl-128ibm/k_sinl.c index 2138ccf13b..b8190ebddf 100644 --- a/sysdeps/ieee754/ldbl-128ibm/k_sinl.c +++ b/sysdeps/ieee754/ldbl-128ibm/k_sinl.c @@ -82,12 +82,12 @@ __kernel_sinl(long double x, long double y, int iy) { long double h, l, z, sin_l, cos_l_m1; int64_t ix; - u_int32_t tix, hix, index; + uint32_t tix, hix, index; double xhi, hhi; xhi = ldbl_high (x); EXTRACT_WORDS64 (ix, xhi); - tix = ((u_int64_t)ix) >> 32; + tix = ((uint64_t)ix) >> 32; tix &= ~0x80000000; /* tix = |x|'s high 32 bits */ if (tix < 0x3fc30000) /* |x| < 0.1484375 */ { diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c index c801c97065..54bf9b9cc1 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c @@ -28,7 +28,7 @@ static char rcsid[] = "$NetBSD: $"; long double __fabsl(long double x) { - u_int64_t hx, lx; + uint64_t hx, lx; double xhi, xlo; ldbl_unpack (x, &xhi, &xlo); diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c b/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c index 82d520bc7f..d06ba4c110 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c @@ -44,7 +44,7 @@ int ___fpclassifyl (long double x) { - u_int64_t hx, lx; + uint64_t hx, lx; int retval = FP_NORMAL; double xhi, xlo; diff --git a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c index 260cc3e33c..1dc6c40e9c 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c @@ -36,7 +36,7 @@ static const long double one = 1.0; long double __modfl(long double x, long double *iptr) { int64_t i0,i1,j0; - u_int64_t i; + uint64_t i; double xhi, xlo; ldbl_unpack (x, &xhi, &xlo); diff --git a/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c b/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c index 7c5d1cc112..fc49247038 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c @@ -43,7 +43,7 @@ float __nexttowardf(float x, long double y) if((long double) x==y) return y; /* x=y, return y */ if(ix==0) { /* x == 0 */ float u; - SET_FLOAT_WORD(x,(u_int32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/ + SET_FLOAT_WORD(x,(uint32_t)((hy>>32)&0x80000000)|1);/* return +-minsub*/ u = math_opt_barrier (x); u = u * u; math_force_eval (u); /* raise underflow flag */ diff --git a/sysdeps/ieee754/ldbl-128ibm/s_remquol.c b/sysdeps/ieee754/ldbl-128ibm/s_remquol.c index 9b6ec09d41..6594c5de70 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_remquol.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_remquol.c @@ -31,7 +31,7 @@ long double __remquol (long double x, long double y, int *quo) { int64_t hx,hy; - u_int64_t sx,lx,ly,qs; + uint64_t sx,lx,ly,qs; int cquo; double xhi, xlo, yhi, ylo; diff --git a/sysdeps/ieee754/ldbl-96/e_acoshl.c b/sysdeps/ieee754/ldbl-96/e_acoshl.c index cf9a6db0ef..381deb56a6 100644 --- a/sysdeps/ieee754/ldbl-96/e_acoshl.c +++ b/sysdeps/ieee754/ldbl-96/e_acoshl.c @@ -39,7 +39,7 @@ long double __ieee754_acoshl(long double x) { long double t; - u_int32_t se,i0,i1; + uint32_t se,i0,i1; GET_LDOUBLE_WORDS(se,i0,i1,x); if(se<0x3fff || se & 0x8000) { /* x < 1 */ return (x-x)/(x-x); diff --git a/sysdeps/ieee754/ldbl-96/e_asinl.c b/sysdeps/ieee754/ldbl-96/e_asinl.c index f52b931459..71ce0e8791 100644 --- a/sysdeps/ieee754/ldbl-96/e_asinl.c +++ b/sysdeps/ieee754/ldbl-96/e_asinl.c @@ -96,7 +96,7 @@ __ieee754_asinl (long double x) { long double t, w, p, q, c, r, s; int32_t ix; - u_int32_t se, i0, i1, k; + uint32_t se, i0, i1, k; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; diff --git a/sysdeps/ieee754/ldbl-96/e_atanhl.c b/sysdeps/ieee754/ldbl-96/e_atanhl.c index b99a83c6ee..af3487f661 100644 --- a/sysdeps/ieee754/ldbl-96/e_atanhl.c +++ b/sysdeps/ieee754/ldbl-96/e_atanhl.c @@ -45,7 +45,7 @@ __ieee754_atanhl(long double x) { long double t; int32_t ix; - u_int32_t se,i0,i1; + uint32_t se,i0,i1; GET_LDOUBLE_WORDS(se,i0,i1,x); ix = se&0x7fff; if ((ix+((((i0&0x7fffffff)|i1)|(-((i0&0x7fffffff)|i1)))>>31))>0x3fff) diff --git a/sysdeps/ieee754/ldbl-96/e_coshl.c b/sysdeps/ieee754/ldbl-96/e_coshl.c index dd22cae363..1edf2c1542 100644 --- a/sysdeps/ieee754/ldbl-96/e_coshl.c +++ b/sysdeps/ieee754/ldbl-96/e_coshl.c @@ -44,7 +44,7 @@ __ieee754_coshl (long double x) { long double t,w; int32_t ex; - u_int32_t mx,lx; + uint32_t mx,lx; /* High word of |x|. */ GET_LDOUBLE_WORDS(ex,mx,lx,x); diff --git a/sysdeps/ieee754/ldbl-96/e_gammal_r.c b/sysdeps/ieee754/ldbl-96/e_gammal_r.c index 7e42cc1161..853f6a10be 100644 --- a/sysdeps/ieee754/ldbl-96/e_gammal_r.c +++ b/sysdeps/ieee754/ldbl-96/e_gammal_r.c @@ -115,7 +115,7 @@ gammal_positive (long double x, int *exp2_adj) long double __ieee754_gammal_r (long double x, int *signgamp) { - u_int32_t es, hx, lx; + uint32_t es, hx, lx; long double ret; GET_LDOUBLE_WORDS (es, hx, lx, x); diff --git a/sysdeps/ieee754/ldbl-96/e_hypotl.c b/sysdeps/ieee754/ldbl-96/e_hypotl.c index 6b55b6d8ee..337908f845 100644 --- a/sysdeps/ieee754/ldbl-96/e_hypotl.c +++ b/sysdeps/ieee754/ldbl-96/e_hypotl.c @@ -52,7 +52,7 @@ long double __ieee754_hypotl(long double x, long double y) { long double a,b,t1,t2,y1,y2,w; - u_int32_t j,k,ea,eb; + uint32_t j,k,ea,eb; GET_LDOUBLE_EXP(ea,x); ea &= 0x7fff; @@ -65,8 +65,8 @@ long double __ieee754_hypotl(long double x, long double y) k=0; if(__builtin_expect(ea > 0x5f3f,0)) { /* a>2**8000 */ if(ea == 0x7fff) { /* Inf or NaN */ - u_int32_t exp __attribute__ ((unused)); - u_int32_t high,low; + uint32_t exp __attribute__ ((unused)); + uint32_t high,low; w = a+b; /* for sNaN */ if (issignaling (a) || issignaling (b)) return w; @@ -83,8 +83,8 @@ long double __ieee754_hypotl(long double x, long double y) } if(__builtin_expect(eb < 0x20bf, 0)) { /* b < 2**-8000 */ if(eb == 0) { /* subnormal b or 0 */ - u_int32_t exp __attribute__ ((unused)); - u_int32_t high,low; + uint32_t exp __attribute__ ((unused)); + uint32_t high,low; GET_LDOUBLE_WORDS(exp,high,low,b); if((high|low)==0) return a; SET_LDOUBLE_WORDS(t1, 0x7ffd, 0x80000000, 0); /* t1=2^16382 */ @@ -113,13 +113,13 @@ long double __ieee754_hypotl(long double x, long double y) /* medium size a and b */ w = a-b; if (w>b) { - u_int32_t high; + uint32_t high; GET_LDOUBLE_MSW(high,a); SET_LDOUBLE_WORDS(t1,ea,high,0); t2 = a-t1; w = __ieee754_sqrtl(t1*t1-(b*(-b)-t2*(a+t1))); } else { - u_int32_t high; + uint32_t high; GET_LDOUBLE_MSW(high,b); a = a+a; SET_LDOUBLE_WORDS(y1,eb,high,0); @@ -130,7 +130,7 @@ long double __ieee754_hypotl(long double x, long double y) w = __ieee754_sqrtl(t1*y1-(w*(-w)-(t1*y2+t2*b))); } if(k!=0) { - u_int32_t exp; + uint32_t exp; t1 = 1.0; GET_LDOUBLE_EXP(exp,t1); SET_LDOUBLE_EXP(t1,exp+k); diff --git a/sysdeps/ieee754/ldbl-96/e_j0l.c b/sysdeps/ieee754/ldbl-96/e_j0l.c index a536054cde..4339d27c70 100644 --- a/sysdeps/ieee754/ldbl-96/e_j0l.c +++ b/sysdeps/ieee754/ldbl-96/e_j0l.c @@ -108,7 +108,7 @@ __ieee754_j0l (long double x) { long double z, s, c, ss, cc, r, u, v; int32_t ix; - u_int32_t se; + uint32_t se; GET_LDOUBLE_EXP (se, x); ix = se & 0x7fff; @@ -194,7 +194,7 @@ __ieee754_y0l (long double x) { long double z, s, c, ss, cc, u, v; int32_t ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; @@ -352,7 +352,7 @@ pzero (long double x) const long double *p, *q; long double z, r, s; int32_t ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; @@ -490,7 +490,7 @@ qzero (long double x) const long double *p, *q; long double s, r, z; int32_t ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; diff --git a/sysdeps/ieee754/ldbl-96/e_j1l.c b/sysdeps/ieee754/ldbl-96/e_j1l.c index e8a7349cf4..a8a9902db0 100644 --- a/sysdeps/ieee754/ldbl-96/e_j1l.c +++ b/sysdeps/ieee754/ldbl-96/e_j1l.c @@ -112,7 +112,7 @@ __ieee754_j1l (long double x) { long double z, c, r, s, ss, cc, u, v, y; int32_t ix; - u_int32_t se; + uint32_t se; GET_LDOUBLE_EXP (se, x); ix = se & 0x7fff; @@ -195,7 +195,7 @@ __ieee754_y1l (long double x) { long double z, s, c, ss, cc, u, v; int32_t ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; @@ -362,7 +362,7 @@ pone (long double x) const long double *p, *q; long double z, r, s; int32_t ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; @@ -509,7 +509,7 @@ qone (long double x) const long double *p, *q; static long double s, r, z; int32_t ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; diff --git a/sysdeps/ieee754/ldbl-96/e_jnl.c b/sysdeps/ieee754/ldbl-96/e_jnl.c index 92f96921a7..d801ec619f 100644 --- a/sysdeps/ieee754/ldbl-96/e_jnl.c +++ b/sysdeps/ieee754/ldbl-96/e_jnl.c @@ -69,7 +69,7 @@ static const long double zero = 0.0L; long double __ieee754_jnl (int n, long double x) { - u_int32_t se, i0, i1; + uint32_t se, i0, i1; int32_t i, ix, sgn; long double a, b, temp, di, ret; long double z, w; @@ -302,7 +302,7 @@ strong_alias (__ieee754_jnl, __jnl_finite) long double __ieee754_ynl (int n, long double x) { - u_int32_t se, i0, i1; + uint32_t se, i0, i1; int32_t i, ix; int32_t sign; long double a, b, temp, ret; diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c index 4ecd63045f..200421f5cc 100644 --- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c +++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c @@ -208,7 +208,7 @@ sin_pi (long double x) { long double y, z; int n, ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; @@ -275,7 +275,7 @@ __ieee754_lgammal_r (long double x, int *signgamp) { long double t, y, z, nadj, p, p1, p2, q, r, w; int i, ix; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; *signgamp = 1; GET_LDOUBLE_WORDS (se, i0, i1, x); diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c index 43c5d91f0b..ba1d4b65d3 100644 --- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c @@ -186,7 +186,7 @@ __ieee754_rem_pio2l (long double x, long double *y) { double tx[3], ty[3]; int32_t se, j0; - u_int32_t i0, i1; + uint32_t i0, i1; int sx; int n, exp; diff --git a/sysdeps/ieee754/ldbl-96/e_sinhl.c b/sysdeps/ieee754/ldbl-96/e_sinhl.c index 095b142621..64f7c91333 100644 --- a/sysdeps/ieee754/ldbl-96/e_sinhl.c +++ b/sysdeps/ieee754/ldbl-96/e_sinhl.c @@ -46,7 +46,7 @@ long double __ieee754_sinhl(long double x) { long double t,w,h; - u_int32_t jx,ix,i0,i1; + uint32_t jx,ix,i0,i1; /* Words of |x|. */ GET_LDOUBLE_WORDS(jx,i0,i1,x); diff --git a/sysdeps/ieee754/ldbl-96/s_copysignl.c b/sysdeps/ieee754/ldbl-96/s_copysignl.c index b1c442452f..5cd3fbf193 100644 --- a/sysdeps/ieee754/ldbl-96/s_copysignl.c +++ b/sysdeps/ieee754/ldbl-96/s_copysignl.c @@ -29,7 +29,7 @@ static char rcsid[] = "$NetBSD: $"; long double __copysignl(long double x, long double y) { - u_int32_t es1,es2; + uint32_t es1,es2; GET_LDOUBLE_EXP(es1,x); GET_LDOUBLE_EXP(es2,y); SET_LDOUBLE_EXP(x,(es1&0x7fff)|(es2&0x8000)); diff --git a/sysdeps/ieee754/ldbl-96/s_erfl.c b/sysdeps/ieee754/ldbl-96/s_erfl.c index d00adb1000..9b6cd3fad0 100644 --- a/sysdeps/ieee754/ldbl-96/s_erfl.c +++ b/sysdeps/ieee754/ldbl-96/s_erfl.c @@ -254,7 +254,7 @@ __erfl (long double x) { long double R, S, P, Q, s, y, z, r; int32_t ix, i; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; @@ -341,7 +341,7 @@ __erfcl (long double x) { int32_t hx, ix; long double R, S, P, Q, s, y, z, r; - u_int32_t se, i0, i1; + uint32_t se, i0, i1; GET_LDOUBLE_WORDS (se, i0, i1, x); ix = se & 0x7fff; diff --git a/sysdeps/ieee754/ldbl-96/s_frexpl.c b/sysdeps/ieee754/ldbl-96/s_frexpl.c index 799880f373..488b236ad6 100644 --- a/sysdeps/ieee754/ldbl-96/s_frexpl.c +++ b/sysdeps/ieee754/ldbl-96/s_frexpl.c @@ -42,7 +42,7 @@ two65 = 3.68934881474191032320e+19L; /* 0x4040, 0x80000000, 0x00000000 */ long double __frexpl(long double x, int *eptr) { - u_int32_t se, hx, ix, lx; + uint32_t se, hx, ix, lx; GET_LDOUBLE_WORDS(se,hx,lx,x); ix = 0x7fff&se; *eptr = 0; diff --git a/sysdeps/ieee754/ldbl-96/s_issignalingl.c b/sysdeps/ieee754/ldbl-96/s_issignalingl.c index f659bb7b35..aeda7fdc99 100644 --- a/sysdeps/ieee754/ldbl-96/s_issignalingl.c +++ b/sysdeps/ieee754/ldbl-96/s_issignalingl.c @@ -23,7 +23,7 @@ int __issignalingl (long double x) { - u_int32_t exi, hxi, lxi; + uint32_t exi, hxi, lxi; GET_LDOUBLE_WORDS (exi, hxi, lxi, x); #if HIGH_ORDER_BIT_IS_SET_FOR_SNAN # error not implemented diff --git a/sysdeps/ieee754/ldbl-96/s_llrintl.c b/sysdeps/ieee754/ldbl-96/s_llrintl.c index 53d33c3999..dc115124ac 100644 --- a/sysdeps/ieee754/ldbl-96/s_llrintl.c +++ b/sysdeps/ieee754/ldbl-96/s_llrintl.c @@ -35,7 +35,7 @@ long long int __llrintl (long double x) { int32_t se,j0; - u_int32_t i0, i1; + uint32_t i0, i1; long long int result; long double w; long double t; diff --git a/sysdeps/ieee754/ldbl-96/s_llroundl.c b/sysdeps/ieee754/ldbl-96/s_llroundl.c index f113fabd1a..a64768556c 100644 --- a/sysdeps/ieee754/ldbl-96/s_llroundl.c +++ b/sysdeps/ieee754/ldbl-96/s_llroundl.c @@ -28,7 +28,7 @@ long long int __llroundl (long double x) { int32_t j0; - u_int32_t se, i1, i0; + uint32_t se, i1, i0; long long int result; int sign; @@ -42,7 +42,7 @@ __llroundl (long double x) return j0 < -1 ? 0 : sign; else { - u_int32_t j = i0 + (0x40000000 >> j0); + uint32_t j = i0 + (0x40000000 >> j0); if (j < i0) { j >>= 1; @@ -59,7 +59,7 @@ __llroundl (long double x) result = (((long long int) i0 << 32) | i1) << (j0 - 63); else { - u_int32_t j = i1 + (0x80000000 >> (j0 - 31)); + uint32_t j = i1 + (0x80000000 >> (j0 - 31)); result = (long long int) i0; if (j < i1) diff --git a/sysdeps/ieee754/ldbl-96/s_lrintl.c b/sysdeps/ieee754/ldbl-96/s_lrintl.c index 02dafe67f3..ae53a19e93 100644 --- a/sysdeps/ieee754/ldbl-96/s_lrintl.c +++ b/sysdeps/ieee754/ldbl-96/s_lrintl.c @@ -35,7 +35,7 @@ long int __lrintl (long double x) { int32_t se,j0; - u_int32_t i0, i1; + uint32_t i0, i1; long int result; long double w; long double t; diff --git a/sysdeps/ieee754/ldbl-96/s_lroundl.c b/sysdeps/ieee754/ldbl-96/s_lroundl.c index 7f418e6142..b8288a9f28 100644 --- a/sysdeps/ieee754/ldbl-96/s_lroundl.c +++ b/sysdeps/ieee754/ldbl-96/s_lroundl.c @@ -28,7 +28,7 @@ long int __lroundl (long double x) { int32_t j0; - u_int32_t se, i1, i0; + uint32_t se, i1, i0; long int result; int sign; @@ -42,7 +42,7 @@ __lroundl (long double x) return j0 < -1 ? 0 : sign; else { - u_int32_t j = i0 + (0x40000000 >> j0); + uint32_t j = i0 + (0x40000000 >> j0); if (j < i0) { j >>= 1; @@ -66,7 +66,7 @@ __lroundl (long double x) result = ((long int) i0 << (j0 - 31)) | (i1 << (j0 - 63)); else { - u_int32_t j = i1 + (0x80000000 >> (j0 - 31)); + uint32_t j = i1 + (0x80000000 >> (j0 - 31)); unsigned long int ures = i0; if (j < i1) diff --git a/sysdeps/ieee754/ldbl-96/s_modfl.c b/sysdeps/ieee754/ldbl-96/s_modfl.c index e9401d0f5d..72cea62b0d 100644 --- a/sysdeps/ieee754/ldbl-96/s_modfl.c +++ b/sysdeps/ieee754/ldbl-96/s_modfl.c @@ -33,7 +33,7 @@ long double __modfl(long double x, long double *iptr) { int32_t i0,i1,j0; - u_int32_t i,se; + uint32_t i,se; GET_LDOUBLE_WORDS(se,i0,i1,x); j0 = (se&0x7fff)-0x3fff; /* exponent of x */ if(j0<32) { /* integer part in high x */ @@ -59,7 +59,7 @@ __modfl(long double x, long double *iptr) SET_LDOUBLE_WORDS(x,se&0x8000,0,0); /* return +-0 */ return x; } else { /* fraction part in low x */ - i = ((u_int32_t)(0x7fffffff))>>(j0-32); + i = ((uint32_t)(0x7fffffff))>>(j0-32); if((i1&i)==0) { /* x is integral */ *iptr = x; SET_LDOUBLE_WORDS(x,se&0x8000,0,0); /* return +-0 */ diff --git a/sysdeps/ieee754/ldbl-96/s_nexttoward.c b/sysdeps/ieee754/ldbl-96/s_nexttoward.c index 3d0382eac9..ed28672afa 100644 --- a/sysdeps/ieee754/ldbl-96/s_nexttoward.c +++ b/sysdeps/ieee754/ldbl-96/s_nexttoward.c @@ -33,7 +33,7 @@ static char rcsid[] = "$NetBSD: $"; double __nexttoward(double x, long double y) { int32_t hx,ix,iy; - u_int32_t lx,hy,ly,esy; + uint32_t lx,hy,ly,esy; EXTRACT_WORDS(hx,lx,x); GET_LDOUBLE_WORDS(esy,hy,ly,y); diff --git a/sysdeps/ieee754/ldbl-96/s_nexttowardf.c b/sysdeps/ieee754/ldbl-96/s_nexttowardf.c index ae7538942f..79fd65623d 100644 --- a/sysdeps/ieee754/ldbl-96/s_nexttowardf.c +++ b/sysdeps/ieee754/ldbl-96/s_nexttowardf.c @@ -25,7 +25,7 @@ static char rcsid[] = "$NetBSD: $"; float __nexttowardf(float x, long double y) { int32_t hx,ix,iy; - u_int32_t hy,ly,esy; + uint32_t hy,ly,esy; GET_FLOAT_WORD(hx,x); GET_LDOUBLE_WORDS(esy,hy,ly,y); diff --git a/sysdeps/ieee754/ldbl-96/s_nextupl.c b/sysdeps/ieee754/ldbl-96/s_nextupl.c index aa66eaf106..beea0475a8 100644 --- a/sysdeps/ieee754/ldbl-96/s_nextupl.c +++ b/sysdeps/ieee754/ldbl-96/s_nextupl.c @@ -23,8 +23,8 @@ long double __nextupl (long double x) { - u_int32_t hx, ix; - u_int32_t lx; + uint32_t hx, ix; + uint32_t lx; int32_t esx; GET_LDOUBLE_WORDS (esx, hx, lx, x); diff --git a/sysdeps/ieee754/ldbl-96/s_remquol.c b/sysdeps/ieee754/ldbl-96/s_remquol.c index ee9a6a7d2a..bd1aaf73ba 100644 --- a/sysdeps/ieee754/ldbl-96/s_remquol.c +++ b/sysdeps/ieee754/ldbl-96/s_remquol.c @@ -29,7 +29,7 @@ long double __remquol (long double x, long double p, int *quo) { int32_t ex,ep,hx,hp; - u_int32_t sx,lx,lp; + uint32_t sx,lx,lp; int cquo,qs; GET_LDOUBLE_WORDS (ex, hx, lx, x); diff --git a/sysdeps/ieee754/ldbl-96/s_roundl.c b/sysdeps/ieee754/ldbl-96/s_roundl.c index d8918d2874..af7215a663 100644 --- a/sysdeps/ieee754/ldbl-96/s_roundl.c +++ b/sysdeps/ieee754/ldbl-96/s_roundl.c @@ -26,7 +26,7 @@ long double __roundl (long double x) { int32_t j0; - u_int32_t se, i1, i0; + uint32_t se, i1, i0; GET_LDOUBLE_WORDS (se, i0, i1, x); j0 = (se & 0x7fff) - 0x3fff; @@ -44,12 +44,12 @@ __roundl (long double x) } else { - u_int32_t i = 0x7fffffff >> j0; + uint32_t i = 0x7fffffff >> j0; if (((i0 & i) | i1) == 0) /* X is integral. */ return x; - u_int32_t j = i0 + (0x40000000 >> j0); + uint32_t j = i0 + (0x40000000 >> j0); if (j < i0) se += 1; i0 = (j & ~i) | 0x80000000; @@ -66,15 +66,15 @@ __roundl (long double x) } else { - u_int32_t i = 0xffffffff >> (j0 - 31); + uint32_t i = 0xffffffff >> (j0 - 31); if ((i1 & i) == 0) /* X is integral. */ return x; - u_int32_t j = i1 + (1 << (62 - j0)); + uint32_t j = i1 + (1 << (62 - j0)); if (j < i1) { - u_int32_t k = i0 + 1; + uint32_t k = i0 + 1; if (k < i0) { se += 1; diff --git a/sysdeps/ieee754/ldbl-96/s_tanhl.c b/sysdeps/ieee754/ldbl-96/s_tanhl.c index 38edf9f75e..10c3449c41 100644 --- a/sysdeps/ieee754/ldbl-96/s_tanhl.c +++ b/sysdeps/ieee754/ldbl-96/s_tanhl.c @@ -52,7 +52,7 @@ long double __tanhl(long double x) { long double t,z; int32_t se; - u_int32_t j0,j1,ix; + uint32_t j0,j1,ix; /* High word of |x|. */ GET_LDOUBLE_WORDS(se,j0,j1,x); diff --git a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c index 07e9375b78..7197962b68 100644 --- a/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c +++ b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c @@ -31,7 +31,7 @@ float __nldbl_nexttowardf(float x, double y); float __nldbl_nexttowardf(float x, double y) { int32_t hx,hy,ix,iy; - u_int32_t ly; + uint32_t ly; GET_FLOAT_WORD(hx,x); EXTRACT_WORDS(hy,ly,y); @@ -44,7 +44,7 @@ float __nldbl_nexttowardf(float x, double y) if((double) x==y) return y; /* x=y, return y */ if(ix==0) { /* x == 0 */ float u; - SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/ + SET_FLOAT_WORD(x,(uint32_t)(hy&0x80000000)|1);/* return +-minsub*/ u = math_opt_barrier (x); u = u * u; math_force_eval (u); /* raise underflow flag */ |