Update.

	* include/link.h (struct link_map): New bit field l_faked.
	* elf/dl-deps.c: Use l_faked field in struct link_map instead of
	the magic l_opencount==0.
	* elf/dl-load.c: Likewise.
	* elf/dl-version.c: Likewise.
	* elf/rtld.c: Likewise.

1 files changed, 2 insertions, 3 deletions

diff --git a/elf/dl-version.c b/elf/dl-version.c
index 504287c209..bb0fc71e9d 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -219,7 +219,7 @@ _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
 	     dependency.  */
 	  if (__builtin_expect (! trace_mode, 1)
-	      || __builtin_expect (needed->l_opencount, 1) != 0)
+	      || ! __builtin_expect (needed->l_faked, 0))
 	    {
 	      /* NEEDED is the map for the file we need.  Now look for the
 		 dependency symbols.  */
@@ -375,8 +375,7 @@ _dl_check_all_versions (struct link_map *map, int verbose, int trace_mode)
   int result = 0;
 
   for (l = map; l != NULL; l = l->l_next)
-    result |= (l->l_opencount != 0
-	       && _dl_check_map_versions (l, verbose, trace_mode));
+    result |= ! l->l_faked && _dl_check_map_versions (l, verbose, trace_mode);
 
   return result;
 }