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

diff --cc ChangeLog
index 87d907aca168f3fff01c5153587edd731005d294,4d5da2d27d31f0b3e8d0b6df035ec0eaba5ad143..68832397705c6ab93aaed946b8a07fb6f1f0b229
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,29 -1,108 +1,134 @@@
+ 2010-06-30  Andreas Schwab  <schwab@redhat.com>
+ 
+       * dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd
+       $(common-objpfx)libc_nonshared.a.
+ 
+ 2010-06-21  Luis Machado  <luisgpm@br.ibm.com>
+ 
+       * sysdeps/powerpc/powerpc32/970/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc32/power5/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc32/power5+/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc32/power6x/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc64/970/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc64/power5/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc64/power5+/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc64/power6x/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/970/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power5+/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/970/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power5+/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/fpu/Implies: Remove.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/fpu/Implies: Remove.
+       * sysdeps/powerpc/powerpc32/970/Implies: Point to power4.
+       * sysdeps/powerpc/powerpc32/power5/Implies: Point to power4.
+       * sysdeps/powerpc/powerpc32/power5+/Implies: Point to power5.
+       * sysdeps/powerpc/powerpc32/power6/Implies: Point to power5+.
+       * sysdeps/powerpc/powerpc32/power6x/Implies: Point to power6.
+       * sysdeps/powerpc/powerpc64/970/Implies: Point to power4.
+       * sysdeps/powerpc/powerpc64/power5/Implies: Point to power4.
+       * sysdeps/powerpc/powerpc64/power5+/Implies: Point to power5.
+       * sysdeps/powerpc/powerpc64/power6/Implies: Point to power5+.
+       * sysdeps/powerpc/powerpc64/power6x/Implies: Point to power6.
+       * sysdeps/powerpc/powerpc32/power7/Implies: New file.
+       * sysdeps/powerpc/powerpc64/power7/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/970/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/cell/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power4/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power5/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power6/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power6x/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/power7/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/970/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/cell/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power4/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power5/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power6/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power6x/Implies: New file.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc64/power7/Implies: New file.
+ 
+ 2010-06-25  H.J. Lu  <hongjiu.lu@intel.com>
+ 
+       * debug/memmove_chk.c (__memmove_chk): Renamed to ...
+       (MEMMOVE_CHK): ...this.  Default to __memmove_chk.
+       * string/memmove.c (memmove): Renamed to ...
+       (MEMMOVE): ...this.  Default to memmove.
+       * sysdeps/x86_64/memcpy.S: Use ENTRY_CHK and END_CHK.
+       * sysdeps/x86_64/sysdep.h (ENTRY_CHK): Define.
+       (END_CHK): Define.
+       * sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add
+       memcpy-ssse3 mempcpy-ssse3 memmove-ssse3 memcpy-ssse3-back
+       mempcpy-ssse3-back memmove-ssse3-back.
+       * sysdeps/x86_64/multiarch/bcopy.S: New file .
+       * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: New file.
+       * sysdeps/x86_64/multiarch/memcpy-ssse3.S: New file.
+       * sysdeps/x86_64/multiarch/memcpy.S: New file.
+       * sysdeps/x86_64/multiarch/memcpy_chk.S: New file.
+       * sysdeps/x86_64/multiarch/memmove-ssse3-back.S: New file.
+       * sysdeps/x86_64/multiarch/memmove-ssse3.S: New file.
+       * sysdeps/x86_64/multiarch/memmove.c: New file.
+       * sysdeps/x86_64/multiarch/memmove_chk.c: New file.
+       * sysdeps/x86_64/multiarch/mempcpy-ssse3-back.S: New file.
+       * sysdeps/x86_64/multiarch/mempcpy-ssse3.S: New file.
+       * sysdeps/x86_64/multiarch/mempcpy.S: New file.
+       * sysdeps/x86_64/multiarch/mempcpy_chk.S: New file.
+       * sysdeps/x86_64/multiarch/init-arch.h (bit_Fast_Copy_Backward):
+       Define.
+       (index_Fast_Copy_Backward): Define.
+       (HAS_ARCH_FEATURE): Define.
+       (HAS_FAST_REP_STRING): Define.
+       (HAS_FAST_COPY_BACKWARD): Define.
+ 
+ 2010-06-21  Andreas Schwab  <schwab@redhat.com>
+ 
+       * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):
+       Restore proper fallback handling.
+ 
+ 2010-06-19  Ulrich Drepper  <drepper@redhat.com>
+ 
+       [BZ #11701]
+       * posix/group_member.c (__group_member): Correct checking loop.
+ 
+       * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Handle
+       OOM in getpwuid_r correctly.  Return error number when the caller
+       should return, otherwise -1.
+       (getlogin_r): Adjust to return also for result of __getlogin_r_loginuid
+       call returning > 0 value.
+       * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
+ 
 +2010-07-01  Andreas Schwab  <schwab@redhat.com>
 +
 +      * include/sys/resource.h (__getrlimit): Add hidden proto.
 +      * sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak.
 +      * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def.
 +      * resource/getrlimit.c: Likewise.
 +
 +2010-06-28  Andreas Schwab  <schwab@redhat.com>
 +
 +      * allocatestack.c (setxid_mark_thread): Ensure that the exiting
 +      thread is woken up.
 +
 +      * elf/Makefile: Add rules to build and run unload8 test.
 +      * elf/unload8.c: New file.
 +      * elf/unload8mod1.c: New file.
 +      * elf/unload8mod1x.c: New file.
 +      * elf/unload8mod2.c: New file.
 +      * elf/unload8mod3.c: New file.
 +
 +      * elf/dl-close.c (_dl_close_worker): Reset private search list if
 +      it wasn't used.
 +
 +2010-06-21  Andreas Schwab  <schwab@redhat.com>
 +
 +      * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler.
 +
  2010-06-07  Andreas Schwab  <schwab@redhat.com>
  
        * dlfcn/Makefile: Remove explicit dependencies on libc.so and

diff --cc ChangeLog.17
Simple merge

diff --cc elf/Makefile
Simple merge

diff --cc elf/dl-close.c
Simple merge

diff --cc nptl/ChangeLog
Simple merge

diff --cc nptl/Makefile
Simple merge