From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 10 Mar 2011 17:53:39 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.14~212
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6ce0f974b727437e383f69d17d51962c86bf31b;p=thirdparty%2Fglibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog
---

f6ce0f974b727437e383f69d17d51962c86bf31b
diff --cc ChangeLog
index b83905ba1c8,c8669a99fb8..0de681e9f47
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,10 +1,25 @@@
 +2011-03-10  Ulrich Drepper  <drepper@gmail.com>
 +
 +	[BZ #12510]
 +	* elf/dl-lookup.c (do_lookup_x): For copy relocations of unique objects
 +	copy from the symbol referenced in the relocation to initialize the
 +	used variable.
 +	Patch by Piotr Bury <pbury@goahead.com>.
 +	* elf/Makefile: Add rules to build and tst-unique3.
 +	* include/bits/dlfcn.h: Remove _dl_mcount_wrapper_check declaration.
 +	* elf/tst-unique3.cc: New file.
 +	* elf/tst-unique3.h: New file.
 +	* elf/tst-unique3lib.cc: New file.
 +	* elf/tst-unique3lib2.cc: New file.
 +
 +	* elf/Makefile: Don't run tst-execstack* tests of SELinux is enabled.
 +
+ 2011-03-10  Mike Frysinger  <vapier@gentoo.org>
+ 
+ 	* sysdeps/sparc/sparc64/elf/configure.in (libc_cv_sparc64_tls): Add
+ 	$LDFLAGS and -nostdlib -nostartfiles to linking step.  Change main
+ 	to _start.
 -	* sysdeps/sparc/sparc64/elf/configure: Regenerate.
+ 
  2011-03-06  Ulrich Drepper  <drepper@gmail.com>
  
  	* elf/dl-load.c (_dl_map_object): If we are looking for the first