summaryrefslogtreecommitdiff
path: root/elf/dl-open.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-06 09:07:56 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-06 09:07:56 +0000
commit53bfdc1cf6f9360dfc5eb95c906159f949a8f83a (patch)
tree8009e94c553c7170b0f8b94e407d6051a8a5bc1f /elf/dl-open.c
parent154d10bdf1984f4fe28f898e07bc25c5367f443e (diff)
Update.
2004-03-06 Ulrich Drepper <drepper@redhat.com> * elf/dl-open.c: No need to pass any parameter to _dl_start_profile. They are the same in both places. * elf/dl-profile.c: Likewise. * elf/rtld.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * elf/dl-support.c: Define _dl_profile_output variable. Initialize it.
Diffstat (limited to 'elf/dl-open.c')
-rw-r--r--elf/dl-open.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c
index ce9a959ea7..8af6eefb46 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -305,7 +305,7 @@ dl_open_worker (void *a)
return;
/* It was already open. */
- if (new->l_searchlist.r_list != NULL)
+ if (__builtin_expect (new->l_searchlist.r_list != NULL, 0))
{
/* Let the user know about the opencount. */
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
@@ -362,8 +362,7 @@ dl_open_worker (void *a)
if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
/* We must prepare the profiling. */
- GLRO(dl_start_profile) (GL(dl_profile_map),
- GLRO(dl_profile_output));
+ GLRO(dl_start_profile) ();
}
else
#endif