From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 14 Feb 2004 07:33:05 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~811
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b078c5918eefc410f73a5417600f47eefad0575c;p=thirdparty%2Fglibc.git

Update.

	* sysdeps/pthread/pthread_cond_wait.c (__pthread_cond_wait): Add a
	__builtin_expect.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d1d9fc10254..b610b7f3275 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/pthread/pthread_cond_wait.c (__pthread_cond_wait): Add a
+	__builtin_expect.
+
 	* sysdeps/generic/pt-longjmp.c: Moved to...
 	* sysdeps/pthread/pt-longjmp.c: ...here.  New file.
 
diff --git a/nptl/sysdeps/pthread/pthread_cond_wait.c b/nptl/sysdeps/pthread/pthread_cond_wait.c
index 79c6d9951c1..4435ef81f88 100644
--- a/nptl/sysdeps/pthread/pthread_cond_wait.c
+++ b/nptl/sysdeps/pthread/pthread_cond_wait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
 
@@ -83,7 +83,7 @@ __pthread_cond_wait (cond, mutex)
 
   /* Now we can release the mutex.  */
   err = __pthread_mutex_unlock_usercnt (mutex, 0);
-  if (err)
+  if (__builtin_expect (err, 0))
     {
       lll_mutex_unlock (cond->__data.__lock);
       return err;