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.

6 files changed, 19 insertions, 14 deletions

diff --git a/sysdeps/sparc/nptl/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c
index 01bd18afa0..aa21a63f2d 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_init.c
+++ b/sysdeps/sparc/nptl/pthread_barrier_init.c
@@ -22,7 +22,7 @@
 #include <sparc-nptl.h>
 
 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;
@@ -53,3 +53,4 @@ pthread_barrier_init (barrier, attr, count)
 
   return 0;
 }
+weak_alias (__pthread_barrier_init, pthread_barrier_init)
diff --git a/sysdeps/sparc/nptl/pthread_barrier_wait.c b/sysdeps/sparc/nptl/pthread_barrier_wait.c
index b0437a1505..dd4c336dc2 100644
--- a/sysdeps/sparc/nptl/pthread_barrier_wait.c
+++ b/sysdeps/sparc/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;
 {
   union sparc_pthread_barrier *ibarrier
@@ -76,3 +76,4 @@ pthread_barrier_wait (barrier)
 
   return result;
 }
+weak_alias (__pthread_barrier_wait, pthread_barrier_wait)
diff --git a/sysdeps/sparc/sparc32/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
index afab20311a..81d22b0653 100644
--- a/sysdeps/sparc/sparc32/pthread_barrier_wait.c
+++ b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
@@ -24,7 +24,7 @@
 
 /* Wait on barrier.  */
 int
-pthread_barrier_wait (barrier)
+__pthread_barrier_wait (barrier)
      pthread_barrier_t *barrier;
 {
   union sparc_pthread_barrier *ibarrier
@@ -92,3 +92,4 @@ pthread_barrier_wait (barrier)
 
   return result;
 }
+weak_alias (__pthread_barrier_wait, pthread_barrier_wait)
diff --git a/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
index 1d8200f21d..ad1a774fbd 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
@@ -22,10 +22,10 @@
 
 	.text
 
-	.globl	pthread_barrier_wait
-	.type	pthread_barrier_wait,@function
+	.globl	__pthread_barrier_wait
+	.type	__pthread_barrier_wait,@function
 	.align	16
-pthread_barrier_wait:
+__pthread_barrier_wait:
 	cfi_startproc
 	pushl	%ebx
 	cfi_adjust_cfa_offset(4)
@@ -183,4 +183,5 @@ pthread_barrier_wait:
 	call	__lll_unlock_wake
 	jmp	10b
 	cfi_endproc
-	.size	pthread_barrier_wait,.-pthread_barrier_wait
+	.size	__pthread_barrier_wait,.-__pthread_barrier_wait
+weak_alias (__pthread_barrier_wait, pthread_barrier_wait)
diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
index 36b327d5e6..5a27274a3d 100644
--- a/sysdeps/unix/sysv/linux/mq_notify.c
+++ b/sysdeps/unix/sysv/linux/mq_notify.c
@@ -92,7 +92,7 @@ notification_function (void *arg)
   union sigval param = data->param;
 
   /* Let the parent go.  */
-  (void) pthread_barrier_wait (&notify_barrier);
+  (void) __pthread_barrier_wait (&notify_barrier);
 
   /* Make the thread detached.  */
   (void) pthread_detach (pthread_self ());
@@ -132,7 +132,7 @@ helper_thread (void *arg)
 				== 0, 0))
 	    /* Since we passed a pointer to DATA to the new thread we have
 	       to wait until it is done with it.  */
-	    (void) pthread_barrier_wait (&notify_barrier);
+	    (void) __pthread_barrier_wait (&notify_barrier);
 	}
       else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
 	/* The only state we keep is the copy of the thread attributes.  */
@@ -166,7 +166,7 @@ init_mq_netlink (void)
   int err = 1;
 
   /* Initialize the barrier.  */
-  if (__builtin_expect (pthread_barrier_init (&notify_barrier, NULL, 2) == 0,
+  if (__builtin_expect (__pthread_barrier_init (&notify_barrier, NULL, 2) == 0,
 			0))
     {
       /* Create the helper thread.  */
diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
index 69ecc1816a..e0f7d6c6e6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S
@@ -23,10 +23,10 @@
 
 	.text
 
-	.globl	pthread_barrier_wait
-	.type	pthread_barrier_wait,@function
+	.globl	__pthread_barrier_wait
+	.type	__pthread_barrier_wait,@function
 	.align	16
-pthread_barrier_wait:
+__pthread_barrier_wait:
 	/* Get the mutex.  */
 	xorl	%eax, %eax
 	movl	$1, %esi
@@ -157,4 +157,5 @@ pthread_barrier_wait:
 	xorl	$LLL_SHARED, %esi
 	callq	__lll_unlock_wake
 	jmp	10b
-	.size	pthread_barrier_wait,.-pthread_barrier_wait
+	.size	__pthread_barrier_wait,.-__pthread_barrier_wait
+weak_alias (__pthread_barrier_wait, pthread_barrier_wait)