From 7588880f50f551cb60a99e2dd2068fdc170e5435 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 13 Mar 2003 01:51:12 +0000 Subject: Update. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add libc_multiple_threads. * sysdeps/unix/sysv/linux/libc_pthread_init.c: Move definition of __libc_multiple_threads to... * sysdeps/unix/sysv/linux/libc_multiple_threads.c: ...here. New file. * sysdeps/unix/sysv/linux/x86_64/sem_post.S: Remove unnecessary versioning. * sysdeps/unix/sysv/linux/x86_64/sem_trywait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_once.S (__pthread_once_internal): Define. * sysdeps/unix/sysv/linux/i386/i486/sem_post.S: Use shlib-compat.h macros instead of .symver directly. * sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Likewise. --- nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S') diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S index 8c93dcaa07..5f0f3d5d12 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S @@ -33,10 +33,10 @@ .text - .globl __new_sem_trywait - .type __new_sem_trywait,@function + .globl sem_trywait + .type sem_trywait,@function .align 16 -__new_sem_trywait: +sem_trywait: movl (%rdi), %eax 2: testl %eax, %eax jz 1f @@ -59,10 +59,5 @@ __new_sem_trywait: #endif orl $-1, %eax retq - .size __new_sem_trywait,.-__new_sem_trywait - .symver __new_sem_trywait, sem_trywait@@GLIBC_2.1 -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) - .global __old_sem_trywait -__old_sem_trywait = __new_sem_trywait - .symver __old_sem_trywait, sem_trywait@GLIBC_2.0 -#endif + .size sem_trywait,.-sem_trywait + versioned_symbol(libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1) -- cgit 1.4.1