From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 22 Aug 2011 20:10:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a
diff --cc ChangeLog
index 1945002ff40,b206e65ab16..60814a83d36
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,13 +1,28 @@@
 +2011-08-16  Andreas Schwab  <schwab@redhat.com>
 +
 +	[BZ #11724]
 +	* elf/dl-deps.c (_dl_map_object_deps): Only assume cycle when
 +	object is seen twice.
 +	* elf/dl-fini.c (_dl_sort_fini): Likewise.
 +
 +	* elf/Makefile (distribute): Add tst-initorder2.c.
 +	(tests): Add tst-initorder2.
 +	(modules-names): Add tst-initorder2a tst-initorder2b
 +	tst-initorder2c tst-initorder2d.  Add rules to build them.
 +	($(objpfx)tst-initorder2.out): New rule.
 +	* elf/tst-initorder2.c: New file.
 +	* elf/tst-initorder2.exp: New file.
 +
+ 2011-08-22  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* sysdeps/unix/sysv/linux/i386/scandir64.c: Include <string.h>.
+ 
+ 	* elf/dl-deps.c (_dl_map_object_deps): Move check for missing
+ 	dependencies back to end of function.
+ 
+ 	* dlfcn/Makefile (LDLIBS-bug-atexit3-lib.so): Readd
+ 	$(elfobjdir)/ld.so.
+ 
  2011-08-21  Ulrich Drepper  <drepper@gmail.com>
  
  	* sysdeps/unix/sysv/linux/x86_64/gettimeofday.S: Removed.