about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c3
-rw-r--r--elf/readlib.c2
2 files changed, 3 insertions, 2 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.
 
diff --git a/elf/readlib.c b/elf/readlib.c
index 8e2b91c610..5ec5a546be 100644
--- a/elf/readlib.c
+++ b/elf/readlib.c
@@ -87,7 +87,7 @@ process_file (const char *file_name, const char *lib, int *flag,
   if (file == NULL)
     {
       /* No error for stale symlink.  */
-      if (is_link && strstr (file_name, ".so.") != NULL)
+      if (is_link && strstr (file_name, ".so") != NULL)
 	return 1;
       error (0, 0, _("Input file %s not found.\n"), file_name);
       return 1;