From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 17 Feb 2011 06:22:52 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.14~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be6bd0b7ab68d0ed968138a41b5d18eb930d7443;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

be6bd0b7ab68d0ed968138a41b5d18eb930d7443
diff --cc ChangeLog
index fb69303eb46,425ededbb99..292f77a926e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,28 -1,14 +1,39 @@@
 +2011-02-16  Ryan S. Arnold  <rsa@us.ibm.com>
 +
 +	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h:
 +	(INTERNAL_VSYSCALL_NCS INTERNAL_SYSCALL_NCS): Remove erroneous (int)
 +	cast from r3.
 +	* sysdeps/wordsize-64/Makefile: New file.  Add tst-writev to
 +	'tests' variable.
 +	* sysdeps/wordsize-64/tst-writev.c: New file.
 +
 +2011-02-15  Ryan S. Arnold  <rsa@us.ibm.com>
 +
 +	* sysdeps/powerpc/powerpc64/power7/Makefile: New file which adds
 +	-mno-vsx to the CFLAGS-rtld.c variable to avoid using VSX registers and
 +	insns in _dl_start to prevent a TOC reference before relocs are
 +	resolved.
 +
 +2011-02-15  Ulrich Drepper  <drepper@gmail.com>
 +
 +	[BZ #12469]
 +	* Makeconfig: Remove RANLIB definition.
 +	* Makerules: Don't use RANLIB.
 +	* aclocal.m4: Remove ranlib test.
 +	* configure.in: No need to check for ranlib.
 +	* elf/rtld-Rules: Don't use RANLIB.
 +
+ 2011-02-16  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+ 
+ 	* sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion
+ 	protection macro.
+ 	* sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
+ 	inclusion protection macro.
+ 
+ 	* stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
+ 	SIGRTMIN and SIGRTMAX and print information in that case only when
+ 	SIGRTMIN is defined.
+ 
  2011-02-11  Jakub Jelinek  <jakub@redhat.com>
  
  	* stdio-common/printf-parsemb.c (__parse_one_specmb): Handle