qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* elf/dl-load.c: Use a few more __builtin_expect.
This commit is contained in:
Ulrich Drepper 1999-07-07 12:58:12 +00:00
parent c9cddf51e7
commit 6c790888b4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
1999-07-07 Ulrich Drepper <drepper@cygnus.com> 1999-07-07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-load.c: Use a few more __builtin_expect.
* sysdeps/posix/getcwd.c: When resizing buffer make sure new size * sysdeps/posix/getcwd.c: When resizing buffer make sure new size
is large enough. is large enough.

11
elf/dl-load.c
View File

@ -721,7 +721,7 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
header = (void *) readbuf; header = (void *) readbuf;
/* Check the header for basic validity. */ /* 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. */ /* Something is wrong. */
if (*(Elf32_Word *) &header->e_ident != 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"); 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)); 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); 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"); LOSE (0, "ELF file's phentsize not the expected size");
#ifndef MAP_ANON #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. */ /* Enter the new object in the list of loaded objects. */
l = _dl_new_object (realname, name, l_type, loader); l = _dl_new_object (realname, name, l_type, loader);
if (! l) if (__builtin_expect (! l, 0))
LOSE (ENOMEM, "cannot create shared object descriptor"); LOSE (ENOMEM, "cannot create shared object descriptor");
l->l_opencount = 1; l->l_opencount = 1;