aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-07 12:58:12 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-07 12:58:12 +0000
commit6c790888b4a7c13430c7c8c241aade6a1a714c07 (patch)
tree0a7ec806ac0f691bea57988503cd28d61905a1c9 /elf
parentc9cddf51e757d8e59f0d5ead82a9d2414d61e9be (diff)
downloadglibc-6c790888b4a7c13430c7c8c241aade6a1a714c07.zip
glibc-6c790888b4a7c13430c7c8c241aade6a1a714c07.tar.gz
glibc-6c790888b4a7c13430c7c8c241aade6a1a714c07.tar.bz2
Update.
* elf/dl-load.c: Use a few more __builtin_expect.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index a0448e9..c1194ce 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -721,7 +721,7 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
header = (void *) readbuf;
/* Check the header for basic validity. */
- if (memcmp (header->e_ident, expected, EI_PAD) != 0)
+ if (__builtin_expect (memcmp (header->e_ident, expected, EI_PAD), 0) != 0)
{
/* Something is wrong. */
if (*(Elf32_Word *) &header->e_ident !=
@@ -753,11 +753,12 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
LOSE (0, "internal error");
}
- if (header->e_version != EV_CURRENT)
+ if (__builtin_expect (header->e_version, EV_CURRENT) != EV_CURRENT)
LOSE (0, "ELF file version not " STRING(EV_CURRENT));
- if (! elf_machine_matches_host (header->e_machine))
+ if (! __builtin_expect (elf_machine_matches_host (header->e_machine), 1))
LOSE (0, "ELF file machine architecture not " ELF_MACHINE_NAME);
- if (header->e_phentsize != sizeof (ElfW(Phdr)))
+ if (__builtin_expect (header->e_phentsize, sizeof (ElfW(Phdr)))
+ != sizeof (ElfW(Phdr)))
LOSE (0, "ELF file's phentsize not the expected size");
#ifndef MAP_ANON
@@ -775,7 +776,7 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
/* Enter the new object in the list of loaded objects. */
l = _dl_new_object (realname, name, l_type, loader);
- if (! l)
+ if (__builtin_expect (! l, 0))
LOSE (ENOMEM, "cannot create shared object descriptor");
l->l_opencount = 1;