svn commit: branches/uClibc-nptl/libm: powerpc

[sjhill at uclibc.org]

Author: sjhill
Date: 2007-01-20 12:11:37 -0800 (Sat, 20 Jan 2007)
New Revision: 17405

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libm/Makefile.in
   branches/uClibc-nptl/libm/float_wrappers.c
   branches/uClibc-nptl/libm/powerpc/


Changeset:
Modified: branches/uClibc-nptl/libm/Makefile.in
===================================================================
--- branches/uClibc-nptl/libm/Makefile.in	2007-01-20 20:09:04 UTC (rev 17404)
+++ branches/uClibc-nptl/libm/Makefile.in	2007-01-20 20:11:37 UTC (rev 17405)
@@ -52,7 +52,7 @@
 	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_lround.c s_llround.c \
+	s_ilogb.c s_ldexp.c s_lib_version.c s_lrint.c s_lround.c s_llround.c \
 	s_log1p.c s_logb.c s_matherr.c s_modf.c s_nextafter.c s_round.c \
 	s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c s_tan.c \
 	s_tanh.c w_acos.c w_acosh.c w_asin.c w_atan2.c w_atanh.c w_cabs.c \

Modified: branches/uClibc-nptl/libm/float_wrappers.c
===================================================================
--- branches/uClibc-nptl/libm/float_wrappers.c	2007-01-20 20:09:04 UTC (rev 17404)
+++ branches/uClibc-nptl/libm/float_wrappers.c	2007-01-20 20:11:37 UTC (rev 17405)
@@ -21,7 +21,6 @@
 #undef L_fminf         /*float       fminf(float, float);*/
 #undef L_llrintf       /*long long   llrintf(float);*/
 #undef L_log2f         /*float       log2f(float);*/
-#undef L_lrintf        /*long        lrintf(float);*/
 #undef L_nearbyintf    /*float       nearbyintf(float);*/
 #undef L_nexttowardf   /*float       nexttowardf(float, long double);*/
 #undef L_remquof       /*float       remquof(float, float, int *);*/
@@ -314,7 +313,7 @@
 libm_hidden_proto(ilogb)
 int ilogbf (float x)
 {
-	return (float) ilogb( (double)x );
+	return (int) ilogb( (double)x );
 }
 #endif
 
@@ -341,7 +340,7 @@
 libm_hidden_proto(llrint)
 long long llrintf (float x)
 {
-	return (float) llrint( (double)x );
+	return (long long) llrint( (double)x );
 }
 #endif
 
@@ -350,7 +349,7 @@
 libm_hidden_proto(llround)
 long long llroundf (float x)
 {
-	return (float) llround( (double)x );
+	return (long long) llround( (double)x );
 }
 #endif
 
@@ -404,7 +403,7 @@
 libm_hidden_proto(lrint)
 long lrintf (float x)
 {
-	return (float) lrint( (double)x );
+	return (long) lrint( (double)x );
 }
 #endif
 
@@ -413,7 +412,7 @@
 libm_hidden_proto(lround)
 long lroundf (float x)
 {
-	return (float) lround( (double)x );
+	return (long) lround( (double)x );
 }
 #endif
 


Property changes on: branches/uClibc-nptl/libm/powerpc
___________________________________________________________________
Name: svn:ignore
   + *.os