diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-03-10 22:11:26 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-10 22:11:26 +0000 |
| commit | 9356d063dff7b46f10afe440da2a63b2e130c3fa (patch) | |
| tree | cdc4cc2c208db6ae5f248cd4a68def9fb24f3dd2 /nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | |
| parent | 146fa1ee6885033406049a6d0f80d64b1c5bd99e (diff) | |
| download | glibc-9356d063dff7b46f10afe440da2a63b2e130c3fa.tar.gz glibc-9356d063dff7b46f10afe440da2a63b2e130c3fa.tar.xz glibc-9356d063dff7b46f10afe440da2a63b2e130c3fa.zip | |
Update.
* 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.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index acff4c580d..611eb335b5 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -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 |