Update.

2004-02-12  Jakub Jelinek  <jakub@redhat.com>

	* math/libm-test.inc (lrint_test): Add new test.
	(llrint_test, lround_test, llround_test): Likewise.
	* sysdeps/ieee754/ldbl-128/s_lroundl.c (__lroundl): Fix special case
	with result taking up 48 bits.
	* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise.
	* sysdeps/ieee754/ldbl-128/s_llroundl.c (__llroundl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Fix special case
	with result taking up 31 bits.

6 files changed, 38 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 535a8b4750..e8744951b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* math/libm-test.inc (lrint_test): Add new test.
+	(llrint_test, lround_test, llround_test): Likewise.
+	* sysdeps/ieee754/ldbl-128/s_lroundl.c (__lroundl): Fix special case
+	with result taking up 48 bits.
+	* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise.
+	* sysdeps/ieee754/ldbl-128/s_llroundl.c (__llroundl): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Fix special case
+	with result taking up 31 bits.
+
 2004-02-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/programs/locale.c (show_locale_vars): Don't print a value
diff --git a/math/libm-test.inc b/math/libm-test.inc
index c009d61d49..bad3948f1d 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -3104,6 +3104,9 @@ lrint_test (void)
   TEST_f_l (lrint, 1071930.0008, 1071930);
 #ifndef TEST_FLOAT
   TEST_f_l (lrint, 1073741824.01, 1073741824);
+# if LONG_MAX > 281474976710656
+  TEST_f_l (lrint, 281474976710656.025, 281474976710656);
+# endif
 #endif
 
   END (lrint);
@@ -3143,6 +3146,8 @@ llrint_test (void)
   TEST_f_L (llrint, 2199023255552.0, 2199023255552LL);
   /* 0x40000000000 */
   TEST_f_L (llrint, 4398046511104.0, 4398046511104LL);
+  /* 0x1000000000000 */
+  TEST_f_L (llrint, 281474976710656.0, 281474976710656LL);
   /* 0x10000000000000 */
   TEST_f_L (llrint, 4503599627370496.0, 4503599627370496LL);
   /* 0x10000080000000 */
@@ -3321,6 +3326,9 @@ lround_test (void)
   TEST_f_l (lround, 1071930.0008, 1071930);
 #ifndef TEST_FLOAT
   TEST_f_l (lround, 1073741824.01, 1073741824);
+# if LONG_MAX > 281474976710656
+  TEST_f_l (lround, 281474976710656.025, 281474976710656);
+# endif
   TEST_f_l (lround, 2097152.5, 2097153);
   TEST_f_l (lround, -2097152.5, -2097153);
 #endif
@@ -3364,6 +3372,8 @@ llround_test (void)
   TEST_f_L (llround, 2199023255552.0, 2199023255552LL);
   /* 0x40000000000 */
   TEST_f_L (llround, 4398046511104.0, 4398046511104LL);
+  /* 0x1000000000000 */
+  TEST_f_L (llround, 281474976710656.0, 281474976710656LL);
   /* 0x10000000000000 */
   TEST_f_L (llround, 4503599627370496.0, 4503599627370496LL);
   /* 0x10000080000000 */
diff --git a/sysdeps/ieee754/ldbl-128/s_llroundl.c b/sysdeps/ieee754/ldbl-128/s_llroundl.c
index 9129c15e1f..b4609cdfd0 100644
--- a/sysdeps/ieee754/ldbl-128/s_llroundl.c
+++ b/sysdeps/ieee754/ldbl-128/s_llroundl.c
@@ -1,5 +1,5 @@
 /* Round long double value to long long int.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and
    		  Jakub Jelinek <jj@ultra.linux.cz>, 1999.
@@ -58,7 +58,10 @@ __llroundl (long double x)
 	  if (j < i1)
 	    ++i0;
 
-	  result = ((long long int) i0 << (j0 - 48)) | (j >> (112 - j0));
+	  if (j0 == 48)
+	    result = (long long int) i0;
+	  else
+	    result = ((long long int) i0 << (j0 - 48)) | (j >> (112 - j0));
 	}
     }
   else
diff --git a/sysdeps/ieee754/ldbl-128/s_lrintl.c b/sysdeps/ieee754/ldbl-128/s_lrintl.c
index 350b100b9b..66f9a429fc 100644
--- a/sysdeps/ieee754/ldbl-128/s_lrintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_lrintl.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and
    		  Jakub Jelinek <jj@ultra.linux.cz>, 1999.
@@ -75,7 +75,10 @@ __lrintl (long double x)
 	  i0 &= 0x0000ffffffffffffLL;
 	  i0 |= 0x0001000000000000LL;
 
-	  result = ((long int) i0 << (j0 - 48)) | (i1 >> (112 - j0));
+	  if (j0 == 48)
+	    result = (long int) i0;
+	  else
+	    result = ((long int) i0 << (j0 - 48)) | (i1 >> (112 - j0));
 	}
     }
   else
diff --git a/sysdeps/ieee754/ldbl-128/s_lroundl.c b/sysdeps/ieee754/ldbl-128/s_lroundl.c
index 2a941a1474..1346a04615 100644
--- a/sysdeps/ieee754/ldbl-128/s_lroundl.c
+++ b/sysdeps/ieee754/ldbl-128/s_lroundl.c
@@ -1,5 +1,5 @@
 /* Round long double value to long int.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and
    		  Jakub Jelinek <jj@ultra.linux.cz>, 1999.
@@ -58,7 +58,10 @@ __lroundl (long double x)
 	  if (j < i1)
 	    ++i0;
 
-	  result = ((long int) i0 << (j0 - 48)) | (j >> (112 - j0));
+	  if (j0 == 48)
+	    result = (long int) i0;
+	  else
+	    result = ((long int) i0 << (j0 - 48)) | (j >> (112 - j0));
 	}
     }
   else
diff --git a/sysdeps/ieee754/ldbl-96/s_llrintl.c b/sysdeps/ieee754/ldbl-96/s_llrintl.c
index 665abe204f..e927a8af40 100644
--- a/sysdeps/ieee754/ldbl-96/s_llrintl.c
+++ b/sysdeps/ieee754/ldbl-96/s_llrintl.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -58,7 +58,7 @@ __llrintl (long double x)
 	  GET_LDOUBLE_WORDS (se, i0, i1, t);
 	  j0 = (se & 0x7fff) - 0x3fff;
 
-	  if (j0 < 31)
+	  if (j0 <= 31)
 	    result = i0 >> (31 - j0);
 	  else
 	    result = ((long long int) i0 << (j0 - 31)) | (i1 >> (63 - j0));