diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:16:56 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-17 20:16:56 +0000 |
| commit | 90dd591393a03d023be06a33acfb42c1b328b0fa (patch) | |
| tree | d6d3a6aee615a6d3192066f815a70c0393749095 /nptl | |
| parent | 45dcd79f6eb37ad4e9e6967f1d459ffc3629eb1f (diff) | |
Fix mq_notify pthread_barrier_* namespace (bug 18544).
mq_notify (present in POSIX by 1996) brings in references to
pthread_barrier_init and pthread_barrier_wait (new in the 2001 edition
of POSIX). This patch fixes this by making those functions into weak
aliases of __pthread_barrier_*, exporting the __pthread_barrier_*
names at version GLIBC_PRIVATE and using them in mq_notify.
Tested for x86_64 and x86 (testsuite, and comparison of installed
stripped shared libraries). Changes in addresses from dynamic symbol
table / PLT changes render most comparisons not particularly useful,
but when the addresses of subsequent code don't change there's no sign
of unexpected changes there. This patch does not remove any
linknamespace XFAILs because of other namespace issues remaining with
mqueue.h functions.
[BZ #18544]
* nptl/pthread_barrier_init.c (pthread_barrier_init): Rename to
__pthread_barrier_init and define as weak alias of
__pthread_barrier_init.
* sysdeps/sparc/nptl/pthread_barrier_init.c
(pthread_barrier_init): Likewise.
* nptl/pthread_barrier_wait.c (pthread_barrier_wait): Rename to
__pthread_barrier_wait and define as weak alias of
__pthread_barrier_wait.
* sysdeps/sparc/nptl/pthread_barrier_wait.c
(pthread_barrier_wait): Likewise.
* sysdeps/sparc/sparc32/pthread_barrier_wait.c
(pthread_barrier_wait): Likewise.
* sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
(pthread_barrier_wait): Likewise.
* sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
(pthread_barrier_wait): Likewise.
* nptl/Versions (libpthread): Export __pthread_barrier_init and
__pthread_barrier_wait at version GLIBC_PRIVATE.
* include/pthread.h (__pthread_barrier_init): Declare.
(__pthread_barrier_wait): Likewise.
* sysdeps/unix/sysv/linux/mq_notify.c (notification_function):
Call __pthread_barrier_wait instead of pthread_barrier_wait.
(helper_thread): Likewise.
(init_mq_netlink): Call __pthread_barrier_init instead of
pthread_barrier_init.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Versions | 1 | ||||
| -rw-r--r-- | nptl/pthread_barrier_init.c | 3 | ||||
| -rw-r--r-- | nptl/pthread_barrier_wait.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/nptl/Versions b/nptl/Versions index bc8a15b43b..34e4b464ed 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -273,6 +273,7 @@ libpthread { __pthread_initialize_minimal; __pthread_clock_gettime; __pthread_clock_settime; __pthread_unwind; __pthread_get_minstack; + __pthread_barrier_init; __pthread_barrier_wait; __shm_directory; } } diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c index 82e13fb40d..5ea9fad291 100644 --- a/nptl/pthread_barrier_init.c +++ b/nptl/pthread_barrier_init.c @@ -29,7 +29,7 @@ static const struct pthread_barrierattr default_barrierattr = int -pthread_barrier_init (barrier, attr, count) +__pthread_barrier_init (barrier, attr, count) pthread_barrier_t *barrier; const pthread_barrierattr_t *attr; unsigned int count; @@ -68,3 +68,4 @@ pthread_barrier_init (barrier, attr, count) return 0; } +weak_alias (__pthread_barrier_init, pthread_barrier_init) diff --git a/nptl/pthread_barrier_wait.c b/nptl/pthread_barrier_wait.c index 9e7090facf..d69a929ef6 100644 --- a/nptl/pthread_barrier_wait.c +++ b/nptl/pthread_barrier_wait.c @@ -24,7 +24,7 @@ /* Wait on barrier. */ int -pthread_barrier_wait (barrier) +__pthread_barrier_wait (barrier) pthread_barrier_t *barrier; { struct pthread_barrier *ibarrier = (struct pthread_barrier *) barrier; @@ -76,3 +76,4 @@ pthread_barrier_wait (barrier) return result; } +weak_alias (__pthread_barrier_wait, pthread_barrier_wait) |