From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 8 Mar 2012 07:49:12 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.16-tps~856
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca2ff9fc0492c42f5407a64dd009baa0df488887;p=thirdparty%2Fglibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog
---

ca2ff9fc0492c42f5407a64dd009baa0df488887
diff --cc ChangeLog
index 98a6457ffc5,a96f05c7cdb..483757d58b8
--- 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]