From a574db341f6583a625f529493ec423ab436f69c9 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 13 Sep 2012 06:01:04 -0700 Subject: Use STB_SECONDARY on pthread functions in libc Use STB_SECONDARY binding on pthread functions in libc so that they will be preempted by definitions in libpthread at link-time as well as at run-time. * csu/libc-tls.c (__pthread_initialize_minimal): Mark it secondary if HAVE_ASM_SECONDARY_DIRECTIVE is defined. * misc/error.c (error): Replace pthread_setcancelstate with __pthread_setcancelstate. (error_at_line): Likewise. * posix/wordexp.c (parse_comm): Likewise. * stdlib/fmtmsg.c (fmtmsg): Likewise. * nptl/Makefile: Include ../Makeconfig. (libc-libpthread-routines): New macro. (libc-libpthread-static-only-routines): Likewise. (static-only-routines): Add $(libc-libpthread-static-only-routines) if $(have-secondary) is yes. (routines): Add $(libc-libpthread-routines) if $(have-secondary) is yes. (CFLAGS-libc-pthread_unwind.c): New. * nptl/Versions [HAVE_ASM_SECONDARY_DIRECTIVE] (libc:GLIBC_2.0): Add _pthread_cleanup_pop_restore, _pthread_cleanup_push_defer, __pthread_getspecific, __pthread_setspecific, __pthread_key_create, pthread_once, __pthread_once, __pthread_mutex_lock and __pthread_mutex_unlock. [HAVE_ASM_SECONDARY_DIRECTIVE] (libc:GLIBC_2.2): Add __pthread_rwlock_init, __pthread_rwlock_destroy, __pthread_rwlock_rdlock, __pthread_rwlock_wrlock and __pthread_rwlock_unlock. [HAVE_ASM_SECONDARY_DIRECTIVE] (libc:GLIBC_PRIVATE): Add __pthread_unwind and __pthread_setcancelstate. [HAVE_ASM_SECONDARY_DIRECTIVE] (libpthread:GLIBC_PRIVATE): Add __pthread_setcancelstate. * nptl/forward.c [HAVE_ASM_SECONDARY_DIRECTIVE] (FORWARD2): New. (FORWARD_NORETURN): Likewise. (pthread_setcancelstate): Renamed to ... (__pthread_setcancelstate): This. Don't define if (__pthread_unwind): Don't define if HAVE_ASM_SECONDARY_DIRECTIVE is defined. * nptl/libc-cleanup_defer_compat.c: New file. * nptl/libc-pthread_getspecific.c: Likewise. * nptl/libc-pthread_key_create.c: Likewise. * nptl/libc-pthread_mutex_lock.c: Likewise. * nptl/libc-pthread_mutex_unlock.c: Likewise. * nptl/libc-pthread_once.c: Likewise. * nptl/libc-pthread_rwlock_destroy.c: Likewise. * nptl/libc-pthread_rwlock_init.c: Likewise. * nptl/libc-pthread_rwlock_rdlock.c: Likewise. * nptl/libc-pthread_rwlock_unlock.c: Likewise. * nptl/libc-pthread_rwlock_wrlock.c: Likewise. * nptl/libc-pthread_setcancelstate.c: Likewise. * nptl/libc-pthread_setspecific.c: Likewise. * nptl/libc-pthread_unwind.c: Likewise. * nptl/nptl-init.c (pthread_functions): Don't include secondary pthread functions in libc if HAVE_ASM_SECONDARY_DIRECTIVE is defined. Replace ptr_pthread_setcancelstate with ptr___pthread_setcancelstate. * sysdeps/nptl/pthread-functions.h (pthread_functions): Likewise. * nptl/pthreadP.h (__pthread_unwind): Don't mark it weak if HAVE_ASM_SECONDARY_DIRECTIVE is defined. (__pthread_cond_broadcast_2_0): Declare only if not in libc. (__pthread_cond_destroy_2_0): Likewise. (__pthread_cond_init_2_0): Likewise. (__pthread_cond_signal_2_0): Likewise. (__pthread_cond_timedwait_2_0): Likewise. (__pthread_cond_wait_2_0): Likewise. * scripts/abilist.awk: Support secondary symbols. * sysdeps/generic/localplt.data: Allow pthread functions. * sysdeps/unix/sysv/linux/i386/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/i386/localplt.data: Likewise. * sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: Likewise. * sysdeps/nptl/bits/libc-lockP.h (PTFAVAIL): Defined as 1 if HAVE_ASM_SECONDARY_DIRECTIVE is defined. (__libc_maybe_call): Always call FUNC if HAVE_ASM_SECONDARY_DIRECTIVE is defined. (__libc_ptf_call): Likewise. (__libc_ptf_call_always): Likewise. (__pthread_mutex_init): Don't mark it weak if HAVE_ASM_SECONDARY_DIRECTIVE is defined. (__pthread_mutex_destroy): Likewise. (__pthread_mutex_lock): Likewise. (__pthread_mutex_trylock): Likewise. (__pthread_mutex_unlock): Likewise. (__pthread_mutexattr_init): Likewise. (__pthread_mutexattr_destroy): Likewise. (__pthread_mutexattr_settype): Likewise. (__pthread_rwlock_destroy): Likewise. (__pthread_rwlock_rdlock): Likewise. (__pthread_rwlock_tryrdlock): Likewise. (__pthread_rwlock_wrlock): Likewise. (__pthread_rwlock_trywrlock): Likewise. (__pthread_rwlock_unlock): Likewise. (__pthread_key_create): Likewise. (__pthread_setspecific): Likewise. (__pthread_getspecific): Likewise. (__pthread_once): Likewise. (__pthread_initialize): Likewise. (__pthread_atfork): Likewise. (_pthread_cleanup_push_defer): Likewise. (_pthread_cleanup_pop_restore): Likewise. (__pthread_setcancelstate): New prototype. (pthread_setcancelstate): Renamed to ... (__pthread_setcancelstate): This. Don't mark it weak if HAVE_ASM_SECONDARY_DIRECTIVE is defined. * sysdeps/unix/sysv/linux/x86_64/cancellation.S (__pthread_unwind): Likewise. * sysdeps/unix/sysv/linux/fatal-prepare.h (FATAL_PREPARE): Always call __pthread_setcancelstate if HAVE_ASM_SECONDARY_DIRECTIVE is defined. Replace pthread_setcancelstate with __pthread_setcancelstate. * sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Make __lll_lock_wait_private and __lll_unlock_wake_private weak in libc.a. * sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S: Likewise. --- nptl/libc-pthread_mutex_lock.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 nptl/libc-pthread_mutex_lock.c (limited to 'nptl/libc-pthread_mutex_lock.c') diff --git a/nptl/libc-pthread_mutex_lock.c b/nptl/libc-pthread_mutex_lock.c new file mode 100644 index 0000000000..15b97b1045 --- /dev/null +++ b/nptl/libc-pthread_mutex_lock.c @@ -0,0 +1,32 @@ +/* Copyright (C) 2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifdef HAVE_ASM_SECONDARY_DIRECTIVE +# include "pthreadP.h" + +/* Make sure that it is used only when libpthread is not used. */ +asm (".secondary __pthread_mutex_lock"); +asm (".secondary pthread_mutex_lock"); + +int +__pthread_mutex_lock (pthread_mutex_t *mutex) +{ + return 0; +} + +strong_alias (__pthread_mutex_lock, pthread_mutex_lock) +#endif -- cgit v1.2.3-70-g09d2