about summary refs log tree commit diff
path: root/elf/dl-load.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-16 23:00:38 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-16 23:00:38 +0000
commit7ad9abc031bf09eb5e9f463c3595547ff13edf47 (patch)
tree3fa463aee195467baccb08e629f41d33b2082bd0 /elf/dl-load.c
parent392a9239981d9855a7ff70b62de1b1518b137f5b (diff)
downloadglibc-7ad9abc031bf09eb5e9f463c3595547ff13edf47.tar.gz
glibc-7ad9abc031bf09eb5e9f463c3595547ff13edf47.tar.xz
glibc-7ad9abc031bf09eb5e9f463c3595547ff13edf47.zip
Update.
2000-09-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/ia64/Implies: Reorder ieee754 implies so that ldbl-* comes
	first.
	* sysdeps/m68k/Implies: Likewise.
	* sysdeps/sparc/sparc64/Implies: Likewise.

2000-09-16  Jakub Jelinek  <jakub@redhat.com>

	* elf/readlib.c (process_file): Don't error for stale .so links either.

	* elf/dl-load.c (_dl_map_object_from_fd): Add one more
	__builtin_expect.
Diffstat (limited to 'elf/dl-load.c')
-rw-r--r--elf/dl-load.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 2911e0778d..81ac23371b 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1176,7 +1176,8 @@ _dl_map_object_from_fd (const char *name, int fd, char *realname,
 
   /* If this object has DT_SYMBOLIC set modify now its scope.  We don't
      have to do this for the main map.  */
-  if (l->l_info[DT_SYMBOLIC] && &l->l_searchlist != l->l_scope[0])
+  if (__builtin_expect (l->l_info[DT_SYMBOLIC] != NULL, 0)
+	   && &l->l_searchlist != l->l_scope[0])
     {
       /* Create an appropriate searchlist.  It contains only this map.