[commits] r9710 - in /fsf/glibc-2_11-branch/ports: ChangeLog.mips sysdeps/mips/dl-lookup.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jan 22 00:06:17 2010
New Revision: 9710

Log:
Import glibc-ports-2.11 for 2010-01-22

Modified:
    fsf/glibc-2_11-branch/ports/ChangeLog.mips
    fsf/glibc-2_11-branch/ports/sysdeps/mips/dl-lookup.c

Modified: fsf/glibc-2_11-branch/ports/ChangeLog.mips
==============================================================================
--- fsf/glibc-2_11-branch/ports/ChangeLog.mips (original)
+++ fsf/glibc-2_11-branch/ports/ChangeLog.mips Fri Jan 22 00:06:17 2010
@@ -1,3 +1,7 @@
+2009-12-16  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/mips/dl-lookup.c: Update from generic version.
+
 2009-12-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list

Modified: fsf/glibc-2_11-branch/ports/sysdeps/mips/dl-lookup.c
==============================================================================
--- fsf/glibc-2_11-branch/ports/sysdeps/mips/dl-lookup.c (original)
+++ fsf/glibc-2_11-branch/ports/sysdeps/mips/dl-lookup.c Fri Jan 22 00:06:17 2010
@@ -794,7 +794,7 @@
   if (__builtin_expect (protected != 0, 0))
     {
       /* It is very tricky.  We need to figure out what value to
-         return for the protected symbol.  */
+	 return for the protected symbol.  */
       if (type_class == ELF_RTYPE_CLASS_PLT)
 	{
 	  if (current_value.s != NULL && current_value.m != undef_map)
@@ -839,7 +839,8 @@
 				  version, type_class, flags, skip_map);
 
   /* The object is used.  */
-  current_value.m->l_used = 1;
+  if (__builtin_expect (current_value.m->l_used == 0, 0))
+    current_value.m->l_used = 1;
 
   if (__builtin_expect (GLRO(dl_debug_mask)
 			& (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
@@ -861,7 +862,7 @@
   Elf_Symndx nchain;
 
   if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
-  				    + DT_THISPROCNUM + DT_VERSIONTAGNUM
+				    + DT_THISPROCNUM + DT_VERSIONTAGNUM
 				    + DT_EXTRANUM + DT_VALNUM] != NULL, 1))
     {
       Elf32_Word *hash32