about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2011-11-11 22:07:55 +0000
committerJoseph Myers <joseph@codesourcery.com>2011-11-11 22:07:55 +0000
commita9ff8724b374e0f914959eaeb1d6bfe7334e8ac2 (patch)
tree0ded9545f6d989c3f1e55b071bbad657ecea4434
parentf335e01fe1240ea3e4a3759e68f6585c51ffcda3 (diff)
downloadglibc-a9ff8724b374e0f914959eaeb1d6bfe7334e8ac2.tar.gz
glibc-a9ff8724b374e0f914959eaeb1d6bfe7334e8ac2.tar.xz
glibc-a9ff8724b374e0f914959eaeb1d6bfe7334e8ac2.zip
Update MIPS dl-lookup.c.
-rw-r--r--ChangeLog.mips4
-rw-r--r--sysdeps/mips/dl-lookup.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog.mips b/ChangeLog.mips
index 78932d7a03..74c7bdd54c 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,7 @@
+2011-11-11  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/mips/dl-lookup.c: Update from generic version.
+
 2011-10-12  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/mips/fpu/e_sqrt.c: Add __sqrt_finite alias.
diff --git a/sysdeps/mips/dl-lookup.c b/sysdeps/mips/dl-lookup.c
index 6b36c34a84..fed3b6c666 100644
--- a/sysdeps/mips/dl-lookup.c
+++ b/sysdeps/mips/dl-lookup.c
@@ -877,7 +877,6 @@ internal_function
 _dl_setup_hash (struct link_map *map)
 {
   Elf_Symndx *hash;
-  Elf_Symndx nchain;
 
   if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
 				    + DT_THISPROCNUM + DT_VERSIONTAGNUM
@@ -909,7 +908,8 @@ _dl_setup_hash (struct link_map *map)
   hash = (void *) D_PTR (map, l_info[DT_HASH]);
 
   map->l_nbuckets = *hash++;
-  nchain = *hash++;
+  /* Skip nchain.  */
+  hash++;
   map->l_buckets = hash;
   hash += map->l_nbuckets;
   map->l_chain = hash;