This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-326-gca2ff9f
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Mar 2012 07:49:21 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-326-gca2ff9f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ca2ff9fc0492c42f5407a64dd009baa0df488887 (commit)
via 70bca0a394a2135927210007f1dd6eceafe1aaf5 (commit)
from 65b81130c5006b1140c3d8b59038a68004ff61c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ca2ff9fc0492c42f5407a64dd009baa0df488887
commit ca2ff9fc0492c42f5407a64dd009baa0df488887
Merge: 70bca0a 65b8113
Author: Ulrich Drepper <drepper@gmail.com>
Date: Thu Mar 8 02:49:12 2012 -0500
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
diff --cc ChangeLog
index 98a6457,a96f05c..483757d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
+2012-03-07 Marek Polacek <polacek@redhat.com>
+
+ * stdio-common/tst-long-dbl-fphex.c: Fix test for non ldbl-96 targets.
+
+ 2012-03-08 Marek Polacek <polacek@redhat.com>
+
+ [BZ #13806]
+ * stdio-common/Makefile (tests): Add tst-fphex-wide.
+ * stdio-common/tst-fphex.c: Define a few macros to make the
+ test reusable. Use them.
+ * stdio-common/tst-fphex-wide.c: New file.
+
2012-03-08 Joseph Myers <joseph@codesourcery.com>
[BZ #6911]
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=70bca0a394a2135927210007f1dd6eceafe1aaf5
commit 70bca0a394a2135927210007f1dd6eceafe1aaf5
Author: Marek Polacek <polacek@redhat.com>
Date: Thu Mar 8 02:46:43 2012 -0500
Fix up long double fphex test
diff --git a/ChangeLog b/ChangeLog
index 43f23dd..98a6457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-07 Marek Polacek <polacek@redhat.com>
+
+ * stdio-common/tst-long-dbl-fphex.c: Fix test for non ldbl-96 targets.
+
2012-03-08 Joseph Myers <joseph@codesourcery.com>
[BZ #6911]
diff --git a/stdio-common/tst-long-dbl-fphex.c b/stdio-common/tst-long-dbl-fphex.c
index b57fb85..d879c98 100644
--- a/stdio-common/tst-long-dbl-fphex.c
+++ b/stdio-common/tst-long-dbl-fphex.c
@@ -24,14 +24,29 @@ static int do_test (void);
static int
do_test (void)
{
+#ifndef NO_LONG_DOUBLE
+ int result = 0;
const long double x = 24.5;
- wchar_t a[16 * sizeof (wchar_t)];
- swprintf (a, 16 * sizeof (wchar_t), L"%La\n", x);
- wchar_t A[16 * sizeof (wchar_t)];
- swprintf (A, 16 * sizeof (wchar_t), L"%LA\n", x);
-
- return (wmemcmp (a, L"0xc.4p+1", 8) != 0
- || wmemcmp (A, L"0XC.4P+1", 8) != 0);
+ wchar_t a[16];
+ swprintf (a, sizeof (a), L"%La\n", x);
+ wchar_t A[16];
+ swprintf (A, sizeof (A) / sizeof (A[0]), L"%LA\n", x);
+
+ /* Here wprintf can return four valid variants. We must accept all
+ of them. */
+ result |= (wmemcmp (a, L"0xc.4p+1", 8) == 0
+ && wmemcmp (A, L"0XC.4P+1", 8) == 0);
+ result |= (wmemcmp (a, L"0x3.1p+3", 8) == 0
+ && wmemcmp (A, L"0X3.1P+3", 8) == 0);
+ result |= (wmemcmp (a, L"0x6.2p+2", 8) == 0
+ && wmemcmp (A, L"0X6.2P+2", 8) == 0);
+ result |= (wmemcmp (a, L"0x1.88p+4", 8) == 0
+ && wmemcmp (A, L"0X1.88P+4", 8) == 0);
+
+ return result != 1;
+#else
+ return 0;
+#endif
}
#define TEST_FUNCTION do_test ()
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
stdio-common/tst-long-dbl-fphex.c | 29 ++++++++++++++++++++++-------
2 files changed, 26 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources