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

Update. 

* elf/dl-version.c: Add __builtin_expect in many places.
This commit is contained in:
Ulrich Drepper 2000-06-08 01:12:15 +00:00
parent dc3b5786d2
commit 7b228b6857
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2000-06-07 Ulrich Drepper <drepper@redhat.com> 2000-06-07 Ulrich Drepper <drepper@redhat.com>
* elf/dl-version.c: Add __builtin_expect in many places.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags):
Update. Update.

18
elf/dl-version.c
View File

@ -82,12 +82,12 @@ match_symbol (const char *name, ElfW(Word) hash, const char *string,
ElfW(Verdef) *def; ElfW(Verdef) *def;
/* Display information about what we are doing while debugging. */ /* Display information about what we are doing while debugging. */
if (_dl_debug_versions) if (__builtin_expect (_dl_debug_versions, 0))
_dl_debug_message (1, "checking for version `", string, "' in file ", _dl_debug_message (1, "checking for version `", string, "' in file ",
map->l_name[0] ? map->l_name : _dl_argv[0], map->l_name[0] ? map->l_name : _dl_argv[0],
" required by file ", name, "\n", NULL); " required by file ", name, "\n", NULL);
if (map->l_info[VERSYMIDX (DT_VERDEF)] == NULL) if (__builtin_expect (map->l_info[VERSYMIDX (DT_VERDEF)] == NULL, 0))
{ {
/* The file has no symbol versioning. I.e., the dependent /* The file has no symbol versioning. I.e., the dependent
object was linked against another version of this file. We object was linked against another version of this file. We
@ -108,7 +108,7 @@ no version information available (required by ",
{ {
/* Currently the version number of the definition entry is 1. /* Currently the version number of the definition entry is 1.
Make sure all we see is this version. */ Make sure all we see is this version. */
if (def->vd_version != 1) if (__builtin_expect (def->vd_version, 1) != 1)
{ {
char buf[20]; char buf[20];
buf[sizeof (buf) - 1] = '\0'; buf[sizeof (buf) - 1] = '\0';
@ -127,7 +127,8 @@ no version information available (required by ",
ElfW(Verdaux) *aux = (ElfW(Verdaux) *) ((char *) def + def->vd_aux); ElfW(Verdaux) *aux = (ElfW(Verdaux) *) ((char *) def + def->vd_aux);
/* To be safe, compare the string as well. */ /* To be safe, compare the string as well. */
if (strcmp (string, strtab + aux->vda_name) == 0) if (__builtin_expect (strcmp (string, strtab + aux->vda_name), 0)
== 0)
/* Bingo! */ /* Bingo! */
return 0; return 0;
} }
@ -141,7 +142,7 @@ no version information available (required by ",
} }
/* Symbol not found. If it was a weak reference it is not fatal. */ /* Symbol not found. If it was a weak reference it is not fatal. */
if (weak) if (__builtin_expect (weak, 1))
{ {
if (verbose) if (verbose)
_dl_signal_cerror (0, map->l_name, _dl_signal_cerror (0, map->l_name,
@ -187,7 +188,7 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
/* Currently the version number of the needed entry is 1. /* Currently the version number of the needed entry is 1.
Make sure all we see is this version. */ Make sure all we see is this version. */
if (ent->vn_version != 1) if (__builtin_expect (ent->vn_version, 1) != 1)
{ {
char buf[20]; char buf[20];
buf[sizeof (buf) - 1] = '\0'; buf[sizeof (buf) - 1] = '\0';
@ -211,7 +212,8 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
/* Make sure this is no stub we created because of a missing /* Make sure this is no stub we created because of a missing
dependency. */ dependency. */
if (! trace_mode || needed->l_opencount != 0) if (__builtin_expect (! trace_mode, 1)
|| __builtin_expect (needed->l_opencount, 1) != 0)
{ {
/* NEEDED is the map for the file we need. Now look for the /* NEEDED is the map for the file we need. Now look for the
dependency symbols. */ dependency symbols. */
@ -277,7 +279,7 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
section. */ section. */
map->l_versions = (struct r_found_version *) map->l_versions = (struct r_found_version *)
calloc (ndx_high + 1, sizeof (*map->l_versions)); calloc (ndx_high + 1, sizeof (*map->l_versions));
if (map->l_versions == NULL) if (__builtin_expect (map->l_versions == NULL, 0))
{ {
_dl_signal_error (ENOMEM, (*map->l_name ? map->l_name : _dl_argv[0]), _dl_signal_error (ENOMEM, (*map->l_name ? map->l_name : _dl_argv[0]),
"cannot allocate version reference table"); "cannot allocate version reference table");