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

diff --cc ChangeLog
index 275e693d3f4cfee2cd61a5c18149da4e981d5f59,e9c2747d1ccc55bcb2cd1e1e71d7ff61a5c13860..f0328d327e5da95a039f2691421a8a7b8b81e6bf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,13 +1,29 @@@
+ 2011-09-11  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * elf/Makefile (gen-ldd): Prepend $(..) to $(ldd-rewrite-script)
+       if non-absolute.
+       * sysdeps/unix/sysv/linux/configure.in: Remove leading ../ from
+       ldd_rewrite_script.
+       * sysdeps/unix/sysv/linux/configure: Regenerated.
+ 
  2011-09-11  Ulrich Drepper  <drepper@gmail.com>
  
 +      * configure.in: Remove --with-tls option.
 +      * config.h.in: Remove HAVE_TLS_SUPPORT entry.
 +      * sysdeps/i386/elf/configure.in: Always test for TLS support and err
 +      out in case it is missing.
 +      * sysdeps/ia64/elf/configure.in: Likewise.
 +      * sysdeps/powerpc/powerpc32/elf/configure.in: Likewise.
 +      * sysdeps/powerpc/powerpc64/elf/configure.in: Likewise.
 +      * sysdeps/s390/s390-32/elf/configure.in: Likewise.
 +      * sysdeps/s390/s390-64/elf/configure.in: Likewise.
 +      * sysdeps/sh/elf/configure.in: Likewise.
 +      * sysdeps/sparc/sparc32/elf/configure.in: Likewise.
 +      * sysdeps/sparc/sparc64/elf/configure.in: Likewise.
 +      * sysdeps/x86_64/elf/configure.in: Likewise.
 +      * sysdeps/mach/hurd/i386/tls.h: Remove test for HAVE_TLS_SUPPORT.
 +      * sysdeps/mach/hurd/tls.h: Likewise.
 +
        [BZ #13067]
        * malloc/obstack.h [!GNUC] (obstack_free): Avoid cast to int.