This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/pthread/2.22 created. glibc-2.21-673-g598a64f
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Sep 2015 21:33:22 -0000
- Subject: GNU C Library master sources branch hjl/pthread/2.22 created. glibc-2.21-673-g598a64f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/pthread/2.22 has been created
at 598a64f4fb1ae76533ff284ed1a3c7c30b519e58 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=598a64f4fb1ae76533ff284ed1a3c7c30b519e58
commit 598a64f4fb1ae76533ff284ed1a3c7c30b519e58
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Sep 15 14:29:35 2015 -0700
Fix __pthread_setcancelstate for i386
diff --git a/sysdeps/unix/sysv/linux/i386/localplt.data b/sysdeps/unix/sysv/linux/i386/localplt.data
index 574fca0..f9efb05 100644
--- a/sysdeps/unix/sysv/linux/i386/localplt.data
+++ b/sysdeps/unix/sysv/linux/i386/localplt.data
@@ -13,11 +13,11 @@ libc.so: __pthread_once
libc.so: __pthread_rwlock_rdlock
libc.so: __pthread_rwlock_unlock
libc.so: __pthread_rwlock_wrlock
+libc.so: __pthread_setcancelstate
libc.so: __pthread_setspecific
libc.so: __pthread_unwind
libc.so: _pthread_cleanup_pop_restore
libc.so: _pthread_cleanup_push_defer
-libc.so: pthread_setcancelstate
libm.so: matherr
# The dynamic loader uses __libc_memalign internally to allocate aligned
# TLS storage. The other malloc family of functions are expected to allow
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=61fce3ec76a4ff5522d392c57583728396c8048c
commit 61fce3ec76a4ff5522d392c57583728396c8048c
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Sep 15 12:53:55 2015 -0700
Fix __pthread_setcancelstate for x86-64
diff --git a/misc/error.c b/misc/error.c
index aaa120d..9d479d1 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -298,8 +298,8 @@ error (int status, int errnum, const char *message, ...)
/* We do not want this call to be cut short by a thread
cancellation. Therefore disable cancellation for now. */
int state = PTHREAD_CANCEL_ENABLE;
- __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
- 0);
+ __libc_ptf_call (__pthread_setcancelstate,
+ (PTHREAD_CANCEL_DISABLE, &state), 0);
#endif
flush_stdout ();
@@ -323,7 +323,7 @@ error (int status, int errnum, const char *message, ...)
#ifdef _LIBC
_IO_funlockfile (stderr);
# ifdef __libc_ptf_call
- __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
# endif
#endif
}
@@ -360,8 +360,8 @@ error_at_line (int status, int errnum, const char *file_name,
/* We do not want this call to be cut short by a thread
cancellation. Therefore disable cancellation for now. */
int state = PTHREAD_CANCEL_ENABLE;
- __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
- 0);
+ __libc_ptf_call (__pthread_setcancelstate,
+ (PTHREAD_CANCEL_DISABLE, &state), 0);
#endif
flush_stdout ();
@@ -393,7 +393,7 @@ error_at_line (int status, int errnum, const char *file_name,
#ifdef _LIBC
_IO_funlockfile (stderr);
# ifdef __libc_ptf_call
- __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
# endif
#endif
}
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 0a7c4ba..bda1df2 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -128,7 +128,7 @@ static const struct pthread_functions pthread_functions =
.ptr_pthread_mutex_lock = __pthread_mutex_lock,
.ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
.ptr_pthread_self = __pthread_self,
- .ptr_pthread_setcancelstate = __pthread_setcancelstate,
+ .ptr___pthread_setcancelstate = __pthread_setcancelstate,
.ptr_pthread_setcanceltype = __pthread_setcanceltype,
.ptr___pthread_once = __pthread_once,
.ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock,
diff --git a/posix/wordexp.c b/posix/wordexp.c
index e711d43..1e9fc85 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1186,7 +1186,7 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
// XXX Ideally we do want the thread being cancelable.
// XXX If demand is there we'll change it.
int state = PTHREAD_CANCEL_ENABLE;
- __libc_ptf_call (pthread_setcancelstate,
+ __libc_ptf_call (__pthread_setcancelstate,
(PTHREAD_CANCEL_DISABLE, &state), 0);
#endif
@@ -1194,7 +1194,7 @@ parse_comm (char **word, size_t *word_length, size_t *max_length,
flags, pwordexp, ifs, ifs_white);
#ifdef __libc_ptf_call
- __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
#endif
free (comm);
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index b8133dc..c2a46bd 100644
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -127,8 +127,8 @@ fmtmsg (long int classification, const char *label, int severity,
/* We do not want this call to be cut short by a thread
cancellation. Therefore disable cancellation for now. */
int state = PTHREAD_CANCEL_ENABLE;
- __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
- 0);
+ __libc_ptf_call (__pthread_setcancelstate,
+ (PTHREAD_CANCEL_DISABLE, &state), 0);
#endif
__libc_lock_lock (lock);
@@ -199,7 +199,7 @@ fmtmsg (long int classification, const char *label, int severity,
__libc_lock_unlock (lock);
#ifdef __libc_ptf_call
- __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
#endif
return result;
diff --git a/sysdeps/generic/localplt.data b/sysdeps/generic/localplt.data
index ed65301..5b1463f 100644
--- a/sysdeps/generic/localplt.data
+++ b/sysdeps/generic/localplt.data
@@ -8,6 +8,7 @@ libc.so: __pthread_once
libc.so: __pthread_rwlock_rdlock
libc.so: __pthread_rwlock_unlock
libc.so: __pthread_rwlock_wrlock
+libc.so: __pthread_setcancelstate
libc.so: __pthread_setspecific
libc.so: __pthread_unwind
libc.so: _pthread_cleanup_pop_restore
@@ -16,7 +17,6 @@ libc.so: calloc
libc.so: free
libc.so: malloc
libc.so: memalign
-libc.so: pthread_setcancelstate
libc.so: realloc
libm.so: matherr
# The dynamic loader uses __libc_memalign internally to allocate aligned
diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index c5ce3b2..0c28540 100644
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
@@ -103,6 +103,8 @@ typedef pthread_key_t __libc_key_t;
/* All pthread functions are available. */
# define PTFAVAIL(NAME) 1
+extern int __pthread_setcancelstate (int state, int *oldstate);
+
/* When secondary symbols are used, FUNC is implemented to return ELSE so
that we can always call FUNC. */
# define __libc_maybe_call(FUNC, ARGS, ELSE) FUNC ARGS
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 8e71e54..f6238ab 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -76,7 +76,7 @@ struct pthread_functions
int (*ptr_pthread_mutex_lock) (pthread_mutex_t *);
int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
pthread_t (*ptr_pthread_self) (void);
- int (*ptr_pthread_setcancelstate) (int, int *);
+ int (*ptr___pthread_setcancelstate) (int, int *);
int (*ptr_pthread_setcanceltype) (int, int *);
int (*ptr___pthread_once) (pthread_once_t *, void (*) (void));
int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *);
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/sysdeps/unix/sysv/linux/fatal-prepare.h
index 25f919c..b972321 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/sysdeps/unix/sysv/linux/fatal-prepare.h
@@ -20,7 +20,6 @@
/* We have to completely disable cancellation. assert() must not be a
cancellation point but the implementation uses write() etc. */
#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
-extern int __pthread_setcancelstate (int __state, int *__oldstate);
# define FATAL_PREPARE __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);
#else
# ifdef SHARED
diff --git a/sysdeps/x86_64/localplt.data b/sysdeps/x86_64/localplt.data
index d140476..6ca0152 100644
--- a/sysdeps/x86_64/localplt.data
+++ b/sysdeps/x86_64/localplt.data
@@ -3,6 +3,18 @@
# users can define their own functions and have library internals call them.
# Linker in binutils 2.26 and newer consolidates R_X86_64_JUMP_SLOT
# relocation with R_X86_64_GLOB_DAT relocation against the same symbol.
+# pthread functions may be preempted by libpthread at run-time.
+libc.so: __pthread_getspecific
+libc.so: __pthread_key_create
+libc.so: __pthread_once
+libc.so: __pthread_rwlock_rdlock
+libc.so: __pthread_rwlock_unlock
+libc.so: __pthread_rwlock_wrlock
+libc.so: __pthread_setcancelstate
+libc.so: __pthread_setspecific
+libc.so: __pthread_unwind
+libc.so: _pthread_cleanup_pop_restore
+libc.so: _pthread_cleanup_push_defer
libc.so: calloc
libc.so: free + RELA R_X86_64_GLOB_DAT
libc.so: malloc + RELA R_X86_64_GLOB_DAT
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=76a88ed95fbccd008453ffb9544d575d1ea8310e
commit 76a88ed95fbccd008453ffb9544d575d1ea8310e
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Sep 13 06:01:04 2012 -0700
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.
* 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-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 (pthread_attr_destroy): Don't define if
HAVE_ASM_SECONDARY_DIRECTIVE is defined.
(__pthread_attr_init_2_0): Likewise.
(__pthread_attr_init_2_1): Likewise.
(pthread_attr_getdetachstate): Likewise.
(pthread_attr_setdetachstate): Likewise.
(pthread_attr_getinheritsched): Likewise.
(pthread_attr_setinheritsched): Likewise.
(pthread_attr_getschedparam): Likewise.
(pthread_attr_setschedparam): Likewise.
(pthread_attr_getschedpolicy): Likewise.
(pthread_attr_setschedpolicy): Likewise.
(pthread_attr_getscope): Likewise.
(pthread_attr_setscope): Likewise.
(pthread_condattr_destroy): Likewise.
(pthread_condattr_init): Likewise.
(__pthread_cond_broadcast_2_0): Likewise.
(__pthread_cond_broadcast): Likewise.
(__pthread_cond_destroy_2_0): Likewise.
(__pthread_cond_destroy): Likewise.
(__pthread_cond_init_2_0): Likewise.
(__pthread_cond_init): Likewise.
(__pthread_cond_signal_2_0): Likewise.
(__pthread_cond_signal): Likewise.
(__pthread_cond_wait_2_0): Likewise.
(__pthread_cond_wait): Likewise.
(__pthread_cond_timedwait_2_0): Likewise.
(__pthread_cond_timedwait): Likewise.
(pthread_equal): Likewise.
(__pthread_exit): Likewise.
(pthread_getschedparam): Likewise.
(pthread_setschedparam): Likewise.
(pthread_mutex_destroy): Likewise.
(pthread_mutex_init): Likewise.
(pthread_mutex_lock): Likewise.
(pthread_mutex_unlock): Likewise.
(pthread_self): Likewise.
(pthread_setcancelstate): Likewise.
(pthread_setcanceltype): Likewise.
(__pthread_unwind): Likewise.
* nptl/libc-cleanup_defer_compat.c: New file.
* nptl/libc-pthread_attr_destroy.c: Likewise.
* nptl/libc-pthread_attr_getdetachstate.c: Likewise.
* nptl/libc-pthread_attr_getinheritsched.c: Likewise.
* nptl/libc-pthread_attr_getschedparam.c: Likewise.
* nptl/libc-pthread_attr_getschedpolicy.c: Likewise.
* nptl/libc-pthread_attr_getscope.c: Likewise.
* nptl/libc-pthread_attr_init.c: Likewise.
* nptl/libc-pthread_attr_setdetachstate.c: Likewise.
* nptl/libc-pthread_attr_setinheritsched.c: Likewise.
* nptl/libc-pthread_attr_setschedparam.c: Likewise.
* nptl/libc-pthread_attr_setschedpolicy.c: Likewise.
* nptl/libc-pthread_attr_setscope.c: Likewise.
* nptl/libc-pthread_cond_broadcast.c: Likewise.
* nptl/libc-pthread_cond_destroy.c: Likewise.
* nptl/libc-pthread_cond_init.c: Likewise.
* nptl/libc-pthread_cond_signal.c: Likewise.
* nptl/libc-pthread_cond_timedwait.c: Likewise.
* nptl/libc-pthread_cond_wait.c: Likewise.
* nptl/libc-pthread_condattr_destroy.c: Likewise.
* nptl/libc-pthread_condattr_init.c: Likewise.
* nptl/libc-pthread_equal.c: Likewise.
* nptl/libc-pthread_exit.c: Likewise.
* nptl/libc-pthread_getschedparam.c: Likewise.
* nptl/libc-pthread_getspecific.c: Likewise.
* nptl/libc-pthread_key_create.c: Likewise.
* nptl/libc-pthread_mutex_destroy.c: Likewise.
* nptl/libc-pthread_mutex_init.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_self.c: Likewise.
* nptl/libc-pthread_setcancelstate.c: Likewise.
* nptl/libc-pthread_setcanceltype.c: Likewise.
* nptl/libc-pthread_setschedparam.c: Likewise.
* nptl/libc-pthread_setspecific.c: Likewise.
* nptl/libc-unwind.c: Likewise.
* nptl-init.c (pthread_functions): Don't include secondary
pthread functions in libc if HAVE_ASM_SECONDARY_DIRECTIVE is
defined.
* 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): Likewise.
* 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.
* 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.
diff --git a/csu/libc-tls.c b/csu/libc-tls.c
index 3f13425..cc7c4ff 100644
--- a/csu/libc-tls.c
+++ b/csu/libc-tls.c
@@ -235,6 +235,11 @@ _dl_tls_setup (void)
}
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+/* Make sure that it is used only when libpthread.a is not used */
+asm (".secondary __pthread_initialize_minimal");
+#endif
+
/* This is the minimal initialization function used when libpthread is
not used. */
void
diff --git a/nptl/Makefile b/nptl/Makefile
index a10282f..5f0fef4 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -28,9 +28,58 @@ extra-libs := libpthread
extra-libs-others := $(extra-libs)
install-lib-ldscripts := libpthread.so
+include ../Makeconfig
+
routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \
libc-cleanup libc_pthread_init libc_multiple_threads \
register-atfork unregister-atfork
+ifeq (yes,$(have-secondary))
+libc-libpthread-routines = libc-cleanup_defer_compat \
+ libc-pthread_attr_destroy \
+ libc-pthread_attr_getdetachstate \
+ libc-pthread_attr_getinheritsched \
+ libc-pthread_attr_getschedparam \
+ libc-pthread_attr_getschedpolicy \
+ libc-pthread_attr_getscope \
+ libc-pthread_attr_init \
+ libc-pthread_attr_setdetachstate \
+ libc-pthread_attr_setinheritsched \
+ libc-pthread_attr_setschedparam \
+ libc-pthread_attr_setschedpolicy \
+ libc-pthread_attr_setscope \
+ libc-pthread_cond_broadcast \
+ libc-pthread_cond_destroy \
+ libc-pthread_cond_init \
+ libc-pthread_cond_signal \
+ libc-pthread_cond_timedwait \
+ libc-pthread_cond_wait \
+ libc-pthread_condattr_destroy \
+ libc-pthread_condattr_init \
+ libc-pthread_equal \
+ libc-pthread_exit \
+ libc-pthread_getschedparam \
+ libc-pthread_getspecific \
+ libc-pthread_key_create \
+ libc-pthread_once \
+ libc-pthread_mutex_destroy \
+ libc-pthread_mutex_init \
+ libc-pthread_mutex_lock \
+ libc-pthread_mutex_unlock \
+ libc-pthread_rwlock_rdlock \
+ libc-pthread_rwlock_unlock \
+ libc-pthread_rwlock_wrlock \
+ libc-pthread_self \
+ libc-pthread_setcancelstate \
+ libc-pthread_setcanceltype \
+ libc-pthread_setschedparam \
+ libc-pthread_setspecific \
+ libc-unwind
+libc-libpthread-static-only-routines = libc-pthread_rwlock_destroy \
+ libc-pthread_rwlock_init
+static-only-routines += $(libc-libpthread-static-only-routines)
+libc-libpthread-routines += $(libc-libpthread-static-only-routines)
+routines += $(libc-libpthread-routines)
+endif
shared-only-routines = forward
libpthread-routines = nptl-init vars events version pt-interp \
@@ -445,6 +494,10 @@ endif
# function frequently to get a thread-specific handle.
CFLAGS-pthread_self.os += -fomit-frame-pointer
+# __pthread_unwind can't call abort and GCC doesn't know kill won't
+# return.
+CFLAGS-libc-unwind.c += -Wno-error
+
# Run the cancellation and cleanup tests also for the modern, exception-based
# implementation. For this we have to pass the -fexceptions parameter.
CFLAGS-tst-cancelx2.c += -fexceptions
diff --git a/nptl/Versions b/nptl/Versions
index 34e4b46..20b399d 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -16,10 +16,26 @@ libc {
pthread_mutex_lock; pthread_mutex_unlock;
pthread_self;
pthread_setcancelstate; pthread_setcanceltype;
+#if HAVE_ASM_SECONDARY_DIRECTIVE
+ # Provide additional secondary pthread functions.
+ _pthread_cleanup_pop_restore; _pthread_cleanup_push_defer;
+ __pthread_getspecific; __pthread_setspecific;
+ __pthread_key_create;
+ pthread_once;
+ __pthread_once;
+ __pthread_mutex_lock; __pthread_mutex_unlock;
+#endif
}
GLIBC_2.1 {
pthread_attr_init;
}
+#if HAVE_ASM_SECONDARY_DIRECTIVE
+ GLIBC_2.2 {
+ # Provide additional secondary pthread functions.
+ __pthread_rwlock_rdlock; __pthread_rwlock_wrlock;
+ __pthread_rwlock_unlock;
+ }
+#endif
GLIBC_2.3.2 {
__register_atfork;
@@ -36,6 +52,11 @@ libc {
__libc_pthread_init;
__libc_current_sigrtmin_private; __libc_current_sigrtmax_private;
__libc_allocate_rtsig_private;
+#if HAVE_ASM_SECONDARY_DIRECTIVE
+ # Provide additional secondary pthread function.
+ __pthread_unwind;
+ __pthread_setcancelstate;
+#endif
}
}
@@ -274,6 +295,9 @@ libpthread {
__pthread_clock_gettime; __pthread_clock_settime;
__pthread_unwind; __pthread_get_minstack;
__pthread_barrier_init; __pthread_barrier_wait;
+#if HAVE_ASM_SECONDARY_DIRECTIVE
+ __pthread_setcancelstate;
+#endif
__shm_directory;
}
}
diff --git a/nptl/forward.c b/nptl/forward.c
index db74f8d..8f11708 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -31,6 +31,7 @@ struct pthread_functions __libc_pthread_functions attribute_hidden;
int __libc_pthread_functions_init attribute_hidden;
+#ifndef HAVE_ASM_SECONDARY_DIRECTIVE
#define FORWARD2(name, rettype, decl, params, defaction) \
rettype \
name decl \
@@ -207,3 +208,4 @@ FORWARD_NORETURN (__pthread_unwind,
__cleanup_fct_attribute attribute_compat_text_section,
(__pthread_unwind_buf_t *buf), (buf),
__safe_fatal ())
+#endif
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/nptl/libc-cleanup_defer_compat.c
similarity index 52%
copy from sysdeps/unix/sysv/linux/fatal-prepare.h
copy to nptl/libc-cleanup_defer_compat.c
index 45d88ce..ae981aa 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/nptl/libc-cleanup_defer_compat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
+/* 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
@@ -15,23 +15,26 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <pthread.h>
-
-/* We have to completely disable cancellation. assert() must not be a
- cancellation point but the implementation uses write() etc. */
-#ifdef SHARED
-# include <pthread-functions.h>
-# define FATAL_PREPARE \
- { \
- if (__libc_pthread_functions_init) \
- PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
- NULL)); \
- }
-#else
-# pragma weak pthread_setcancelstate
-# define FATAL_PREPARE \
- { \
- if (pthread_setcancelstate != NULL) \
- pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
- }
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used */
+asm (".secondary _pthread_cleanup_push_defer");
+
+void
+_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
+ void (*routine) (void *), void *arg)
+{
+}
+
+/* Make sure that it is used only when libpthread is not used */
+asm (".secondary _pthread_cleanup_pop_restore");
+
+void
+_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
+ int execute)
+{
+ if (execute)
+ buffer->__routine (buffer->__arg);
+}
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_destroy.c
similarity index 71%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_destroy.c
index 111e9c8..6c56c87 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_destroy.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_destroy");
+
+int
+pthread_attr_destroy (pthread_attr_t *attr)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_getdetachstate.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_getdetachstate.c
index 111e9c8..aa950ad 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_getdetachstate.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_getdetachstate");
+
+int
+pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_getinheritsched.c
similarity index 69%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_getinheritsched.c
index 111e9c8..8a0529c 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_getinheritsched.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_getinheritsched");
+
+int
+pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inherit)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_getschedparam.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_getschedparam.c
index 111e9c8..866e2f0 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_getschedparam.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_getschedparam");
+
+int
+pthread_attr_getschedparam (const pthread_attr_t *attr,
+ struct sched_param *param)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_getschedpolicy.c
similarity index 69%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_getschedpolicy.c
index 111e9c8..241111c 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_getschedpolicy.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_getschedpolicy");
+
+int
+pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_getscope.c
similarity index 70%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_getscope.c
index 111e9c8..feaa76f 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_getscope.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_getscope");
+
+int
+pthread_attr_getscope (const pthread_attr_t *attr, int *scope)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/nptl/libc-pthread_attr_init.c
similarity index 51%
copy from sysdeps/unix/sysv/linux/fatal-prepare.h
copy to nptl/libc-pthread_attr_init.c
index 45d88ce..0c2c76d 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/nptl/libc-pthread_attr_init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
+/* 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
@@ -15,23 +15,28 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <pthread.h>
-
-/* We have to completely disable cancellation. assert() must not be a
- cancellation point but the implementation uses write() etc. */
-#ifdef SHARED
-# include <pthread-functions.h>
-# define FATAL_PREPARE \
- { \
- if (__libc_pthread_functions_init) \
- PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
- NULL)); \
- }
-#else
-# pragma weak pthread_setcancelstate
-# define FATAL_PREPARE \
- { \
- if (pthread_setcancelstate != NULL) \
- pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
- }
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_attr_init_2_1");
+
+int
+__pthread_attr_init_2_1 (pthread_attr_t *attr)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init,
+ GLIBC_2_1);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_attr_init_2_0");
+
+strong_alias (__pthread_attr_init_2_1, __pthread_attr_init_2_0)
+compat_symbol (libc, __pthread_attr_init_2_0, pthread_attr_init,
+ GLIBC_2_0);
+#endif
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_setdetachstate.c
similarity index 69%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_setdetachstate.c
index 111e9c8..28aedf9 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_setdetachstate.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_setdetachstate");
+
+int
+pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_setinheritsched.c
similarity index 69%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_setinheritsched.c
index 111e9c8..0b6458e 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_setinheritsched.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_setinheritsched");
+
+int
+pthread_attr_setinheritsched (pthread_attr_t *attr, int inherit)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_setschedparam.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_setschedparam.c
index 111e9c8..c61c0f2 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_setschedparam.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_setschedparam");
+
+int
+pthread_attr_setschedparam (pthread_attr_t *attr,
+ const struct sched_param *param)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_setschedpolicy.c
similarity index 69%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_setschedpolicy.c
index 111e9c8..62ce414 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_setschedpolicy.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_setschedpolicy");
+
+int
+pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_attr_setscope.c
similarity index 70%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_attr_setscope.c
index 111e9c8..9560bd8 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_attr_setscope.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_attr_setscope");
+
+int
+pthread_attr_setscope (pthread_attr_t *attr, int scope)
+{
+ return 0;
+}
+#endif
diff --git a/nptl/libc-pthread_cond_broadcast.c b/nptl/libc-pthread_cond_broadcast.c
new file mode 100644
index 0000000..82ee1fc
--- /dev/null
+++ b/nptl/libc-pthread_cond_broadcast.c
@@ -0,0 +1,42 @@
+/* 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_broadcast");
+
+int
+__pthread_cond_broadcast (pthread_cond_t *cond)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_cond_broadcast,
+ pthread_cond_broadcast, GLIBC_2_3_2);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_broadcast_2_0");
+
+strong_alias (__pthread_cond_broadcast, __pthread_cond_broadcast_2_0)
+compat_symbol (libc, __pthread_cond_broadcast_2_0,
+ pthread_cond_broadcast, GLIBC_2_0);
+#endif
+#endif
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/nptl/libc-pthread_cond_destroy.c
similarity index 50%
copy from sysdeps/unix/sysv/linux/fatal-prepare.h
copy to nptl/libc-pthread_cond_destroy.c
index 45d88ce..fbb37c9 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/nptl/libc-pthread_cond_destroy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
+/* 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
@@ -15,23 +15,28 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <pthread.h>
-
-/* We have to completely disable cancellation. assert() must not be a
- cancellation point but the implementation uses write() etc. */
-#ifdef SHARED
-# include <pthread-functions.h>
-# define FATAL_PREPARE \
- { \
- if (__libc_pthread_functions_init) \
- PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
- NULL)); \
- }
-#else
-# pragma weak pthread_setcancelstate
-# define FATAL_PREPARE \
- { \
- if (pthread_setcancelstate != NULL) \
- pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
- }
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_destroy");
+
+int
+__pthread_cond_destroy (pthread_cond_t *cond)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_cond_destroy, pthread_cond_destroy,
+ GLIBC_2_3_2);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_destroy_2_0");
+
+strong_alias (__pthread_cond_destroy, __pthread_cond_destroy_2_0)
+compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy,
+ GLIBC_2_0);
+#endif
#endif
diff --git a/nptl/libc-pthread_cond_init.c b/nptl/libc-pthread_cond_init.c
new file mode 100644
index 0000000..7a0e9d8
--- /dev/null
+++ b/nptl/libc-pthread_cond_init.c
@@ -0,0 +1,43 @@
+/* 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_init");
+
+int
+__pthread_cond_init (pthread_cond_t *cond,
+ const pthread_condattr_t *cond_attr)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_cond_init, pthread_cond_init,
+ GLIBC_2_3_2);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_init_2_0");
+
+strong_alias (__pthread_cond_init, __pthread_cond_init_2_0)
+compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init,
+ GLIBC_2_0);
+#endif
+#endif
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/nptl/libc-pthread_cond_signal.c
similarity index 50%
copy from sysdeps/unix/sysv/linux/fatal-prepare.h
copy to nptl/libc-pthread_cond_signal.c
index 45d88ce..af55223 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/nptl/libc-pthread_cond_signal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
+/* 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
@@ -15,23 +15,28 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <pthread.h>
-
-/* We have to completely disable cancellation. assert() must not be a
- cancellation point but the implementation uses write() etc. */
-#ifdef SHARED
-# include <pthread-functions.h>
-# define FATAL_PREPARE \
- { \
- if (__libc_pthread_functions_init) \
- PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
- NULL)); \
- }
-#else
-# pragma weak pthread_setcancelstate
-# define FATAL_PREPARE \
- { \
- if (pthread_setcancelstate != NULL) \
- pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
- }
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_signal");
+
+int
+__pthread_cond_signal (pthread_cond_t *cond)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_cond_signal, pthread_cond_signal,
+ GLIBC_2_3_2);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_signal_2_0");
+
+strong_alias (__pthread_cond_signal, __pthread_cond_signal_2_0)
+compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal,
+ GLIBC_2_0);
+#endif
#endif
diff --git a/nptl/libc-pthread_cond_timedwait.c b/nptl/libc-pthread_cond_timedwait.c
new file mode 100644
index 0000000..2021efd
--- /dev/null
+++ b/nptl/libc-pthread_cond_timedwait.c
@@ -0,0 +1,43 @@
+/* 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_timedwait");
+
+int
+__pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ const struct timespec *abstime)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait,
+ GLIBC_2_3_2);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_timedwait_2_0");
+
+strong_alias (__pthread_cond_timedwait, __pthread_cond_timedwait_2_0)
+compat_symbol (libc, __pthread_cond_timedwait_2_0, pthread_cond_timedwait,
+ GLIBC_2_0);
+#endif
+#endif
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/nptl/libc-pthread_cond_wait.c
similarity index 50%
copy from sysdeps/unix/sysv/linux/fatal-prepare.h
copy to nptl/libc-pthread_cond_wait.c
index 45d88ce..ae8c5d1 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/nptl/libc-pthread_cond_wait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 Free Software Foundation, Inc.
+/* 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
@@ -15,23 +15,28 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <pthread.h>
-
-/* We have to completely disable cancellation. assert() must not be a
- cancellation point but the implementation uses write() etc. */
-#ifdef SHARED
-# include <pthread-functions.h>
-# define FATAL_PREPARE \
- { \
- if (__libc_pthread_functions_init) \
- PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
- NULL)); \
- }
-#else
-# pragma weak pthread_setcancelstate
-# define FATAL_PREPARE \
- { \
- if (pthread_setcancelstate != NULL) \
- pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
- }
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+#include <shlib-compat.h>
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_wait");
+
+int
+__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+ return 0;
+}
+
+versioned_symbol (libc, __pthread_cond_wait, pthread_cond_wait,
+ GLIBC_2_3_2);
+
+#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2)
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_cond_wait_2_0");
+
+strong_alias (__pthread_cond_wait, __pthread_cond_wait_2_0)
+compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait,
+ GLIBC_2_0);
+#endif
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_condattr_destroy.c
similarity index 70%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_condattr_destroy.c
index 111e9c8..3bed18b 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_condattr_destroy.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_condattr_destroy");
+
+int
+pthread_condattr_destroy (pthread_condattr_t *attr)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_condattr_init.c
similarity index 71%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_condattr_init.c
index 111e9c8..b82b733 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_condattr_init.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_condattr_init");
+
+int
+pthread_condattr_init (pthread_condattr_t *attr)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_equal.c
similarity index 71%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_equal.c
index 111e9c8..aa275c4 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_equal.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_equal");
+
+int
+pthread_equal (pthread_t thread1, pthread_t thread2)
+{
+ return 1;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_exit.c
similarity index 65%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_exit.c
index 111e9c8..db70119 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_exit.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,19 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include <stdlib.h>
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_exit");
+asm (".secondary pthread_exit");
+
+void
+__pthread_exit (void *retval)
+{
+ exit (EXIT_SUCCESS);
+}
+
+strong_alias (__pthread_exit, pthread_exit)
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_getschedparam.c
similarity index 67%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_getschedparam.c
index 111e9c8..f4855da 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_getschedparam.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_getschedparam");
+
+int
+pthread_getschedparam (pthread_t target_thread, int *policy,
+ struct sched_param *param)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_getspecific.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_getspecific.c
index 111e9c8..31a0258 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_getspecific.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include <stdlib.h>
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_getspecific");
+
+void *
+__pthread_getspecific (pthread_key_t key)
+{
+ /* Not valid. */
+ return NULL;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_key_create.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_key_create.c
index 111e9c8..9e28147 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_key_create.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include <errno.h>
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_key_create");
+
+int
+__pthread_key_create (pthread_key_t *key, void (*destr) (void *))
+{
+ return EINVAL;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_mutex_destroy.c
similarity index 71%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_mutex_destroy.c
index 111e9c8..f9db255 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_mutex_destroy.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_mutex_destroy");
+
+int
+pthread_mutex_destroy (pthread_mutex_t *mutex)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_mutex_init.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_mutex_init.c
index 111e9c8..0e1f729 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_mutex_init.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_mutex_init");
+
+int
+pthread_mutex_init (pthread_mutex_t *mutex,
+ const pthread_mutexattr_t *mutexattr)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_mutex_lock.c
similarity index 65%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_mutex_lock.c
index 111e9c8..4c73afc 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_mutex_lock.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#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
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_mutex_unlock.c
similarity index 64%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_mutex_unlock.c
index 111e9c8..7c06b16 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_mutex_unlock.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_mutex_unlock");
+asm (".secondary pthread_mutex_unlock");
+
+int
+__pthread_mutex_unlock (pthread_mutex_t *mutex)
+{
+ return 0;
+}
+
+strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock)
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_once.c
similarity index 59%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_once.c
index 111e9c8..ed26e06 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_once.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,23 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_once");
+asm (".secondary pthread_once");
+
+int
+__pthread_once (pthread_once_t *once_control,
+ void (*init_routine) (void))
+{
+ if (*once_control == PTHREAD_ONCE_INIT)
+ {
+ init_routine ();
+ *once_control |= 2;
+ }
+ return 0;
+}
+strong_alias (__pthread_once, pthread_once)
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_rwlock_destroy.c
similarity index 70%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_rwlock_destroy.c
index 111e9c8..181ba05 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_rwlock_destroy.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_rwlock_destroy");
+
+int
+__pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_rwlock_init.c
similarity index 68%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_rwlock_init.c
index 111e9c8..4e50ad9 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_rwlock_init.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_rwlock_init");
+
+int
+__pthread_rwlock_init (pthread_rwlock_t *rwlock,
+ const pthread_rwlockattr_t *attr)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_rwlock_rdlock.c
similarity index 64%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_rwlock_rdlock.c
index 111e9c8..c3f960b 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_rwlock_rdlock.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -9,11 +8,22 @@
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
+ 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
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_rwlock_rdlock");
+
+int
+__pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_rwlock_unlock.c
similarity index 64%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_rwlock_unlock.c
index 111e9c8..75e7ed3 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_rwlock_unlock.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -9,11 +8,22 @@
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
+ 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
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_rwlock_unlock");
+
+int
+__pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_rwlock_wrlock.c
similarity index 60%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_rwlock_wrlock.c
index 111e9c8..f82deca 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_rwlock_wrlock.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+ Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -9,11 +9,22 @@
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
+ 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
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_rwlock_wrlock");
+
+int
+__pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_self.c
similarity index 73%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_self.c
index 111e9c8..3328f99 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_self.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_self");
+
+pthread_t
+pthread_self (void)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_setcancelstate.c
similarity index 62%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_setcancelstate.c
index 111e9c8..1fb55e0 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_setcancelstate.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include <errno.h>
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_setcancelstate");
+asm (".secondary pthread_setcancelstate");
+
+int
+__pthread_setcancelstate (int state, int *oldstate)
+{
+ return 0;
+}
+strong_alias (__pthread_setcancelstate, pthread_setcancelstate)
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_setcanceltype.c
similarity index 71%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_setcanceltype.c
index 111e9c8..ce6bd86 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_setcanceltype.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,15 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_setcanceltype");
+
+int
+pthread_setcanceltype (int type, int *oldtype)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_setschedparam.c
similarity index 67%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_setschedparam.c
index 111e9c8..ea0740c 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_setschedparam.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,16 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary pthread_setschedparam");
+
+int
+pthread_setschedparam (pthread_t target_thread, int policy,
+ const struct sched_param *param)
+{
+ return 0;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-pthread_setspecific.c
similarity index 67%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-pthread_setspecific.c
index 111e9c8..a904f07 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-pthread_setspecific.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,17 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include <errno.h>
+#include "pthreadP.h"
+
+/* Make sure that it is used only when libpthread is not used. */
+asm (".secondary __pthread_setspecific");
+
+int
+__pthread_setspecific (pthread_key_t key, const void *value)
+{
+ /* Not valid. */
+ return EINVAL;
+}
+#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/libc-unwind.c
similarity index 62%
copy from sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
copy to nptl/libc-unwind.c
index 111e9c8..d3ae2e8 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/libc-unwind.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,4 +15,20 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include "lowlevellock.S"
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+#include <sysdep.h>
+#include <safe-fatal.h>
+
+/* Make sure that it is used only when libpthread is not used */
+asm (".secondary __pthread_unwind");
+
+void
+__attribute ((noreturn))
+__cleanup_fct_attribute
+attribute_compat_text_section
+__pthread_unwind (__pthread_unwind_buf_t *buf)
+{
+ /* We cannot call abort() here. */
+ __safe_fatal ();
+}
+#endif
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index c043fb5..0a7c4ba 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -87,10 +87,11 @@ static void nptl_freeres (void);
static const struct pthread_functions pthread_functions =
{
+# ifndef HAVE_ASM_SECONDARY_DIRECTIVE
.ptr_pthread_attr_destroy = __pthread_attr_destroy,
-# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+# if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
.ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0,
-# endif
+# endif
.ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1,
.ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate,
.ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate,
@@ -129,7 +130,6 @@ static const struct pthread_functions pthread_functions =
.ptr_pthread_self = __pthread_self,
.ptr_pthread_setcancelstate = __pthread_setcancelstate,
.ptr_pthread_setcanceltype = __pthread_setcanceltype,
- .ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
.ptr___pthread_once = __pthread_once,
.ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock,
.ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock,
@@ -139,8 +139,10 @@ static const struct pthread_functions pthread_functions =
.ptr___pthread_setspecific = __pthread_setspecific,
.ptr__pthread_cleanup_push_defer = __pthread_cleanup_push_defer,
.ptr__pthread_cleanup_pop_restore = __pthread_cleanup_pop_restore,
- .ptr_nthreads = &__nptl_nthreads,
.ptr___pthread_unwind = &__pthread_unwind,
+# endif
+ .ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
+ .ptr_nthreads = &__nptl_nthreads,
.ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
# ifdef SIGSETXID
.ptr__nptl_setxid = __nptl_setxid,
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 8cd51c6..d3e0965 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -244,7 +244,8 @@ extern int __pthread_debug attribute_hidden;
extern void __pthread_unwind (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute __attribute ((__noreturn__))
-#if !defined SHARED && !IS_IN (libpthread)
+#if !defined SHARED && !IS_IN (libpthread) \
+ && !defined HAVE_ASM_SECONDARY_DIRECTIVE
weak_function
#endif
;
@@ -506,6 +507,7 @@ hidden_proto (__pthread_setspecific)
hidden_proto (__pthread_once)
#endif
+#if !IS_IN (libc)
extern int __pthread_cond_broadcast_2_0 (pthread_cond_2_0_t *cond);
extern int __pthread_cond_destroy_2_0 (pthread_cond_2_0_t *cond);
extern int __pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
@@ -516,6 +518,7 @@ extern int __pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond,
const struct timespec *abstime);
extern int __pthread_cond_wait_2_0 (pthread_cond_2_0_t *cond,
pthread_mutex_t *mutex);
+#endif
extern int __pthread_getaffinity_np (pthread_t th, size_t cpusetsize,
cpu_set_t *cpuset);
diff --git a/scripts/abilist.awk b/scripts/abilist.awk
index 52b5b32..cbc2686 100644
--- a/scripts/abilist.awk
+++ b/scripts/abilist.awk
@@ -38,7 +38,7 @@ $4 == "*UND*" { next }
$2 == "l" { next }
# If the target uses ST_OTHER, it will be output before the symbol name.
-$2 == "g" || $2 == "w" && (NF == 7 || NF == 8) {
+$2 == "g" || $2 == "w" || $2 == "s" && (NF == 7 || NF == 8) {
weak = $2;
type = $3;
size = $5;
diff --git a/sysdeps/generic/localplt.data b/sysdeps/generic/localplt.data
index 1a40cf9..ed65301 100644
--- a/sysdeps/generic/localplt.data
+++ b/sysdeps/generic/localplt.data
@@ -1,10 +1,22 @@
# See scripts/check-localplt.awk for how this file is processed.
# PLT use is required for the malloc family and for matherr because
# users can define their own functions and have library internals call them.
+# pthread functions may be preempted by libpthread at run-time.
+libc.so: __pthread_getspecific
+libc.so: __pthread_key_create
+libc.so: __pthread_once
+libc.so: __pthread_rwlock_rdlock
+libc.so: __pthread_rwlock_unlock
+libc.so: __pthread_rwlock_wrlock
+libc.so: __pthread_setspecific
+libc.so: __pthread_unwind
+libc.so: _pthread_cleanup_pop_restore
+libc.so: _pthread_cleanup_push_defer
libc.so: calloc
libc.so: free
libc.so: malloc
libc.so: memalign
+libc.so: pthread_setcancelstate
libc.so: realloc
libm.so: matherr
# The dynamic loader uses __libc_memalign internally to allocate aligned
diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index f55f621..c5ce3b2 100644
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
@@ -99,39 +99,51 @@ typedef pthread_key_t __libc_key_t;
#define __rtld_lock_initialize(NAME) \
(void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER)
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+/* All pthread functions are available. */
+# define PTFAVAIL(NAME) 1
+
+/* When secondary symbols are used, FUNC is implemented to return ELSE so
+ that we can always call FUNC. */
+# define __libc_maybe_call(FUNC, ARGS, ELSE) FUNC ARGS
+# define __libc_ptf_call(FUNC, ARGS, ELSE) FUNC ARGS
+# define __libc_ptf_call_always(FUNC, ARGS) FUNC ARGS
+#else
/* If we check for a weakly referenced symbol and then perform a
normal jump to it te code generated for some platforms in case of
PIC is unnecessarily slow. What would happen is that the function
is first referenced as data and then it is called indirectly
through the PLT. We can make this a direct jump. */
-#ifdef __PIC__
-# define __libc_maybe_call(FUNC, ARGS, ELSE) \
- (__extension__ ({ __typeof (FUNC) *_fn = (FUNC); \
- _fn != NULL ? (*_fn) ARGS : ELSE; }))
-#else
-# define __libc_maybe_call(FUNC, ARGS, ELSE) \
- (FUNC != NULL ? FUNC ARGS : ELSE)
-#endif
+# ifdef __PIC__
+# define __libc_maybe_call(FUNC, ARGS, ELSE) \
+ (__extension__ ({ __typeof (FUNC) *_fn = (FUNC); \
+ _fn != NULL ? (*_fn) ARGS : ELSE; }))
+# else
+# define __libc_maybe_call(FUNC, ARGS, ELSE) \
+ (FUNC != NULL ? FUNC ARGS : ELSE)
+# endif
/* Call thread functions through the function pointer table. */
-#if defined SHARED && IS_IN (libc)
-# define PTFAVAIL(NAME) __libc_pthread_functions_init
-# define __libc_ptf_call(FUNC, ARGS, ELSE) \
+# if defined SHARED && IS_IN (libc) \
+ && !defined HAVE_ASM_SECONDARY_DIRECTIVE
+# define PTFAVAIL(NAME) __libc_pthread_functions_init
+# define __libc_ptf_call(FUNC, ARGS, ELSE) \
(__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE)
-# define __libc_ptf_call_always(FUNC, ARGS) \
+# define __libc_ptf_call_always(FUNC, ARGS) \
PTHFCT_CALL (ptr_##FUNC, ARGS)
-#elif IS_IN (libpthread)
-# define PTFAVAIL(NAME) 1
-# define __libc_ptf_call(FUNC, ARGS, ELSE) \
+# elif IS_IN (libpthread)
+# define PTFAVAIL(NAME) 1
+# define __libc_ptf_call(FUNC, ARGS, ELSE) \
FUNC ARGS
-# define __libc_ptf_call_always(FUNC, ARGS) \
+# define __libc_ptf_call_always(FUNC, ARGS) \
FUNC ARGS
-#else
-# define PTFAVAIL(NAME) (NAME != NULL)
-# define __libc_ptf_call(FUNC, ARGS, ELSE) \
- __libc_maybe_call (FUNC, ARGS, ELSE)
-# define __libc_ptf_call_always(FUNC, ARGS) \
+# else
+# define PTFAVAIL(NAME) (NAME != NULL)
+# define __libc_ptf_call(FUNC, ARGS, ELSE) \
+ __libc_maybe_call (FUNC, ARGS, ELSE)
+# define __libc_ptf_call_always(FUNC, ARGS) \
FUNC ARGS
+# endif
#endif
@@ -379,8 +391,9 @@ extern int __pthread_atfork (void (*__prepare) (void),
/* Make the pthread functions weak so that we can elide them from
- single-threaded processes. */
-#ifndef __NO_WEAK_PTHREAD_ALIASES
+ single-threaded processes unless secondary symbols are used. */
+#if !defined __NO_WEAK_PTHREAD_ALIASES \
+ && !defined HAVE_ASM_SECONDARY_DIRECTIVE
# ifdef weak_extern
weak_extern (__pthread_mutex_init)
weak_extern (__pthread_mutex_destroy)
diff --git a/sysdeps/nptl/pthread-functions.h b/sysdeps/nptl/pthread-functions.h
index 0784c59..8e71e54 100644
--- a/sysdeps/nptl/pthread-functions.h
+++ b/sysdeps/nptl/pthread-functions.h
@@ -30,6 +30,7 @@ struct xid_command;
the thread functions. */
struct pthread_functions
{
+#ifndef HAVE_ASM_SECONDARY_DIRECTIVE
int (*ptr_pthread_attr_destroy) (pthread_attr_t *);
int (*ptr___pthread_attr_init_2_0) (pthread_attr_t *);
int (*ptr___pthread_attr_init_2_1) (pthread_attr_t *);
@@ -77,7 +78,6 @@ struct pthread_functions
pthread_t (*ptr_pthread_self) (void);
int (*ptr_pthread_setcancelstate) (int, int *);
int (*ptr_pthread_setcanceltype) (int, int *);
- void (*ptr___pthread_cleanup_upto) (__jmp_buf, char *);
int (*ptr___pthread_once) (pthread_once_t *, void (*) (void));
int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *);
int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *);
@@ -89,10 +89,12 @@ struct pthread_functions
void (*) (void *), void *);
void (*ptr__pthread_cleanup_pop_restore) (struct _pthread_cleanup_buffer *,
int);
-#define HAVE_PTR_NTHREADS
- unsigned int *ptr_nthreads;
void (*ptr___pthread_unwind) (__pthread_unwind_buf_t *)
__attribute ((noreturn)) __cleanup_fct_attribute;
+#endif
+ void (*ptr___pthread_cleanup_upto) (__jmp_buf, char *);
+#define HAVE_PTR_NTHREADS
+ unsigned int *ptr_nthreads;
void (*ptr__nptl_deallocate_tsd) (void);
int (*ptr__nptl_setxid) (struct xid_command *);
void (*ptr_freeres) (void);
diff --git a/sysdeps/unix/sysv/linux/fatal-prepare.h b/sysdeps/unix/sysv/linux/fatal-prepare.h
index 45d88ce..25f919c 100644
--- a/sysdeps/unix/sysv/linux/fatal-prepare.h
+++ b/sysdeps/unix/sysv/linux/fatal-prepare.h
@@ -19,19 +19,24 @@
/* We have to completely disable cancellation. assert() must not be a
cancellation point but the implementation uses write() etc. */
-#ifdef SHARED
-# include <pthread-functions.h>
-# define FATAL_PREPARE \
- { \
- if (__libc_pthread_functions_init) \
- PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
- NULL)); \
- }
+#ifdef HAVE_ASM_SECONDARY_DIRECTIVE
+extern int __pthread_setcancelstate (int __state, int *__oldstate);
+# define FATAL_PREPARE __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);
#else
-# pragma weak pthread_setcancelstate
-# define FATAL_PREPARE \
- { \
- if (pthread_setcancelstate != NULL) \
- pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
- }
+# ifdef SHARED
+# include <pthread-functions.h>
+# define FATAL_PREPARE \
+ { \
+ if (__libc_pthread_functions_init) \
+ PTHFCT_CALL (ptr_pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, \
+ NULL)); \
+ }
+# else
+# pragma weak pthread_setcancelstate
+# define FATAL_PREPARE \
+ { \
+ if (pthread_setcancelstate != NULL) \
+ pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL); \
+ }
+# endif
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
index 111e9c8..cf3f206 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
@@ -16,4 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#if IS_IN (libc) && !defined SHARED
+/* Allow libpthread.a to override the ones in libc.a. */
+ weak_extern (__lll_lock_wait_private)
+ weak_extern (__lll_unlock_wake_private)
+#endif
+
#include "lowlevellock.S"
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index fcf1b72..53e3ec4 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -189,6 +189,12 @@ GLIBC_2.0
__profile_frequency F
__progname D 0x4
__progname_full D 0x4
+ __pthread_getspecific F
+ __pthread_key_create F
+ __pthread_mutex_lock F
+ __pthread_mutex_unlock F
+ __pthread_once F
+ __pthread_setspecific F
__rcmd_errstr D 0x4
__read F
__realloc_hook D 0x4
@@ -269,6 +275,8 @@ GLIBC_2.0
_obstack_free F
_obstack_memory_used F
_obstack_newchunk F
+ _pthread_cleanup_pop_restore F
+ _pthread_cleanup_push_defer F
_res D 0x200
_rpc_dtablesize F
_seterr_reply F
@@ -868,6 +876,7 @@ GLIBC_2.0
pthread_mutex_init F
pthread_mutex_lock F
pthread_mutex_unlock F
+ pthread_once F
pthread_self F
pthread_setcancelstate F
pthread_setcanceltype F
@@ -1882,6 +1891,9 @@ GLIBC_2.2
__lxstat64 F
__nl_langinfo_l F
__open64 F
+ __pthread_rwlock_rdlock F
+ __pthread_rwlock_unlock F
+ __pthread_rwlock_wrlock F
__res_init F
__res_nclose F
__res_ninit F
diff --git a/sysdeps/unix/sysv/linux/i386/localplt.data b/sysdeps/unix/sysv/linux/i386/localplt.data
index 2e03821..574fca0 100644
--- a/sysdeps/unix/sysv/linux/i386/localplt.data
+++ b/sysdeps/unix/sysv/linux/i386/localplt.data
@@ -6,6 +6,18 @@ libc.so: free + REL R_386_GLOB_DAT
libc.so: malloc + REL R_386_GLOB_DAT
libc.so: memalign
libc.so: realloc
+# pthread functions may be preempted by libpthread at run-time.
+libc.so: __pthread_getspecific
+libc.so: __pthread_key_create
+libc.so: __pthread_once
+libc.so: __pthread_rwlock_rdlock
+libc.so: __pthread_rwlock_unlock
+libc.so: __pthread_rwlock_wrlock
+libc.so: __pthread_setspecific
+libc.so: __pthread_unwind
+libc.so: _pthread_cleanup_pop_restore
+libc.so: _pthread_cleanup_push_defer
+libc.so: pthread_setcancelstate
libm.so: matherr
# The dynamic loader uses __libc_memalign internally to allocate aligned
# TLS storage. The other malloc family of functions are expected to allow
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index b377b04..38bd01b 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -377,6 +377,15 @@ GLIBC_2.2.5
__profile_frequency F
__progname D 0x8
__progname_full D 0x8
+ __pthread_getspecific F
+ __pthread_key_create F
+ __pthread_mutex_lock F
+ __pthread_mutex_unlock F
+ __pthread_once F
+ __pthread_rwlock_rdlock F
+ __pthread_rwlock_unlock F
+ __pthread_rwlock_wrlock F
+ __pthread_setspecific F
__pwrite64 F
__rawmemchr F
__rcmd_errstr D 0x8
@@ -527,6 +536,8 @@ GLIBC_2.2.5
_obstack_free F
_obstack_memory_used F
_obstack_newchunk F
+ _pthread_cleanup_pop_restore F
+ _pthread_cleanup_push_defer F
_res D 0x238
_res_hconf D 0x48
_rpc_dtablesize F
@@ -1299,6 +1310,7 @@ GLIBC_2.2.5
pthread_mutex_init F
pthread_mutex_lock F
pthread_mutex_unlock F
+ pthread_once F
pthread_self F
pthread_setcancelstate F
pthread_setcanceltype F
diff --git a/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index 4c34beb..52a27dc 100644
--- a/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -26,7 +26,7 @@
# define __pthread_unwind __GI___pthread_unwind
# endif
#else
-# ifndef SHARED
+# if !defined SHARED && !defined HAVE_ASM_SECONDARY_DIRECTIVE
.weak __pthread_unwind
# endif
#endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
index 111e9c8..cf3f206 100644
--- a/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/libc-lowlevellock.S
@@ -16,4 +16,10 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#if IS_IN (libc) && !defined SHARED
+/* Allow libpthread.a to override the ones in libc.a. */
+ weak_extern (__lll_lock_wait_private)
+ weak_extern (__lll_unlock_wake_private)
+#endif
+
#include "lowlevellock.S"
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 5f70329..304e279 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -341,6 +341,15 @@ GLIBC_2.16
__profile_frequency F
__progname D 0x4
__progname_full D 0x4
+ __pthread_getspecific F
+ __pthread_key_create F
+ __pthread_mutex_lock F
+ __pthread_mutex_unlock F
+ __pthread_once F
+ __pthread_rwlock_rdlock F
+ __pthread_rwlock_unlock F
+ __pthread_rwlock_wrlock F
+ __pthread_setspecific F
__ptsname_r_chk F
__pwrite64 F
__rawmemchr F
@@ -543,6 +552,8 @@ GLIBC_2.16
_obstack_free F
_obstack_memory_used F
_obstack_newchunk F
+ _pthread_cleanup_pop_restore F
+ _pthread_cleanup_push_defer F
_res D 0x200
_res_hconf D 0x30
_rpc_dtablesize F
@@ -1448,6 +1459,7 @@ GLIBC_2.16
pthread_mutex_init F
pthread_mutex_lock F
pthread_mutex_unlock F
+ pthread_once F
pthread_self F
pthread_setcancelstate F
pthread_setcanceltype F
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=24b5e9e60edca6be07cc729ebfde07a4044d8aeb
commit 24b5e9e60edca6be07cc729ebfde07a4044d8aeb
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Sep 11 05:10:03 2012 -0700
Place libpthread.a right before libc.a
GCC driver places -lpthread in --start-group -lgcc -lgcc_eh -lpthread
-lc --end-group. Glibc tests should do the same.
[BZ #14569]
* Makeconfig (+link-static-before-libc): Also filter out
$(common-objpfx)nptl/libpthread%. Remove $(link-libc-static).
(link-libc-static-tests): Place libpthread.a before libc.a.
* nptl/Makefile (tests-static): Add tst-cancelx7-static,
tst-raise1-static and tst-cancel7-static.
(tests): Likewise.
* nptl/tst-cancel7-static.c: New file.
* nptl/tst-cancelx7-static.c: Likewise.
* nptl/tst-raise1-static.c: Likewise.
diff --git a/Makeconfig b/Makeconfig
index f136b88..6f5e4fb 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -427,6 +427,7 @@ ifndef +link-static
$(filter-out $(addprefix $(csu-objpfx),start.o \
$(start-installed-name))\
$(+preinit) $(link-extra-libs-static) \
+ $(common-objpfx)nptl/libpthread% \
$(common-objpfx)libc% $(+postinit),$^) \
$(link-extra-libs-static)
+link-static-after-libc = $(+postctorT) $(+postinit)
@@ -534,7 +535,12 @@ endif
# The static libraries.
link-libc-static = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib) -Wl,--end-group
-link-libc-static-tests = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib-tests) -Wl,--end-group
+# libpthread.a must be placed before libc.a between -start-group and
+# --end-group.
+link-libc-static-tests = -Wl,--start-group \
+ $(filter $(common-objpfx)nptl/libpthread.a,$^) \
+ $(common-objpfx)libc.a \
+ $(static-gnulib-tests) -Wl,--end-group
# How to link against libgcc. Some libgcc functions, such as those
# for "long long" arithmetic or software floating point, can always be
diff --git a/nptl/Makefile b/nptl/Makefile
index aaca0a4..a10282f 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -313,7 +313,8 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \
tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 \
tst-cancelx16 tst-cancelx17 tst-cancelx18 tst-cancelx20 tst-cancelx21 \
tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 \
- tst-oncex3 tst-oncex4
+ tst-oncex3 tst-oncex4 tst-cancelx7-static
+tests-static += tst-cancelx7-static
endif
ifeq ($(build-shared),yes)
tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-_res1 tst-fini1 \
@@ -382,10 +383,12 @@ link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
tests-static += tst-locale1 tst-locale2 tst-stackguard1-static \
tst-cancel21-static tst-cancel24-static tst-cond8-static \
tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
- tst-sem12-static
+ tst-sem12-static \
+ tst-cancel21-static tst-raise1-static tst-cancel7-static
tests += tst-stackguard1-static tst-cancel21-static tst-cancel24-static \
tst-cond8-static tst-mutex8-static tst-mutexpi8-static \
- tst-sem11-static tst-sem12-static
+ tst-sem11-static tst-sem12-static \
+ tst-cancel21-static tst-raise1-static tst-cancel7-static
xtests-static += tst-setuid1-static
# These tests are linked with libc before libpthread
diff --git a/nptl/tst-cancel7-static.c b/nptl/tst-cancel7-static.c
new file mode 100644
index 0000000..4df1a58
--- /dev/null
+++ b/nptl/tst-cancel7-static.c
@@ -0,0 +1 @@
+#include "tst-cancel7.c"
diff --git a/nptl/tst-cancelx7-static.c b/nptl/tst-cancelx7-static.c
new file mode 100644
index 0000000..a15dfe2
--- /dev/null
+++ b/nptl/tst-cancelx7-static.c
@@ -0,0 +1 @@
+#include "tst-cancelx7.c"
diff --git a/nptl/tst-raise1-static.c b/nptl/tst-raise1-static.c
new file mode 100644
index 0000000..f25ad50
--- /dev/null
+++ b/nptl/tst-raise1-static.c
@@ -0,0 +1 @@
+#include "tst-raise1.c"
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9a638a9be6ccaa543607f1655f73806bd41b2140
commit 9a638a9be6ccaa543607f1655f73806bd41b2140
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Sep 11 06:27:40 2015 -0700
Make pthread_rwlock_destroy/pthread_rwlock_init/weak
* pthread_rwlock_destroy.c (pthread_rwlock_destroy): Replace
strong_alias with weak_alias.
* pthread_rwlock_init.c (pthread_rwlock_init): Likewise.
diff --git a/nptl/pthread_rwlock_destroy.c b/nptl/pthread_rwlock_destroy.c
index 7faf0c3..bc956e4 100644
--- a/nptl/pthread_rwlock_destroy.c
+++ b/nptl/pthread_rwlock_destroy.c
@@ -29,4 +29,4 @@ __pthread_rwlock_destroy (rwlock)
/* Nothing to be done. For now. */
return 0;
}
-strong_alias (__pthread_rwlock_destroy, pthread_rwlock_destroy)
+weak_alias (__pthread_rwlock_destroy, pthread_rwlock_destroy)
diff --git a/nptl/pthread_rwlock_init.c b/nptl/pthread_rwlock_init.c
index 99ab5e3..5c9fc51 100644
--- a/nptl/pthread_rwlock_init.c
+++ b/nptl/pthread_rwlock_init.c
@@ -63,4 +63,4 @@ __pthread_rwlock_init (rwlock, attr)
return 0;
}
-strong_alias (__pthread_rwlock_init, pthread_rwlock_init)
+weak_alias (__pthread_rwlock_init, pthread_rwlock_init)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ad0a4cef8d88a8985820228413afde66af1f52eb
commit ad0a4cef8d88a8985820228413afde66af1f52eb
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Sep 10 13:41:43 2015 -0700
Add STB_SECONDARY support to conform/linknamespace.pl
* conform/linknamespace.pl (list_syms): Support STB_SECONDARY.
diff --git a/conform/linknamespace.pl b/conform/linknamespace.pl
index 15fa613..b39be3c 100644
--- a/conform/linknamespace.pl
+++ b/conform/linknamespace.pl
@@ -83,7 +83,7 @@ sub list_syms {
my ($bind) = $fields[4];
my ($ndx) = $fields[6];
my ($sym) = $fields[7];
- if ($bind ne "GLOBAL" && $bind ne "WEAK") {
+ if ($bind ne "GLOBAL" && $bind ne "WEAK" && $bind ne "SECOND") {
next;
}
if ($sym !~ /^\w+$/) {
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1c810396a130fc4cc8ad0bb7d7438b58bbac6e78
commit 1c810396a130fc4cc8ad0bb7d7438b58bbac6e78
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Jun 30 12:53:04 2012 -0700
Add STB_SECONDARY support to ld.so
Enable STB_SECONDARY if it is supported by binutils. Add 3 STB_SECONDARY
tests.
* config.h.in: Add HAVE_ASM_SECONDARY_DIRECTIVE.
* config.make.in (have-secondary): New macro.
* configure.in: Check if STB_SECONDARY is supported by as/ld.
Define HAVE_ASM_SECONDARY_DIRECTIVE and set have-secondary to yes
if the .secondary assembly directive works.
* configure: Regenerated.
* elf/Makefile (tests): Add tst-secondary1 tst-secondary2
tst-secondary3 if STB_SECONDARY is supported by as/ld.
(modules-names): Add tst-secondarymod tst-secondary1mod
tst-secondary2mod tst-secondary3mod if STB_SECONDARY is supported
by as/ld.
(LDFLAGS-tst-secondarymod.so): New macro.
($(objpfx)tst-secondary1): New rule.
($(objpfx)tst-secondary2): Likewise.
($(objpfx)tst-secondary3): Likewise.
* elf/dl-addr.c (determine_info): Also check STB_SECONDARY.
* elf/dl-lookup.c (do_lookup_x): Handle STB_SECONDARY.
(_dl_lookup_symbol_x): Likewise.
* elf/sprof.c (read_symbols): Likewise.
* elf/elf.h (STB_SECONDARY): New.
(STB_NUM): Updated.
* elf/tst-secondary.h: New file.
* elf/tst-secondary1.c: Likewise.
* elf/tst-secondary1mod.c: Likewise.
* elf/tst-secondary2.c: Likewise.
* elf/tst-secondary2mod.c: Likewise.
* elf/tst-secondary3.c: Likewise.
* elf/tst-secondary3mod.c: Likewise.
* elf/tst-secondarymod.c: Likewise.
diff --git a/config.h.in b/config.h.in
index 2b9aa1a..a158856 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,6 +24,10 @@
/* Define if weak symbols are available via the `.weakext' directive. */
#undef HAVE_ASM_WEAKEXT_DIRECTIVE
+/* Define if secondary symbols are available via the `.secondary'
+ directive. */
+#undef HAVE_ASM_SECONDARY_DIRECTIVE
+
/* Define to the assembler line separator character for multiple
assembler instructions per line. Default is `;' */
#undef ASM_LINE_SEP
diff --git a/config.make.in b/config.make.in
index a9f5696..ac115f0 100644
--- a/config.make.in
+++ b/config.make.in
@@ -56,6 +56,7 @@ old-glibc-headers = @old_glibc_headers@
unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
have-forced-unwind = @libc_cv_forced_unwind@
have-fpie = @libc_cv_fpie@
+have-secondary = @libc_cv_ld_secondary@
gnu89-inline-CFLAGS = @gnu89_inline@
have-ssp = @libc_cv_ssp@
have-selinux = @have_selinux@
diff --git a/configure b/configure
index 45cc7cb..86feb6a 100755
--- a/configure
+++ b/configure
@@ -624,6 +624,7 @@ libc_cv_cc_loop_to_function
libc_cv_cc_submachine
libc_cv_cc_nofma
exceptions
+libc_cv_ld_secondary
gnu89_inline
libc_cv_ssp
fno_unit_at_a_time
@@ -6488,8 +6489,10 @@ if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5'
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
libc_cv_asm_weak_directive=yes
+ libc_cv_asm_weak=.weak
else
libc_cv_asm_weak_directive=no
+ libc_cv_asm_weak=
fi
rm -f conftest*
fi
@@ -6518,6 +6521,7 @@ EOF
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
libc_cv_asm_weakext_directive=yes
+ libc_cv_asm_weak=.weakext
else
libc_cv_asm_weakext_directive=no
fi
@@ -6536,6 +6540,71 @@ elif test $libc_cv_asm_weakext_directive = yes; then
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for .secondary assembler directive" >&5
+$as_echo_n "checking for .secondary assembler directive... " >&6; }
+if ${libc_cv_asm_secondary_directive+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat > conftest.s <<EOF
+${libc_cv_dot_text}
+_sym:
+.secondary _sym
+EOF
+test -n "$libc_cv_asm_weak" && cat >> conftest.s <<EOF
+$libc_cv_asm_weak _sym
+EOF
+if ${CC-cc} -c $ASFLAGS -o conftest.o conftest.s 1>&5 2>&5; then
+ if $READELF -s conftest.o | fgrep _sym | fgrep SECOND > /dev/null; then
+ libc_cv_asm_secondary_directive=yes
+ else
+ libc_cv_asm_secondary_directive=no
+ fi
+else
+ libc_cv_asm_secondary_directive=no
+fi
+rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_asm_secondary_directive" >&5
+$as_echo "$libc_cv_asm_secondary_directive" >&6; }
+if test $libc_cv_asm_secondary_directive = yes; then
+ $as_echo "#define HAVE_ASM_SECONDARY_DIRECTIVE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for secondary symbol in shared library" >&5
+$as_echo_n "checking for secondary symbol in shared library... " >&6; }
+if ${libc_cv_ld_secondary+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat > conftest.c <<EOF
+asm (".secondary foo");
+void foo (void) { }
+EOF
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -fPIC -shared -o conftest.so conftest.c
+ -nostartfiles -nostdlib
+ 1>&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }
+ then
+ if $READELF -s conftest.so | fgrep foo | fgrep SECOND > /dev/null; then
+ libc_cv_ld_secondary=yes
+ else
+ libc_cv_ld_secondary=no
+ fi
+ else
+ libc_cv_ld_secondary=no
+ fi
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_secondary" >&5
+$as_echo "$libc_cv_ld_secondary" >&6; }
+else
+ libc_cv_ld_secondary=no
+fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld --no-whole-archive" >&5
$as_echo_n "checking for ld --no-whole-archive... " >&6; }
if ${libc_cv_ld_no_whole_archive+:} false; then :
diff --git a/configure.ac b/configure.ac
index 7e9383a..86632ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1628,8 +1628,10 @@ foo:
EOF
if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
libc_cv_asm_weak_directive=yes
+ libc_cv_asm_weak=.weak
else
libc_cv_asm_weak_directive=no
+ libc_cv_asm_weak=
fi
rm -f conftest*])
@@ -1648,6 +1650,7 @@ baz:
EOF
if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
libc_cv_asm_weakext_directive=yes
+ libc_cv_asm_weak=.weakext
else
libc_cv_asm_weakext_directive=no
fi
@@ -1661,6 +1664,53 @@ elif test $libc_cv_asm_weakext_directive = yes; then
AC_DEFINE(HAVE_ASM_WEAKEXT_DIRECTIVE)
fi
+AC_CACHE_CHECK(for .secondary assembler directive,
+ libc_cv_asm_secondary_directive, [dnl
+cat > conftest.s <<EOF
+${libc_cv_dot_text}
+_sym:
+.secondary _sym
+EOF
+test -n "$libc_cv_asm_weak" && cat >> conftest.s <<EOF
+$libc_cv_asm_weak _sym
+EOF
+if ${CC-cc} -c $ASFLAGS -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+ if $READELF -s conftest.o | fgrep _sym | fgrep SECOND > /dev/null; then
+ libc_cv_asm_secondary_directive=yes
+ else
+ libc_cv_asm_secondary_directive=no
+ fi
+else
+ libc_cv_asm_secondary_directive=no
+fi
+rm -f conftest*])
+if test $libc_cv_asm_secondary_directive = yes; then
+ AC_DEFINE(HAVE_ASM_SECONDARY_DIRECTIVE)
+ AC_CACHE_CHECK(for secondary symbol in shared library,
+ libc_cv_ld_secondary, [dnl
+cat > conftest.c <<EOF
+asm (".secondary foo");
+void foo (void) { }
+EOF
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -fPIC -shared -o conftest.so conftest.c
+ -nostartfiles -nostdlib
+ 1>&AS_MESSAGE_LOG_FD])
+ then
+ if $READELF -s conftest.so | fgrep foo | fgrep SECOND > /dev/null; then
+ libc_cv_ld_secondary=yes
+ else
+ libc_cv_ld_secondary=no
+ fi
+ else
+ libc_cv_ld_secondary=no
+ fi
+ rm -f conftest*])
+else
+ libc_cv_ld_secondary=no
+fi
+AC_SUBST(libc_cv_ld_secondary)
+
AC_CACHE_CHECK(for ld --no-whole-archive, libc_cv_ld_no_whole_archive, [dnl
cat > conftest.c <<\EOF
_start () {}
diff --git a/elf/Makefile b/elf/Makefile
index 4ceeaf8..31029c1 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -269,6 +269,12 @@ modules-names += ifuncmod1 ifuncmod3 ifuncmod5 ifuncmod6
endif
endif
+ifeq (yes,$(have-secondary))
+tests += tst-secondary1 tst-secondary2 tst-secondary3
+modules-names += tst-secondarymod tst-secondary1mod tst-secondary2mod \
+ tst-secondary3mod
+endif
+
ifeq (yes,$(build-shared))
ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-pathopt.out $(objpfx)tst-rtld-load-self.out
@@ -1144,6 +1150,17 @@ $(objpfx)ifuncmain5static: $(addprefix $(objpfx),ifuncdep5.o)
$(objpfx)ifuncmain5staticpic: $(addprefix $(objpfx),ifuncdep5pic.o)
$(objpfx)ifuncmain5picstatic: $(addprefix $(objpfx),ifuncdep5pic.o)
+LDFLAGS-tst-secondarymod.so = -Wl,-z,secondary
+
+$(objpfx)tst-secondary1: $(objpfx)tst-secondarymod.so \
+ $(objpfx)tst-secondary1mod.so
+
+$(objpfx)tst-secondary2: $(objpfx)tst-secondarymod.so \
+ $(objpfx)tst-secondary2mod.so
+
+$(objpfx)tst-secondary3: $(objpfx)tst-secondarymod.so \
+ $(objpfx)tst-secondary3mod.so
+
$(objpfx)tst-unique1: $(libdl)
$(objpfx)tst-unique1.out: $(objpfx)tst-unique1mod1.so \
$(objpfx)tst-unique1mod2.so
diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index a025652..b4dd888 100644
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -87,7 +87,8 @@ determine_info (const ElfW(Addr) addr, struct link_map *match, Dl_info *info,
for (; (void *) symtab < (void *) symtabend; ++symtab)
if ((ELFW(ST_BIND) (symtab->st_info) == STB_GLOBAL
- || ELFW(ST_BIND) (symtab->st_info) == STB_WEAK)
+ || ELFW(ST_BIND) (symtab->st_info) == STB_WEAK
+ || ELFW(ST_BIND) (symtab->st_info) == STB_SECONDARY)
&& ELFW(ST_TYPE) (symtab->st_info) != STT_TLS
&& (symtab->st_shndx != SHN_UNDEF
|| symtab->st_value != 0)
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 11cb44b..7e35723 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -518,10 +518,15 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
switch (ELFW(ST_BIND) (sym->st_info))
{
+ case STB_SECONDARY:
+ /* Secondary definition. Use this value if we don't find
+ another. */
+ goto dynamic_weak;
case STB_WEAK:
/* Weak definition. Use this value if we don't find another. */
if (__glibc_unlikely (GLRO(dl_dynamic_weak)))
{
+dynamic_weak:
if (! result->s)
{
result->s = sym;
@@ -857,7 +862,9 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
if (__glibc_unlikely (current_value.s == NULL))
{
- if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
+ if ((*ref == NULL
+ || (ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK
+ && ELFW(ST_BIND) ((*ref)->st_info) != STB_SECONDARY))
&& skip_map == NULL
&& !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED))
{
diff --git a/elf/elf.h b/elf/elf.h
index fbadda4..4cc6074 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -472,7 +472,8 @@ typedef struct
#define STB_LOCAL 0 /* Local symbol */
#define STB_GLOBAL 1 /* Global symbol */
#define STB_WEAK 2 /* Weak symbol */
-#define STB_NUM 3 /* Number of defined types. */
+#define STB_SECONDARY 3 /* Secondary symbol */
+#define STB_NUM 4 /* Number of defined types. */
#define STB_LOOS 10 /* Start of OS-specific */
#define STB_GNU_UNIQUE 10 /* Unique symbol. */
#define STB_HIOS 12 /* End of OS-specific */
diff --git a/elf/sprof.c b/elf/sprof.c
index ec3fde3..9ed6095 100644
--- a/elf/sprof.c
+++ b/elf/sprof.c
@@ -1082,7 +1082,8 @@ read_symbols (struct shobj *shobj)
newsym->name = &shobj->strtab[sym->st_name];
newsym->addr = sym->st_value;
newsym->size = sym->st_size;
- newsym->weak = ELFW(ST_BIND) (sym->st_info) == STB_WEAK;
+ newsym->weak = (ELFW(ST_BIND) (sym->st_info) == STB_SECONDARY
+ || ELFW(ST_BIND) (sym->st_info) == STB_WEAK);
newsym->hidden = (ELFW(ST_VISIBILITY) (sym->st_other)
!= STV_DEFAULT);
newsym->ticks = 0;
@@ -1140,7 +1141,8 @@ read_symbols (struct shobj *shobj)
newsym->name = &strtab[symtab->st_name];
newsym->addr = symtab->st_value;
newsym->size = symtab->st_size;
- newsym->weak = ELFW(ST_BIND) (symtab->st_info) == STB_WEAK;
+ newsym->weak = (ELFW(ST_BIND) (symtab->st_info) == STB_SECONDARY
+ || ELFW(ST_BIND) (symtab->st_info) == STB_WEAK);
newsym->hidden = (ELFW(ST_VISIBILITY) (symtab->st_other)
!= STV_DEFAULT);
newsym->ticks = 0;
diff --git a/elf/tst-secondary.h b/elf/tst-secondary.h
new file mode 100644
index 0000000..0487e25
--- /dev/null
+++ b/elf/tst-secondary.h
@@ -0,0 +1,3 @@
+#define GLOBAL 1
+#define WEAK 2
+#define SECONDARY 3
diff --git a/elf/tst-secondary1.c b/elf/tst-secondary1.c
new file mode 100644
index 0000000..f4d6edd
--- /dev/null
+++ b/elf/tst-secondary1.c
@@ -0,0 +1,13 @@
+/* Verify that secdonary function is called. */
+
+#include "tst-secondary.h"
+
+extern int bar (void);
+extern void foo (void);
+
+int
+main (void)
+{
+ foo ();
+ return bar () != SECONDARY;
+}
diff --git a/elf/tst-secondary1mod.c b/elf/tst-secondary1mod.c
new file mode 100644
index 0000000..cd0130c
--- /dev/null
+++ b/elf/tst-secondary1mod.c
@@ -0,0 +1,4 @@
+void
+foo (void)
+{
+}
diff --git a/elf/tst-secondary2.c b/elf/tst-secondary2.c
new file mode 100644
index 0000000..3f221cb
--- /dev/null
+++ b/elf/tst-secondary2.c
@@ -0,0 +1,13 @@
+/* Verify that global function is called. */
+
+#include "tst-secondary.h"
+
+extern int bar (void);
+extern void foo (void);
+
+int
+main (void)
+{
+ foo ();
+ return bar () != GLOBAL;
+}
diff --git a/elf/tst-secondary2mod.c b/elf/tst-secondary2mod.c
new file mode 100644
index 0000000..f9407a9
--- /dev/null
+++ b/elf/tst-secondary2mod.c
@@ -0,0 +1,12 @@
+#include "tst-secondary.h"
+
+int
+bar (void)
+{
+ return GLOBAL;
+}
+
+void
+foo (void)
+{
+}
diff --git a/elf/tst-secondary3.c b/elf/tst-secondary3.c
new file mode 100644
index 0000000..b55baea
--- /dev/null
+++ b/elf/tst-secondary3.c
@@ -0,0 +1,13 @@
+/* Verify that weak function is called. */
+
+#include "tst-secondary.h"
+
+extern int bar (void);
+extern void foo (void);
+
+int
+main (void)
+{
+ foo ();
+ return bar () != WEAK;
+}
diff --git a/elf/tst-secondary3mod.c b/elf/tst-secondary3mod.c
new file mode 100644
index 0000000..edfb25b
--- /dev/null
+++ b/elf/tst-secondary3mod.c
@@ -0,0 +1,13 @@
+#include "tst-secondary.h"
+
+int
+__attribute__ ((weak))
+bar (void)
+{
+ return WEAK;
+}
+
+void
+foo (void)
+{
+}
diff --git a/elf/tst-secondarymod.c b/elf/tst-secondarymod.c
new file mode 100644
index 0000000..5363e99
--- /dev/null
+++ b/elf/tst-secondarymod.c
@@ -0,0 +1,9 @@
+#include "tst-secondary.h"
+
+asm (".secondary bar");
+
+int
+bar (void)
+{
+ return SECONDARY;
+}
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources