From b274130206cb9fce1d7b026386a910428cbdb45c Mon Sep 17 00:00:00 2001 From: Paul Pluzhnikov Date: Wed, 20 Jan 2016 13:39:20 -0800 Subject: 2016-01-20 Paul Pluzhnikov [BZ #19490] * sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S (pthread_cond_broadcast): Use ENTRY/END * sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S (pthread_cond_signal): Likewise * sysdeps/x86_64/nptl/pthread_spin_lock.S (pthread_spin_lock): Likewise * sysdeps/x86_64/nptl/pthread_spin_trylock.S (pthread_spin_trylock): Likewise * sysdeps/x86_64/nptl/pthread_spin_unlock.S (pthread_spin_unlock): Likewise --- sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S | 8 +++----- sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S index b32397ca..de455dd 100644 --- a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -28,10 +28,7 @@ .text /* int pthread_cond_broadcast (pthread_cond_t *cond) */ - .globl __pthread_cond_broadcast - .type __pthread_cond_broadcast, @function - .align 16 -__pthread_cond_broadcast: +ENTRY(__pthread_cond_broadcast) LIBC_PROBE (cond_broadcast, 1, %rdi) @@ -174,6 +171,7 @@ __pthread_cond_broadcast: movl $SYS_futex, %eax syscall jmp 10b - .size __pthread_cond_broadcast, .-__pthread_cond_broadcast +END(__pthread_cond_broadcast) + versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast, GLIBC_2_3_2) diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S index 84665d7..da14bc3 100644 --- a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -28,11 +28,7 @@ .text - /* int pthread_cond_signal (pthread_cond_t *cond) */ - .globl __pthread_cond_signal - .type __pthread_cond_signal, @function - .align 16 -__pthread_cond_signal: +ENTRY(__pthread_cond_signal) LIBC_PROBE (cond_signal, 1, %rdi) @@ -159,6 +155,7 @@ __pthread_cond_signal: cmovne %eax, %esi callq __lll_unlock_wake jmp 6b - .size __pthread_cond_signal, .-__pthread_cond_signal +END(__pthread_cond_signal) + versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal, GLIBC_2_3_2) -- cgit v1.1