diff options
author | Ulrich Drepper <drepper@gmail.com> | 2011-08-22 16:10:16 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-08-22 16:10:16 -0400 |
commit | 304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a (patch) | |
tree | f2697c0731253059c56256775460abd4ce7b1167 /ChangeLog | |
parent | e888bcbe4fb8ad538ec640bfb18b687d51e001e7 (diff) | |
parent | 70538b7fe6c9a23fb942b10a9e6da4c138557e3c (diff) | |
download | glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.gz glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.tar.bz2 glibc-304c6e0b2c4d10a6cc2afdb42152aad1cf432c3a.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -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. |