Nick Alcock
7a25d6a84d
x86, pthread_cond_*wait: Do not depend on %eax not being clobbered
...
The x86-specific versions of both pthread_cond_wait and
pthread_cond_timedwait have (in their fall-back-to-futex-wait slow
paths) calls to __pthread_mutex_cond_lock_adjust followed by
__pthread_mutex_unlock_usercnt, which load the parameters before the
first call but then assume that the first parameter, in %eax, will
survive unaffected. This happens to have been true before now, but %eax
is a call-clobbered register, and this assumption is not safe: it could
change at any time, at GCC's whim, and indeed the stack-protector canary
checking code clobbers %eax while checking that the canary is
uncorrupted.
So reload %eax before calling __pthread_mutex_unlock_usercnt. (Do this
unconditionally, even when stack-protection is not in use, because it's
the right thing to do, it's a slow path, and anything else is dicing
with death.)
* sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S: Reload
call-clobbered %eax on retry path.
* sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S: Likewise.
2016-03-23 13:40:14 +01:00
H.J. Lu
f6d1d86d0c
Move sysdeps/unix/sysv/linux/i386/i486/*.? to i386
...
Since glibc doesn't support i386 any more, we can move
sysdeps/unix/sysv/linux/i386/i486/*.? to i386.
[BZ #19006 ]
* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Moved
to ...
* sysdeps/unix/sysv/linux/i386/libc-lowlevellock.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/lll_timedlock_wait.c: Moved
to ...
* sysdeps/unix/sysv/linux/i386/lll_timedlock_wait.c: Here.
* sysdeps/unix/sysv/linux/i386/i486/lll_timedwait_tid.c: Moved
to ...
* sysdeps/unix/sysv/linux/i386/lll_timedwait_tid.c: Here.
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Moved to ...
* sysdeps/unix/sysv/linux/i386/lowlevellock.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Moved
to ...
* sysdeps/unix/sysv/linux/i386/lowlevelrobustlock.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S:
Moved to ...
* sysdeps/unix/sysv/linux/i386/pthread_barrier_wait.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S:
Moved to ...
* sysdeps/unix/sysv/linux/i386/pthread_cond_broadcast.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: Moved
to ...
* sysdeps/unix/sysv/linux/i386/pthread_cond_signal.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S:
Moved to ...
* sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S: Here.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Moved
to ...
* sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S: Here.
* sysdeps/unix/sysv/linux/i386/i586/libc-lowlevellock.S:
Removed.
* sysdeps/unix/sysv/linux/i386/i586/lll_timedlock_wait.c:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/lll_timedwait_tid.c:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/lowlevellock.S: Likewise.
* sysdeps/unix/sysv/linux/i386/i586/lowlevelrobustlock.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/pthread_barrier_wait.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_broadcast.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_signal.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_timedwait.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i586/pthread_cond_wait.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/libc-lowlevellock.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/lll_timedlock_wait.c:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/lll_timedwait_tid.c:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/lowlevellock.S: Likewise.
* sysdeps/unix/sysv/linux/i386/i686/lowlevelrobustlock.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/pthread_barrier_wait.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_broadcast.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_signal.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_wait.S:
Likewise.
* sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S:
Replace ../i486/pthread_cond_timedwait.S with
../pthread_cond_timedwait.S.
2015-09-30 10:12:44 -07:00
