diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-09 18:21:39 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-09 18:21:39 -0400 |
| commit | e4899e7b9adbf74145f6530f6f57517f773e330c (patch) | |
| tree | f8cc421a27739d5e2775478cac6707bd414949d1 /ChangeLog | |
| parent | f22e10748fbabbf07161eb7a5540b8c0e18553c4 (diff) | |
| parent | 0a2349f929e937fb335ba53e217c05f5aa5d66d5 (diff) | |
| download | glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.gz glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.tar.xz glibc-e4899e7b9adbf74145f6530f6f57517f773e330c.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f1b1c0de51..01d890561c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ * libio/genops.c (INTDEF): For string streams the _lock pointer can be NULL. Don't lock in this case. +2011-09-09 Roland McGrath <roland@hack.frob.com> + + * elf/elf.h (ELFOSABI_GNU): New macro. + (ELFOSABI_LINUX): Define to that. + 2011-07-29 Denis Zaitceff <zaitceff@gmail.com> * string/strncat.c (strncat): Undef the symbol in case it has been @@ -13,7 +18,7 @@ * elf/sotruss.ksh: Clean up, fix, and complete help messages. - * elf/dl-iteratephdr.c (hidden_proto): Fill in data from the real + * elf/dl-iteratephdr.c (__dl_iterate_phdr): Fill in data from the real link map. 2011-08-17 Andreas Jaeger <aj@suse.de> |