diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-06 02:20:13 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-03-06 02:20:13 +0000 |
| commit | 7bd168888938eb5e9a7b3bec7f6b9259266aa1a6 (patch) | |
| tree | b528cf5aaffa9a49e592e7609831939212b7723c | |
| parent | 53ca6f2325ed7d2997a0f8a1519291361ddc51d1 (diff) | |
| download | eglibc2-7bd168888938eb5e9a7b3bec7f6b9259266aa1a6.tar.gz | |
Backport from mainline.
2006-09-24 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Fix 2 typos.
2006-09-20 Andreas Jaeger <aj@suse.de>
* math/libm-test.inc (lrint_test_upward): Fix typo.
git-svn-id: svn://svn.eglibc.org/branches/eglibc-2_3@1641 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog.eglibc | 9 | ||||
| -rw-r--r-- | libc/math/libm-test.inc | 2 | ||||
| -rw-r--r-- | libc/sysdeps/ieee754/ldbl-128/s_lrintl.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index 96b57bec3..8a9bab286 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,12 @@ +2007-03-05 Joseph Myers <joseph@codesourcery.com> + + Backport from mainline. + 2006-09-24 Jakub Jelinek <jakub@redhat.com> + * sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Fix 2 typos. + + 2006-09-20 Andreas Jaeger <aj@suse.de> + * math/libm-test.inc (lrint_test_upward): Fix typo. + 2007-02-27 Joseph Myers <joseph@codesourcery.com> * configure.in: Also pass -isystem option for GCC's include-fixed diff --git a/libc/math/libm-test.inc b/libc/math/libm-test.inc index da9888937..4f8ade79f 100644 --- a/libc/math/libm-test.inc +++ b/libc/math/libm-test.inc @@ -3264,7 +3264,7 @@ lrint_test_upward (void) 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 } diff --git a/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c b/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c index 53835a4bb..ead24e99f 100644 --- a/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c +++ b/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c @@ -50,7 +50,7 @@ __lrintl (long double x) { 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 @@ __lrintl (long double x) { 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; |