From 459994b032fb678de631b18f8a8626239920c20e Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Tue, 11 Mar 2008 10:25:42 +0000 Subject: Move calculation of rem within if (unlikely statement Signed-off-by: Peter Kjellerstedt SIgned-off-by: Carmelo Amoroso --- ldso/ldso/dl-hash.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index fb5cbc413..6eef1c742 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -204,12 +204,14 @@ _dl_lookup_gnu_hash(struct elf_resolve *tpnt, ElfW(Sym) *symtab, unsigned long h unsigned int hashbit1 = hash & (__ELF_NATIVE_CLASS - 1); unsigned int hashbit2 = ((hash >> tpnt->l_gnu_shift) & (__ELF_NATIVE_CLASS - 1)); - unsigned long rem; - do_rem (rem, hash, tpnt->nbucket); _dl_assert (bitmask != NULL); if (unlikely((bitmask_word >> hashbit1) & (bitmask_word >> hashbit2) & 1)) { - Elf32_Word bucket = tpnt->l_gnu_buckets[rem]; + unsigned long rem; + Elf32_Word bucket; + + do_rem (rem, hash, tpnt->nbucket); + bucket = tpnt->l_gnu_buckets[rem]; if (bucket != 0) { const Elf32_Word *hasharr = &tpnt->l_gnu_chain_zero[bucket]; -- cgit v1.2.3