From: Ulrich Drepper <drepper@gmail.com>
Date: Sun, 11 Sep 2011 19:02:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~302
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=773523e08dfce391058e6521a8485e9ccc0c3573;p=platform%2Fupstream%2Fglibc.git

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

773523e08dfce391058e6521a8485e9ccc0c3573
diff --cc ChangeLog
index 275e693,e9c2747..f0328d3
--- a/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.