From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 15 Jun 2010 08:07:36 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fedora/master
X-Git-Tag: fedora/glibc-2.12.90-3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88;p=thirdparty%2Fglibc.git

Merge remote branch 'origin/master' into fedora/master
---

7314e378e3b0b2a6ea2f0bd7e77cd43a59e38a88
diff --cc ChangeLog
index d8b57052f63,863a76271a7..03eb57adec7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,55 +1,73 @@@
+ 2010-06-07  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* dlfcn/Makefile: Remove explicit dependencies on libc.so and
+ 	libc_nonshared.a from targets in modules-names.
+ 
+ 2010-06-02  Kirill A. Shutemov  <kirill@shutemov.name>
+ 
+ 	* elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch
+ 	requires it.
+ 
+ 2010-06-10  Luis Machado  <luisgpm@br.ibm.com>
+ 
+ 	* sysdeps/powerpc/powerpc32/power7/memcmp.S: New file
+ 	* sysdeps/powerpc/powerpc64/power7/memcmp.S: New file.
+ 	* sysdeps/powerpc/powerpc32/power7/strncmp.S: New file.
+ 	* sysdeps/powerpc/powerpc64/power7/strncmp.S: New file.
+ 
+ 2010-06-02  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* nis/nss_nis/nis-initgroups.c (get_uid): Properly resize buffer.
+ 
+ 2010-06-14  Ulrich Drepper  <drepper@redhat.com>
+ 
+ 	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Define F_SETPIPE_SZ
+ 	and F_GETPIPE_SZ.
+ 	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise.
+ 	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise.
+ 	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise.
+ 	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+ 	* sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise.
+ 	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise
+ 
+ 2010-06-14  Roland McGrath  <roland@redhat.com>
+ 
+ 	* manual/libc.texinfo (@copying): Change to GFDL v1.3.
+ 
+ 2010-06-07  Jakub Jelinek  <jakub@redhat.com>
+ 
+ 	* libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of
+ 	__REDIRECT followed by __THROW.
+ 	* wcsmbs/wchar.h (swscanf, vswscanf): Likewise.
+ 	* posix/getopt.h (getopt): Likewise.
+ 
+ 2010-06-02  Emilio Pozuelo Monfort  <pochu27@gmail.com>
+ 
+ 	* hurd/lookup-at.c (__file_name_lookup_at): Accept
+ 	AT_SYMLINK_FOLLOW in AT_FLAGS.  Fail with EINVAL if both
+ 	AT_SYMLINK_FOLLOW and AT_SYMLINK_NOFOLLOW are present
+ 	in AT_FLAGS.
+ 	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
+ 	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
+ 
 +2010-06-11  Andreas Schwab  <schwab@redhat.com>
 +
 +	* elf/rtld.c (_dl_starting_up): Always define.
 +	(dl_main): Always set _dl_starting_up.
 +	* elf/dl-support.c (_dl_starting_up): Always define.
 +	* elf/dl-init.c (_dl_init): Always clear _dl_starting_up.
 +
 +2010-06-10  Andreas Schwab  <schwab@redhat.com>
 +
 +	* sysdeps/unix/sysv/linux/getpagesize.c: Don't assume AT_PAGESIZE
 +	is always available.
 +
 +	* sysdeps/unix/sysv/linux/i386/Versions: Export __uname under
 +	GLIBC_PRIVATE.
 +	* nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.
 +	* sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname.
 +	* nptl/nptl-init.c: Call __getrlimit instead of getrlimit.
 +
  2010-05-28  Luis Machado  <luisgpm@br.ibm.com>
  
  	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
diff --cc nptl/ChangeLog
index ed574205ede,49ead511b21..bb0008620d0
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
+ 2010-06-01  Takashi Yoshii  <takashi.yoshii.zj@renesas.com>
+ 
+ 	* sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect
+ 	location of ifndef __ASSUME_FUTEX_CLOCK_REALTIME.
+ 
 +2010-05-27  Andreas Schwab  <schwab@redhat.com>
 +
 +	* Makefile ($(objpfx)tst-_res1): Depend on
 +	$(objpfx)tst-_res1mod1.so.
 +
  2010-04-09  Ulrich Drepper  <drepper@redhat.com>
  
  	[BZ #11390]