[commits] r14157 - in /branches/eglibc-2_13/libc: ChangeLog.eglibc elf/dl-lookup.c

[maxim@xxxxxxxxxx]

Author: maxim
Date: Fri Jun 10 03:59:21 2011
New Revision: 14157

Log:
	Backport from trunk:
	2011-02-28  Denis Zaitceff  <zaitceff@xxxxxxxxx>
	* elf/dl-lookup.c (GLRO_dl_debug_mask): Apply the forgotten one.

Modified:
    branches/eglibc-2_13/libc/ChangeLog.eglibc
    branches/eglibc-2_13/libc/elf/dl-lookup.c

Modified: branches/eglibc-2_13/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_13/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_13/libc/ChangeLog.eglibc Fri Jun 10 03:59:21 2011
@@ -1,3 +1,9 @@
+2011-06-10  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	Backport from trunk:
+	2011-02-28  Denis Zaitceff  <zaitceff@xxxxxxxxx>
+	* elf/dl-lookup.c (GLRO_dl_debug_mask): Apply the forgotten one.
+
 2010-12-19  Gordon Schumacher  <whiplash@xxxxxxxxx>
 
 	* locale/xlocale.x (DEFINE_CATEGORY): Fix merge issue.

Modified: branches/eglibc-2_13/libc/elf/dl-lookup.c
==============================================================================
--- branches/eglibc-2_13/libc/elf/dl-lookup.c (original)
+++ branches/eglibc-2_13/libc/elf/dl-lookup.c Fri Jun 10 03:59:21 2011
@@ -423,7 +423,7 @@
 		     hash table.  */
 		  if (__builtin_expect (tab->size, 0))
 		    {
-		      assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
+		      assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK);
 		      __rtld_lock_unlock_recursive (tab->lock);
 		      goto success;
 		    }