Merge commit 'origin/master' into fedora/master

Conflicts:
	ChangeLog

1 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b450994f7..6f7026debf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/makecontext.S: Ensure we preserve the
+	stack alignment in the exit code.
+
+	* elf/dl-lookup.c (dl_lookup_x): The hashval for unique symbol can
+	potentially be zero.
+
+	* elf/tst-unique1.c: Extend test to check for unloading DSO with
+	unique symbol definition.
+	Patch by Jakub Jelinek.
+	* elf/dl-lookup.c (do_lookup_x): When entering a new unique symbol,
+	make sure the object with the definition cannot be unloaded.  Adjust
+	a few types.
+	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
+	the unique symbol hash table should not be const.
+
 2009-07-22  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).