From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 15 Jan 2010 00:25:15 +0000 (-0800)
Subject: Merge branch 'master' of ssh://sources.redhat.com/git/glibc
X-Git-Tag: fedora/glibc-2.11.90-9~1^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21dfc00031ebb523314475a7ed5141eace23404b;p=thirdparty%2Fglibc.git

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

21dfc00031ebb523314475a7ed5141eace23404b
diff --cc ChangeLog
index a8aa8f15c0d,d6b0ca8f57c..9cd9250c933
--- a/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.