[commits] r1641 - in /branches/eglibc-2_3/libc: ChangeLog.eglibc math/libm-test.inc sysdeps/ieee754/ldbl-128/s_lrintl.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Mar  5 18:20:13 2007
New Revision: 1641

Log:
	Backport from mainline.
	2006-09-24  Jakub Jelinek  <jakub@xxxxxxxxxx>
	* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Fix 2 typos.

	2006-09-20  Andreas Jaeger  <aj@xxxxxxx>
	* math/libm-test.inc (lrint_test_upward): Fix typo.

Modified:
    branches/eglibc-2_3/libc/ChangeLog.eglibc
    branches/eglibc-2_3/libc/math/libm-test.inc
    branches/eglibc-2_3/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c

Modified: branches/eglibc-2_3/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_3/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_3/libc/ChangeLog.eglibc Mon Mar  5 18:20:13 2007
@@ -1,3 +1,12 @@
+2007-03-05  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	Backport from mainline.
+	2006-09-24  Jakub Jelinek  <jakub@xxxxxxxxxx>
+	* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Fix 2 typos.
+
+	2006-09-20  Andreas Jaeger  <aj@xxxxxxx>
+	* math/libm-test.inc (lrint_test_upward): Fix typo.
+
 2007-02-27  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* configure.in: Also pass -isystem option for GCC's include-fixed

Modified: branches/eglibc-2_3/libc/math/libm-test.inc
==============================================================================
--- branches/eglibc-2_3/libc/math/libm-test.inc (original)
+++ branches/eglibc-2_3/libc/math/libm-test.inc Mon Mar  5 18:20:13 2007
@@ -3264,7 +3264,7 @@
       TEST_f_l (lrint, 1071930.0008, 1071931);
       TEST_f_l (lrint, 1073741824.01, 1073741825);
 # if LONG_MAX > 281474976710656 && defined (TEST_LDOUBLE)
-      TEST_f_l (lrint, 281474976710656.025, 28147497671065);
+      TEST_f_l (lrint, 281474976710656.025, 281474976710656);
 # endif
 #endif
     }

Modified: branches/eglibc-2_3/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c
==============================================================================
--- branches/eglibc-2_3/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c (original)
+++ branches/eglibc-2_3/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c Mon Mar  5 18:20:13 2007
@@ -50,7 +50,7 @@
     {
       w = two112[sx] + x;
       t = w - two112[sx];
-      GET_LDOUBLE_WORDS64 (i0, i1, x);
+      GET_LDOUBLE_WORDS64 (i0, i1, t);
       j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
       i0 &= 0x0000ffffffffffffLL;
       i0 |= 0x0001000000000000LL;
@@ -65,7 +65,7 @@
 	{
 	  w = two112[sx] + x;
 	  t = w - two112[sx];
-	  GET_LDOUBLE_WORDS64 (i0, i1, x);
+	  GET_LDOUBLE_WORDS64 (i0, i1, t);
 	  j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
 	  i0 &= 0x0000ffffffffffffLL;
 	  i0 |= 0x0001000000000000LL;