Avoid warning in dl-lookup.c

This commit is contained in:
Ulrich Drepper 2011-10-29 12:40:55 -04:00
parent 1760874da6
commit 1bc3307181
2 changed files with 4 additions and 2 deletions

View File

@ -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>.

View File

@ -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;