aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-08-22 16:10:16 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-22 16:10:16 -0400
commit304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a (patch)
treef2697c0731253059c56256775460abd4ce7b1167 /ChangeLog
parente888bcbe4fb8ad538ec640bfb18b687d51e001e7 (diff)
parent70538b7fe6c9a23fb942b10a9e6da4c138557e3c (diff)
downloadglibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.zip
glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.gz
glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.bz2
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1945002..60814a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,16 @@
* 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.