Update MIPS dl-lookup.c.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 2003dff4cf0b391d5475caf2b0cc0c055a137b91..bcc2c18b606e39c19dd4bb2b47f73a12971e40ab 100644 (file)
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,7 @@
+2011-05-13  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/mips/dl-lookup.c: Update from generic version.
+
 2011-05-10  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/mips/dl-lookup.c: Update from generic version.

diff --git a/sysdeps/mips/dl-lookup.c b/sysdeps/mips/dl-lookup.c
index 78c9f8ea6bdeaa0aa719e8ebd5eb229ee0062b4c..6b36c34a84e8308f78b2e4b62c2b784dc201c978 100644 (file)
--- a/sysdeps/mips/dl-lookup.c
+++ b/sysdeps/mips/dl-lookup.c
@@ -329,39 +329,21 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
                 definition we have to use it.  */
              void enter (struct unique_sym *table, size_t size,
                          unsigned int hash, const char *name,
-                         const ElfW(Sym) *sym, struct link_map *map)
+                         const ElfW(Sym) *sym, const struct link_map *map)
              {
                size_t idx = hash % size;
                size_t hash2 = 1 + hash % (size - 2);
-               while (1)
+               while (table[idx].name != NULL)
                  {
-                   if (table[idx].name == NULL)
-                     {
-                       table[idx].hashval = hash;
-                       table[idx].name = name;
-                       if ((type_class & ELF_RTYPE_CLASS_COPY) != 0)
-                         {
-                           table[idx].sym = ref;
-                           table[idx].map = undef_map;
-                         }
-                       else
-                         {
-                           table[idx].sym = sym;
-                           table[idx].map = map;
-
-                           if (map->l_type == lt_loaded)
-                             /* Make sure we don't unload this object by
-                                setting the appropriate flag.  */
-                             map->l_flags_1 |= DF_1_NODELETE;
-                         }
-
-                       return;
-                     }
-
                    idx += hash2;
                    if (idx >= size)
                      idx -= size;
                  }
+
+               table[idx].hashval = hash;
+               table[idx].name = name;
+               table[idx].sym = sym;
+               table[idx].map = map;
              }
 
              struct unique_sym_table *tab
@@ -467,8 +449,19 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
                  tab->free = free;
                }
 
-             enter (entries, size, new_hash, strtab + sym->st_name, sym,
-                    (struct link_map *) map);
+             if ((type_class & ELF_RTYPE_CLASS_COPY) != 0)
+               enter (entries, size, new_hash, strtab + sym->st_name, ref,
+                      undef_map);
+             else
+               {
+                 enter (entries, size, new_hash, strtab + sym->st_name, sym,
+                        map);
+
+                 if (map->l_type == lt_loaded)
+                   /* Make sure we don't unload this object by
+                      setting the appropriate flag.  */
+                   ((struct link_map *) map)->l_flags_1 |= DF_1_NODELETE;
+               }
              ++tab->n_elements;
 
              __rtld_lock_unlock_recursive (tab->lock);