qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2000-04-17  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-lookup.c (add_dependency): Correct __builtin_expect use.
This commit is contained in:
Ulrich Drepper 2000-04-17 07:09:10 +00:00
parent e2947c429e
commit e3265f5bc5
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2000-04-17 Ulrich Drepper <drepper@redhat.com>
* elf/dl-lookup.c (add_dependency): Correct __builtin_expect use.
2000-04-15 Ulrich Drepper <drepper@redhat.com> 2000-04-15 Ulrich Drepper <drepper@redhat.com>
* csu/Makefile ($(objpfx)version-info.h): Get OS name from uname and * csu/Makefile ($(objpfx)version-info.h): Get OS name from uname and

2
elf/dl-lookup.c
View File

@ -102,7 +102,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map)
if (list[i] == map) if (list[i] == map)
break; break;
if (__builtin_expect (i, act) == act) if (__builtin_expect (i == act, 1))
{ {
/* No normal dependency. See whether we already had to add it /* No normal dependency. See whether we already had to add it
to the special list of dynamic dependencies. */ to the special list of dynamic dependencies. */

4
linuxthreads/ChangeLog
View File

@ -1,5 +1,9 @@
2000-04-16 Ulrich Drepper <drepper@redhat.com> 2000-04-16 Ulrich Drepper <drepper@redhat.com>
* condvar.c (pthread_cond_timedwait_relative): Don't test for owner
if fast mutex is used. Don't initialize `already_canceled' twice.
Correctly test for return value of timedsuspend.
* pthread.c: Correct long-time braino. We never set SA_SIGINFO and * pthread.c: Correct long-time braino. We never set SA_SIGINFO and
therefore don't need the _rt versions of the signal handlers. therefore don't need the _rt versions of the signal handlers.

6
linuxthreads/condvar.c
View File

@ -121,11 +121,9 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_extricate_if extr; pthread_extricate_if extr;
/* Check whether the mutex is locked and owned by this thread. */ /* Check whether the mutex is locked and owned by this thread. */
if (mutex->__m_owner != self) if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self)
return EINVAL; return EINVAL;
already_canceled = 0;
/* Set up extrication interface */ /* Set up extrication interface */
extr.pu_object = cond; extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func; extr.pu_extricate_func = cond_extricate_func;
@ -149,7 +147,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond,
pthread_mutex_unlock(mutex); pthread_mutex_unlock(mutex);
if (!timedsuspend(self, abstime) == 0) { if (!timedsuspend(self, abstime)) {
int was_on_queue; int was_on_queue;
/* __pthread_lock will queue back any spurious restarts that /* __pthread_lock will queue back any spurious restarts that