mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 18:53:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update.

Browse Source 
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Don't define
	LOCK is already defined.  Don't define lll_unlock_wake_cb and
	__lll_timedwait_tid for libc.so.
	* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Only
	define LOCK here (if UP is not defined).  The actual code is in
	lowlevellock.S.
This commit is contained in:
Ulrich Drepper 2003-03-10 22:11:26 +00:00
parent 146fa1ee68
commit 9356d063df
3 changed files with 25 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nptl/ChangeLog
View File

@ -1,5 +1,12 @@
2003-03-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Don't define
LOCK is already defined. Don't define lll_unlock_wake_cb and
__lll_timedwait_tid for libc.so.
* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Only
define LOCK here (if UP is not defined). The actual code is in
lowlevellock.S.
* sysdeps/unix/sysv/linux/i386/lowlevelsem.h: New needed anymore.
* sysdeps/unix/sysv/linux/s390/lowlevelsem.h: Likewise.
* sysdeps/unix/sysv/linux/s390/sem_post.c: Include lowlevellock.h

73
nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
View File

@ -17,73 +17,14 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <sysdep.h>
#include <tls.h>
.text
#define SYS_gettimeofday __NR_gettimeofday
#define SYS_futex 240
#define FUTEX_WAIT 0
#define FUTEX_WAKE 1
#define ETIMEDOUT 110
.globl __lll_lock_wait
.type __lll_lock_wait,@function
.hidden __lll_lock_wait
.align 16
__lll_lock_wait:
pushl %esi
pushl %ebx
pushl %edx
movl %ecx, %ebx
xorl %esi, %esi /* No timeout. */
xorl %ecx, %ecx /* movl $FUTEX_WAIT, %ecx */
1:
leal -1(%eax), %edx /* account for the preceeded xadd. */
movl $SYS_futex, %eax
ENTER_KERNEL
orl $-1, %eax /* Load -1. */
/* In libc.so we do not unconditionally use the lock prefix. Only if
the application is using threads. */
#ifndef UP
cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
je,pt 0f
lock
# define LOCK \
cmpl $0, %gs:MULTIPLE_THREADS_OFFSET; \
je,pt 0f; \
lock; \
0:
#endif
xaddl %eax, (%ebx)
jne,pn 1b
movl $-1, (%ebx)
popl %edx
popl %ebx
popl %esi
ret
.size __lll_lock_wait,.-__lll_lock_wait
.globl __lll_unlock_wake
.type __lll_unlock_wake,@function
.hidden __lll_unlock_wake
.align 16
__lll_unlock_wake:
pushl %ebx
pushl %ecx
pushl %edx
movl %eax, %ebx
1: movl $FUTEX_WAKE, %ecx
movl $1, %edx /* Wake one thread. */
movl $SYS_futex, %eax
movl %edx, (%ebx) /* Stores '$1'. */
ENTER_KERNEL
popl %edx
popl %ecx
popl %ebx
ret
.size __lll_unlock_wake,.-__lll_unlock_wake
#include "lowlevellock.S"

16
nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
View File

@ -21,10 +21,12 @@
.text
#ifdef UP
# define LOCK
#else
# define LOCK lock
#ifndef LOCK
# ifdef UP
# define LOCK
# else
# define LOCK lock
# endif
#endif
#define SYS_gettimeofday __NR_gettimeofday
@ -66,6 +68,7 @@ __lll_lock_wait:
.size __lll_lock_wait,.-__lll_lock_wait
#ifdef NOT_IN_libc
.globl lll_unlock_wake_cb
.type lll_unlock_wake_cb,@function
.hidden lll_unlock_wake_cb
@ -85,6 +88,7 @@ lll_unlock_wake_cb:
popl %ebx
ret
.size lll_unlock_wake_cb,.-lll_unlock_wake_cb
#endif
.globl __lll_unlock_wake
@ -99,8 +103,8 @@ __lll_unlock_wake:
movl %eax, %ebx
1: movl $FUTEX_WAKE, %ecx
movl $1, %edx /* Wake one thread. */
movl %edx, (%ebx) /* Stores '$1'. */
movl $SYS_futex, %eax
movl %edx, (%ebx) /* Stores '$1'. */
ENTER_KERNEL
popl %edx
@ -110,6 +114,7 @@ __lll_unlock_wake:
.size __lll_unlock_wake,.-__lll_unlock_wake
#ifdef NOT_IN_libc
.globl __lll_timedwait_tid
.type __lll_timedwait_tid,@function
.hidden __lll_timedwait_tid
@ -175,3 +180,4 @@ __lll_timedwait_tid:
6: movl $ETIMEDOUT, %eax
jmp 3b
.size __lll_timedwait_tid,.-__lll_timedwait_tid
#endif