From a9ff8724b374e0f914959eaeb1d6bfe7334e8ac2 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 11 Nov 2011 22:07:55 +0000 Subject: [PATCH] Update MIPS dl-lookup.c. --- ChangeLog.mips | 4 ++++ sysdeps/mips/dl-lookup.c | 4 ++-- 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 + + * sysdeps/mips/dl-lookup.c: Update from generic version. + 2011-10-12 Joseph Myers * 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;