Merge from trunk.

1 files changed, 5 insertions, 6 deletions

diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c
index 298453d31..ab424d300 100644
--- a/libm/float_wrappers.c
+++ b/libm/float_wrappers.c
@@ -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 @@ float hypotf (float x, float y)
 libm_hidden_proto(ilogb)
 int ilogbf (float x)
 {
-	return (float) ilogb( (double)x );
+	return (int) ilogb( (double)x );
 }
 #endif
 
@@ -341,7 +340,7 @@ float lgammaf (float x)
 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 @@ long long llrintf (float x)
 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 @@ float logf (float x)
 libm_hidden_proto(lrint)
 long lrintf (float x)
 {
-	return (float) lrint( (double)x );
+	return (long) lrint( (double)x );
 }
 #endif
 
@@ -413,7 +412,7 @@ long lrintf (float x)
 libm_hidden_proto(lround)
 long lroundf (float x)
 {
-	return (float) lround( (double)x );
+	return (long) lround( (double)x );
 }
 #endif