From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 23 Jul 2011 04:04:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~433
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ee5518515103e5370b47e6170e8782d7fd2fcba;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

2ee5518515103e5370b47e6170e8782d7fd2fcba
diff --cc ChangeLog
index 40c1ea99055,9e03d172579..d1498389481
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,9 +1,25 @@@
 +2011-07-22  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix test for
 +	OSXSAVE.
 +	(_dl_x86_64_save_sse): Likewise.
 +
 +	* crypt/crypt_util.c (__init_des_r): Optimize memset calls.
 +
 +	* crypt/crypt_util.c (__init_des_r): Add read barrier as well.
 +
 +2011-07-21  Andreas Schwab  <schwab@redhat.com>
 +
 +	* sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix last
 +	change.
 +	(_dl_x86_64_save_sse): Use correct AVX check.
 +
+ 2011-07-21  Liubov Dmitrieva  <liubov.dmitrieva@gmail.com>
+ 
+ 	* sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S: Fix overfow
+ 	bug in strncpy/strncat.
+ 	* sysdeps/x86_64/multiarch/strcpy-ssse3.S: Likewise.
+ 
  2011-07-21  Ulrich Drepper  <drepper@gmail.com>
  
  	* string/tester.c (test_strcat): Add tests for different alignments