--- uClibc-0.9.27/libm/Makefile.mps 2005-03-11 03:11:03 +0100
+++ uClibc-0.9.27/libm/Makefile 2005-03-11 03:41:14 +0100
@@ -54,25 +54,27 @@
ifeq ($(strip $(DO_C99_MATH)),y)
CSRC = e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c\
e_exp.c e_fmod.c e_gamma.c e_gamma_r.c e_hypot.c e_j0.c\
- e_j1.c e_jn.c e_lgamma.c e_lgamma_r.c e_log.c e_log10.c\
+ e_j1.c e_jn.c e_lgamma.c e_lgamma_r.c e_log.c e_log2.c e_log10.c\
e_pow.c e_remainder.c e_rem_pio2.c e_scalb.c e_sinh.c\
e_sqrt.c k_cos.c k_rem_pio2.c k_sin.c k_standard.c k_tan.c\
s_asinh.c s_atan.c s_cbrt.c s_ceil.c s_copysign.c s_cos.c\
- s_erf.c s_expm1.c s_fabs.c s_finite.c s_floor.c s_frexp.c\
- s_ilogb.c s_ldexp.c s_lib_version.c s_log1p.c s_logb.c\
- s_matherr.c s_modf.c s_nextafter.c s_rint.c s_scalbn.c\
- s_signgam.c s_significand.c s_sin.c s_tan.c s_tanh.c\
+ s_erf.c s_expm1.c s_fabs.c s_fdim.c s_fma.c s_fmax.c s_fmin.c\
+ s_finite.c s_floor.c s_frexp.c s_ilogb.c s_ldexp.c\
+ s_lib_version.c s_llrint.c s_llround.c s_log1p.c s_logb.c\
+ s_lrint.c s_lround.c s_matherr.c s_modf.c s_nextafter.c\
+ s_remquo.c s_rint.c s_round.c s_scalbln.c s_scalbn.c\
+ s_signgam.c s_significand.c s_sin.c s_tan.c s_tanh.c s_trunc.c\
w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c w_cabs.c\
w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c\
w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c\
- w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c\
- w_sqrt.c fpmacros.c nan.c s_ceilf.c s_floorf.c
+ w_log.c w_log2.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c\
+ w_sqrt.c w_tgamma.c fpmacros.c nan.c
FL_MOBJ = acosf.o acoshf.o asinf.o asinhf.o atan2f.o atanf.o atanhf.o cbrtf.o \
ceilf.o copysignf.o cosf.o coshf.o erfcf.o erff.o exp2f.o expf.o \
expm1f.o fabsf.o fdimf.o floorf.o fmaf.o fmaxf.o fminf.o fmodf.o \
- frexpf.o hypotf.o ilogbf.o ldexpf.o lgammaf.o log10f.o log1pf.o \
+ frexpf.o gammaf.o hypotf.o ilogbf.o ldexpf.o lgammaf.o log10f.o log1pf.o \
log2f.o logbf.o logf.o lrintf.o lroundf.o modff.o nearbyintf.o \
- nextafterf.o powf.o remainderf.o remquof.o rintf.o roundf.o \
+ nextafterf.o powf.o remainderf.o remquof.o rem_pio2f.o rintf.o roundf.o \
scalblnf.o scalbnf.o sinf.o sinhf.o sqrtf.o tanf.o tanhf.o \
tgammaf.o truncf.o
else
--- uClibc-0.9.27/libm/float_wrappers.c.mps 2005-03-11 03:41:21 +0100
+++ uClibc-0.9.27/libm/float_wrappers.c 2005-03-11 04:10:41 +0100
@@ -235,14 +235,12 @@
#endif
-#if 0
#ifdef L_fdimf
float fdimf (float x, float y)
{
return (float) fdim( (double)x, (double)y );
}
#endif
-#endif
#ifdef L_floorf
@@ -253,7 +251,6 @@
#endif
-#if 0
#ifdef L_fmaf
float fmaf (float x, float y, float z)
{
@@ -276,7 +273,6 @@
return (float) fmin( (double)x, (double)y );
}
#endif
-#endif
#ifdef L_fmodf
@@ -327,7 +323,6 @@
#endif
-#if 0
#ifdef L_llrintf
long long llrintf (float x)
{
@@ -342,7 +337,6 @@
return (float) llround( (double)x );
}
#endif
-#endif
#ifdef L_log10f
float log10f (float x)
@@ -360,14 +354,12 @@
#endif
-#if 0
#ifdef L_log2f
float log2f (float x)
{
return (float) log2( (double)x );
}
#endif
-#endif
#ifdef L_logbf
@@ -386,7 +378,6 @@
#endif
-#if 0
#ifdef L_lrintf
long lrintf (float x)
{
@@ -401,7 +392,6 @@
return (float) lround( (double)x );
}
#endif
-#endif
#ifdef L_modff
@@ -459,13 +449,19 @@
#endif
-#if 0
#ifdef L_remquof
float remquof (float x, float y, int *quo)
{
return (float) remquo( (double)x, (double)y, quo );
}
#endif
+
+
+#if 0 /* should this be __ieee754_rem_pio2f */
+float rem_pio2f (float x, float *y)
+{
+ return (float) rem_pio2( (double)x, (double)y );
+}
#endif
@@ -477,7 +473,6 @@
#endif
-#if 0
#ifdef L_roundf
float roundf (float x)
{
@@ -492,7 +487,6 @@
return (float) scalbln( (double)x, exp );
}
#endif
-#endif
#ifdef L_scalbnf
@@ -543,7 +537,6 @@
#endif
-#if 0
#ifdef L_tgammaf
float tgammaf (float x)
{
@@ -558,6 +551,4 @@
return (float) trunc( (double)x );
}
#endif
-#endif
-
--- uClibc-0.9.27/libm/s_ceilf.c.mps 2005-03-11 02:58:02 +0100
+++ uClibc-0.9.27/libm/s_ceilf.c 2005-03-11 03:44:39 +0100
@@ -1,62 +0,0 @@
-/* s_ceilf.c -- float version of s_ceil.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_ceilf.c,v 1.4 1995/05/10 20:46:55 jtc Exp $";
-#endif
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __STDC__
-static const float huge = 1.0e30;
-#else
-static float huge = 1.0e30;
-#endif
-
-#ifdef __STDC__
- float __ceilf(float x)
-#else
- float __ceilf(x)
- float x;
-#endif
-{
- int32_t i0,j0;
- u_int32_t i;
-
- GET_FLOAT_WORD(i0,x);
- j0 = ((i0>>23)&0xff)-0x7f;
- if(j0<23) {
- if(j0<0) { /* raise inexact if x != 0 */
- if(huge+x>(float)0.0) {/* return 0*sign(x) if |x|<1 */
- if(i0<0) {i0=0x80000000;}
- else if(i0!=0) { i0=0x3f800000;}
- }
- } else {
- i = (0x007fffff)>>j0;
- if((i0&i)==0) return x; /* x is integral */
- if(huge+x>(float)0.0) { /* raise inexact flag */
- if(i0>0) i0 += (0x00800000)>>j0;
- i0 &= (~i);
- }
- }
- } else {
- if(j0==0x80) return x+x; /* inf or NaN */
- else return x; /* x is integral */
- }
- SET_FLOAT_WORD(x,i0);
- return x;
-}
-weak_alias (__ceilf, ceilf)
--- uClibc-0.9.27/libm/s_floorf.c.mps 2005-03-11 02:58:02 +0100
+++ uClibc-0.9.27/libm/s_floorf.c 2005-03-11 03:44:33 +0100
@@ -1,71 +0,0 @@
-/* s_floorf.c -- float version of s_floor.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: s_floorf.c,v 1.4 1995/05/10 20:47:22 jtc Exp $";
-#endif
-
-/*
- * floorf(x)
- * Return x rounded toward -inf to integral value
- * Method:
- * Bit twiddling.
- * Exception:
- * Inexact flag raised if x not equal to floorf(x).
- */
-
-#include "math.h"
-#include "math_private.h"
-
-#ifdef __STDC__
-static const float huge = 1.0e30;
-#else
-static float huge = 1.0e30;
-#endif
-
-#ifdef __STDC__
- float __floorf(float x)
-#else
- float __floorf(x)
- float x;
-#endif
-{
- int32_t i0,j0;
- u_int32_t i;
- GET_FLOAT_WORD(i0,x);
- j0 = ((i0>>23)&0xff)-0x7f;
- if(j0<23) {
- if(j0<0) { /* raise inexact if x != 0 */
- if(huge+x>(float)0.0) {/* return 0*sign(x) if |x|<1 */
- if(i0>=0) {i0=0;}
- else if((i0&0x7fffffff)!=0)
- { i0=0xbf800000;}
- }
- } else {
- i = (0x007fffff)>>j0;
- if((i0&i)==0) return x; /* x is integral */
- if(huge+x>(float)0.0) { /* raise inexact flag */
- if(i0<0) i0 += (0x00800000)>>j0;
- i0 &= (~i);
- }
- }
- } else {
- if(j0==0x80) return x+x; /* inf or NaN */
- else return x; /* x is integral */
- }
- SET_FLOAT_WORD(x,i0);
- return x;
-}
-weak_alias (__floorf, floorf)
