nptl: Reinstate pthread_timedjoin_np as a cancellation point (BZ#24215)

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / i386 / lowlevellock.S

diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/lowlevellock.S
index b5f5b5b11c14fc0be59d7e3b851774c4faf4527f..83191a38992c4a609dceae5a96e73812a1e80af6 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.S
@@ -365,70 +365,4 @@ __lll_unlock_wake:
        ret
        cfi_endproc
        .size   __lll_unlock_wake,.-__lll_unlock_wake
-
-       .globl  __lll_timedwait_tid
-       .type   __lll_timedwait_tid,@function
-       .hidden __lll_timedwait_tid
-       .align  16
-__lll_timedwait_tid:
-       pushl   %edi
-       pushl   %esi
-       pushl   %ebx
-       pushl   %ebp
-
-       movl    %eax, %ebp
-       movl    %edx, %edi
-       subl    $8, %esp
-
-       /* Get current time.  */
-2:     movl    %esp, %ebx
-       xorl    %ecx, %ecx
-       movl    $__NR_gettimeofday, %eax
-       ENTER_KERNEL
-
-       /* Compute relative timeout.  */
-       movl    4(%esp), %eax
-       movl    $1000, %edx
-       mul     %edx            /* Milli seconds to nano seconds.  */
-       movl    (%edi), %ecx
-       movl    4(%edi), %edx
-       subl    (%esp), %ecx
-       subl    %eax, %edx
-       jns     5f
-       addl    $1000000000, %edx
-       subl    $1, %ecx
-5:     testl   %ecx, %ecx
-       js      6f              /* Time is already up.  */
-
-       movl    %ecx, (%esp)    /* Store relative timeout.  */
-       movl    %edx, 4(%esp)
-
-       movl    (%ebp), %edx
-       testl   %edx, %edx
-       jz      4f
-
-       movl    %esp, %esi
-       /* XXX The kernel so far uses global futex for the wakeup at
-          all times.  */
-       xorl    %ecx, %ecx      /* movl $FUTEX_WAIT, %ecx */
-       movl    %ebp, %ebx
-       movl    $SYS_futex, %eax
-       ENTER_KERNEL
-
-       cmpl    $0, (%ebx)
-       jne     1f
-4:     xorl    %eax, %eax
-
-3:     addl    $8, %esp
-       popl    %ebp
-       popl    %ebx
-       popl    %esi
-       popl    %edi
-       ret
-
-1:     cmpl    $-ETIMEDOUT, %eax
-       jne     2b
-6:     movl    $ETIMEDOUT, %eax
-       jmp     3b
-       .size   __lll_timedwait_tid,.-__lll_timedwait_tid
 #endif