Update.

	* elf/do-lookup.h: Add some __builtin_expect.

diff --git a/ChangeLog b/ChangeLog
index c95be6e5b598bfbc6ab2ab173deede884b9fb20a..375fe2e82dad8d34cd6935c823c4e61940b2cd8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-07  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/do-lookup.h: Add some __builtin_expect.
+
        * dlfcn/dlfcn.h: Pretty print dladdr declaraction.
 
        * elf/rtld.c (process_envvars): Recognize LD_DYNAMIC_WEAK.

diff --git a/elf/do-lookup.h b/elf/do-lookup.h
index ffc98ab6243afc5de20127338c21b251393a269e..4511ef6289319e8dd04c9f9fda688d04ac4c8702 100644 (file)
--- a/elf/do-lookup.h
+++ b/elf/do-lookup.h
@@ -92,7 +92,7 @@ FCT (const char *undef_name, struct link_map *undef_map,
            continue;
 
 #if VERSIONED
-         if (verstab == NULL)
+         if (__builtin_expect (verstab == NULL, 0))
            {
              /* We need a versioned symbol but haven't found any.  If
                 this is the object which is referenced in the verneed
@@ -184,7 +184,7 @@ FCT (const char *undef_name, struct link_map *undef_map,
       /* If this current map is the one mentioned in the verneed entry
         and we have not found a weak entry, it is a bug.  */
       if (symidx == STN_UNDEF && version->filename != NULL
-         && _dl_name_match_p (version->filename, map))
+         && __builtin_expect (_dl_name_match_p (version->filename, map), 0))
        return -1;
 #endif
     }