about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-06-08 03:31:44 +0000
committerUlrich Drepper <drepper@redhat.com>2000-06-08 03:31:44 +0000
commit7e281477f1fd1d660e663505b0c5c0e2cf53c1be (patch)
tree46bc0faf649f582c1b5c38eb095eb8561c318307
parentdec126b41a0bf2d807c3fc908bd8a0f1a9fa9277 (diff)
downloadglibc-7e281477f1fd1d660e663505b0c5c0e2cf53c1be.tar.gz
glibc-7e281477f1fd1d660e663505b0c5c0e2cf53c1be.tar.xz
glibc-7e281477f1fd1d660e663505b0c5c0e2cf53c1be.zip
Update.
	* elf/do-lookup.h: Add some __builtin_expect.
-rw-r--r--ChangeLog2
-rw-r--r--elf/do-lookup.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c95be6e5b5..375fe2e82d 100644
--- 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 ffc98ab624..4511ef6289 100644
--- 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
     }