Merge branch 'master' into master-glibc-2.23

9 files changed, 17 insertions, 18 deletions

diff --git a/sysdeps/generic/pt-kill.c b/sysdeps/generic/pt-kill.c
index 0dfac34..fc83f93 100644
--- a/sysdeps/generic/pt-kill.c
+++ b/sysdeps/generic/pt-kill.c
@@ -18,10 +18,11 @@
    License along with this program.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <pthreadP.h>
 #include "sig-internal.h"
 
 int
-pthread_kill (pthread_t tid, int signo)
+__pthread_kill (pthread_t tid, int signo)
 {
   siginfo_t si;
   memset (&si, 0, sizeof (si));
@@ -29,4 +30,4 @@ pthread_kill (pthread_t tid, int signo)
 
   return pthread_kill_siginfo_np (tid, si);
 }
-
+strong_alias (__pthread_kill, pthread_kill)
diff --git a/sysdeps/generic/raise.c b/sysdeps/generic/raise.c
index f086665..cc18b39 100644
--- a/sysdeps/generic/raise.c
+++ b/sysdeps/generic/raise.c
@@ -18,12 +18,12 @@
    License along with this program.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <pthread.h>
+#include <pthreadP.h>
 #include <signal.h>
 #include <unistd.h>
 
-#pragma weak pthread_kill
-#pragma weak pthread_self
+#pragma weak __pthread_kill
+#pragma weak __pthread_self
 int
 raise (int signo)
 {
@@ -31,10 +31,10 @@ raise (int signo)
      "the effect of the raise() function shall be equivalent to
      calling: pthread_kill(pthread_self(), sig);"  */
 
-  if (pthread_kill)
+  if (__pthread_kill)
     {
       int err;
-      err = pthread_kill (pthread_self (), signo);
+      err = __pthread_kill (__pthread_self (), signo);
       if (err)
 	{
 	  errno = err;
diff --git a/sysdeps/hurd/pt-key-delete.c b/sysdeps/hurd/pt-key-delete.c
index 9d88647..8b2c8bb 100644
--- a/sysdeps/hurd/pt-key-delete.c
+++ b/sysdeps/hurd/pt-key-delete.c
@@ -40,7 +40,7 @@ pthread_key_delete (pthread_key_t key)
       __pthread_key_destructors[key] = PTHREAD_KEY_INVALID;
       __pthread_key_invalid_count ++;
 
-      pthread_rwlock_rdlock (&__pthread_threads_lock);
+      __pthread_rwlock_rdlock (&__pthread_threads_lock);
       for (i = 0; i < __pthread_num_threads; ++i)
 	{
 	  struct __pthread *t;
@@ -55,7 +55,7 @@ pthread_key_delete (pthread_key_t key)
 	  if (t->thread_specifics)
 	    hurd_ihash_remove (t->thread_specifics, key);
 	}
-      pthread_rwlock_unlock (&__pthread_threads_lock);
+      __pthread_rwlock_unlock (&__pthread_threads_lock);
     }
 
   __pthread_mutex_unlock (&__pthread_key_lock);
diff --git a/sysdeps/hurd/pt-kill.c b/sysdeps/hurd/pt-kill.c
index 49dfd7d..6aaf241 100644
--- a/sysdeps/hurd/pt-kill.c
+++ b/sysdeps/hurd/pt-kill.c
@@ -25,7 +25,7 @@
 #include <pt-internal.h>
 
 int
-pthread_kill (pthread_t thread, int sig)
+__pthread_kill (pthread_t thread, int sig)
 {
   struct __pthread *pthread;
   struct hurd_signal_detail detail;
@@ -49,3 +49,4 @@ pthread_kill (pthread_t thread, int sig)
   __spin_lock (&ss->lock);
   return _hurd_raise_signal (ss, sig, &detail);
 }
+strong_alias (__pthread_kill, pthread_kill)
diff --git a/sysdeps/mach/pt-thread-terminate.c b/sysdeps/mach/pt-thread-terminate.c
index cb9e26a..5d9da26 100644
--- a/sysdeps/mach/pt-thread-terminate.c
+++ b/sysdeps/mach/pt-thread-terminate.c
@@ -74,7 +74,7 @@ __pthread_thread_terminate (struct __pthread *thread)
   /* Terminate and release all that's left.  */
   err = __thread_terminate_release (kernel_thread, mach_task_self (),
 				    kernel_thread, reply_port,
-				    stackaddr, stacksize);
+				    (vm_address_t) stackaddr, stacksize);
 
   /* The kernel does not support it yet.  Leak but at least terminate
      correctly.  */
diff --git a/sysdeps/pthread/bits/once.h b/sysdeps/pthread/bits/once.h
index 05895b9..53dbfd3 100644
--- a/sysdeps/pthread/bits/once.h
+++ b/sysdeps/pthread/bits/once.h
@@ -29,6 +29,6 @@ struct __pthread_once
 };
 
 #define __PTHREAD_ONCE_INIT \
-	{ 0, __PTHREAD_SPIN_LOCK_INITIALIZER }
+	(struct __pthread_once) { 0, __PTHREAD_SPIN_LOCK_INITIALIZER }
 
 #endif /* bits/once.h */
diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c
index b552cd6..0153a2c 100644
--- a/sysdeps/pthread/flockfile.c
+++ b/sysdeps/pthread/flockfile.c
@@ -22,8 +22,7 @@
 
 
 void
-__flockfile (stream)
-     FILE *stream;
+__flockfile (FILE *stream)
 {
 #ifdef SHARED
   __libc_ptf_call (_IO_flockfile, (stream), 0);
diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c
index c33de88..48420de 100644
--- a/sysdeps/pthread/ftrylockfile.c
+++ b/sysdeps/pthread/ftrylockfile.c
@@ -23,8 +23,7 @@
 
 
 int
-__ftrylockfile (stream)
-     FILE *stream;
+__ftrylockfile (FILE *stream)
 {
 #ifdef SHARED
   return __libc_ptf_call (_IO_ftrylockfile, (stream), 0);
diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c
index 05edc66..78fd211 100644
--- a/sysdeps/pthread/funlockfile.c
+++ b/sysdeps/pthread/funlockfile.c
@@ -23,8 +23,7 @@
 
 
 void
-__funlockfile (stream)
-     FILE *stream;
+__funlockfile (FILE *stream)
 {
 #ifdef SHARED
   __libc_ptf_call (_IO_funlockfile, (stream), 0);