Merge branch 'master' of ssh://sources.redhat.com/git/glibc

diff --cc ChangeLog
index a8aa8f1,d6b0ca8..9cd9250
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,11 +1,21 @@@
+ 2010-01-14  Ryan S. Arnold  <rsa@us.ibm.com>
+ 
+       * Makeconfig (+prector, +postctor, +prectorS, +postctorS): Add
+       $(sysdep-LDFLAGS) to pre and post ctors so that the proper .o
+       files are found by GCC.
+ 
  2010-01-14  Ulrich Drepper  <drepper@redhat.com>
  
 +      * posix/unistd.h: Relax conditions for ualarm, usleep, getwd, vfork,
 +      brk, and sbrk.
 +
 +      * string/strings.h: Relax condition for bcmp, bcopy, bzero, ffs,
 +      index, and rindex.
 +
 +      * stdlib/stdlib.h: Relax conditions for *cvt functions and valloc.
 +
 +      * Versions.def: Add GLIBC_2.12 for libpthread.
 +
        [BZ #11126]
        * malloc/malloc.c (malloc_info): Initialize malloc if not already
        done.  Handle empty bin lists.