aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--elf/libelf.h8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e3cbf8d97..024b548079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 13 09:45:01 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+
+ * elf/libelf.h (elf_hash): Use XOR instead of ANDN when the bits
+ being cleared are already known to be set. Thanks Ulrich.
+
Wed Apr 12 23:27:22 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/environ.c: Add weak alias `_environ'.
diff --git a/elf/libelf.h b/elf/libelf.h
index e95dd93eaa..b6575b9824 100644
--- a/elf/libelf.h
+++ b/elf/libelf.h
@@ -220,8 +220,12 @@ elf_hash (__const char *__name)
__hash = (__hash << 4) + *__name++;
__hi = __hash & 0xf0000000;
if (__hi != 0)
- __hash ^= __hi >> 24;
- __hash &= ~__hi;
+ {
+ __hash ^= __hi >> 24;
+ /* The ELF ABI says `hash &= ~hi', but this is equivalent
+ in this case and on some machines one insn instead of two. */
+ __hash ^= __hi;
+ }
}
return __hash;
}