From: Andreas Jaeger <aj@suse.de>
Date: Sun, 8 Apr 2012 12:54:13 +0000 (+0200)
Subject: Merge branch 'master' of git://sourceware.org/git/glibc
X-Git-Tag: glibc-2.16-tps~639
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96bd03c79a7ea9bdf6130e4a641d3144cbefabac;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

96bd03c79a7ea9bdf6130e4a641d3144cbefabac
diff --cc ChangeLog
index 1d6f69fa6f6,bed8caf4e1d..d17671c4f1a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,21 +1,27 @@@
 +2012-04-08  Stephen Compall  <s11@member.fsf.org>
 +
 +	[BZ #6649]
 +	* manual/llio.texi (Opening and Closing Files): Add cross
 +	reference to explain mode argument.
 +
+ 2012-04-07  Mike Frysinger  <vapier@gentoo.org>
+ 
+ 	* sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED.
+ 	* sysdeps/x86_64/memset_chk.S: Likewise.
+ 
+ 2012-04-07  David S. Miller  <davem@davemloft.net>
+ 
+ 	* elf/elf.h (R_SPARC_WDISP10): Define.
+ 	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Handle
+ 	R_SPARC_SIZE32.
+ 	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handle
+ 	R_SPARC_SIZE64 and R_SPARC_H34.
+ 
+ 2012-04-07  Carlos O'Donell  <carlos_odonell@mentor.com>
+ 
+ 	* elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Simplify
+ 	conditions and remove no longer applicable assertion.
+ 
  2012-04-06  H.J. Lu  <hongjiu.lu@intel.com>
  
  	* bits/byteswap.h (__bswap_16): Removed.