about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--NEWS2
-rw-r--r--include/pthread.h10
-rw-r--r--nptl/Versions1
-rw-r--r--nptl/pthread_barrier_init.c3
-rw-r--r--nptl/pthread_barrier_wait.c3
-rw-r--r--sysdeps/sparc/nptl/pthread_barrier_init.c3
-rw-r--r--sysdeps/sparc/nptl/pthread_barrier_wait.c3
-rw-r--r--sysdeps/sparc/sparc32/pthread_barrier_wait.c3
-rw-r--r--sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S9
-rw-r--r--sysdeps/unix/sysv/linux/mq_notify.c6
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S9
12 files changed, 62 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index ea4aeebaad..5b1226a408 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2015-06-17  Joseph Myers  <joseph@codesourcery.com>
 
+	[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.
+
 	[BZ #18542]
 	* libio/iovswscanf.c (__vswscanf): Use libc_hidden_def.
 	(vswscanf): Use ldbl_weak_alias instead of ldbl_strong_alias
diff --git a/NEWS b/NEWS
index d501b31243..59586d41df 100644
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ Version 2.22
   18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434,
   18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498,
   18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532,
-  18533, 18534, 18536, 18539, 18540, 18542.
+  18533, 18534, 18536, 18539, 18540, 18542, 18544.
 
 * Cache information can be queried via sysconf() function on s390 e.g. with
   _SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/include/pthread.h b/include/pthread.h
index 51854f6053..858c869a16 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -1,6 +1,16 @@
 #include_next <pthread.h>
 
 #ifndef _ISOMAC
+/* Prototypes repeated instead of using __typeof because pthread.h is
+   included in C++ tests, and declaring functions with __typeof and
+   __THROW doesn't work for C++.  */
+extern int __pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
+				 const pthread_barrierattr_t *__restrict
+				 __attr, unsigned int __count)
+     __THROW __nonnull ((1));
+extern int __pthread_barrier_wait (pthread_barrier_t *__barrier)
+     __THROWNL __nonnull ((1));
+
 /* This function is called to initialize the pthread library.  */
 extern void __pthread_initialize (void) __attribute__ ((weak));
 #endif
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)
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)
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-01 17:18:30 +0000