aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-10-29 12:40:55 -0400
committerUlrich Drepper <drepper@gmail.com>2011-10-29 12:40:55 -0400
commit1bc3307181a2213a4d7253bced376c3de021605e (patch)
tree21dc0303b6296a817a7f75b3c2ef2ce634655012
parent1760874da6e4a6934751ea12cf2c06eae936b53c (diff)
downloadglibc-1bc3307181a2213a4d7253bced376c3de021605e.zip
glibc-1bc3307181a2213a4d7253bced376c3de021605e.tar.gz
glibc-1bc3307181a2213a4d7253bced376c3de021605e.tar.bz2
Avoid warning in dl-lookup.c
-rw-r--r--ChangeLog2
-rw-r--r--elf/dl-lookup.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e0c37c..fbef6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-10-29 Ulrich Drepper <drepper@gmail.com>
+ * elf/dl-lookup.c (_dl_setup_hash): Avoid warning.
+
[BZ #13335]
* elf/chroot_canon.c (chroot_canon): Fix readlink call.
Patch by Thomas Jarosch <thomas.jarosch@intra2net.com>.
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index affb53f..e655d14 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -860,7 +860,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
@@ -892,7 +891,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;