Merge branch 'master' into 2.262.26

10 files changed, 16 insertions, 10 deletions

diff --git a/sysdeps/generic/pt-attr-getstack.c b/sysdeps/generic/pt-attr-getstack.c
index 7beb79f..5ab821e 100644
--- a/sysdeps/generic/pt-attr-getstack.c
+++ b/sysdeps/generic/pt-attr-getstack.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_attr_getstack (const pthread_attr_t *attr,
+__pthread_attr_getstack (const pthread_attr_t *attr,
 		       void **stackaddr,
 		       size_t *stacksize)
 {
@@ -29,3 +29,4 @@ pthread_attr_getstack (const pthread_attr_t *attr,
   pthread_attr_getstacksize (attr, stacksize);
   return 0;
 }
+weak_alias (__pthread_attr_getstack, pthread_attr_getstack)
diff --git a/sysdeps/generic/pt-mutexattr-destroy.c b/sysdeps/generic/pt-mutexattr-destroy.c
index fe7e95d..fc0479b 100644
--- a/sysdeps/generic/pt-mutexattr-destroy.c
+++ b/sysdeps/generic/pt-mutexattr-destroy.c
@@ -21,7 +21,8 @@
 #include <pt-internal.h>
 
 int
-pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
+__pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
 {
   return 0;
 }
+weak_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy)
diff --git a/sysdeps/generic/pt-mutexattr-init.c b/sysdeps/generic/pt-mutexattr-init.c
index 2f23673..82f5da2 100644
--- a/sysdeps/generic/pt-mutexattr-init.c
+++ b/sysdeps/generic/pt-mutexattr-init.c
@@ -21,8 +21,9 @@
 #include <pt-internal.h>
 
 int
-pthread_mutexattr_init (pthread_mutexattr_t *attr)
+__pthread_mutexattr_init (pthread_mutexattr_t *attr)
 {
   *attr = __pthread_default_mutexattr;
   return 0;
 }
+weak_alias (__pthread_mutexattr_init, pthread_mutexattr_init)
diff --git a/sysdeps/generic/pt-mutexattr-settype.c b/sysdeps/generic/pt-mutexattr-settype.c
index 5c46010..7a7ce35 100644
--- a/sysdeps/generic/pt-mutexattr-settype.c
+++ b/sysdeps/generic/pt-mutexattr-settype.c
@@ -21,7 +21,7 @@
 #include <pt-internal.h>
 
 int
-pthread_mutexattr_settype (pthread_mutexattr_t *attr, int type)
+__pthread_mutexattr_settype (pthread_mutexattr_t *attr, int type)
 {
   switch (type)
     {
@@ -35,3 +35,4 @@ pthread_mutexattr_settype (pthread_mutexattr_t *attr, int type)
       return EINVAL;
     }
 }
+weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype)
diff --git a/sysdeps/generic/pt-rwlock-rdlock.c b/sysdeps/generic/pt-rwlock-rdlock.c
index 6eca601..708e3e1 100644
--- a/sysdeps/generic/pt-rwlock-rdlock.c
+++ b/sysdeps/generic/pt-rwlock-rdlock.c
@@ -30,4 +30,4 @@ __pthread_rwlock_rdlock (struct __pthread_rwlock *rwlock)
 {
   return __pthread_rwlock_timedrdlock_internal (rwlock, 0);
 }
-strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock);
+weak_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock);
diff --git a/sysdeps/generic/pt-rwlock-timedrdlock.c b/sysdeps/generic/pt-rwlock-timedrdlock.c
index 69bc757..4cfba43 100644
--- a/sysdeps/generic/pt-rwlock-timedrdlock.c
+++ b/sysdeps/generic/pt-rwlock-timedrdlock.c
@@ -113,8 +113,9 @@ __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
 }
 
 int
-pthread_rwlock_timedrdlock (struct __pthread_rwlock *rwlock,
+__pthread_rwlock_timedrdlock (struct __pthread_rwlock *rwlock,
 			    const struct timespec *abstime)
 {
   return __pthread_rwlock_timedrdlock_internal (rwlock, abstime);
 }
+weak_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock)
diff --git a/sysdeps/generic/pt-rwlock-timedwrlock.c b/sysdeps/generic/pt-rwlock-timedwrlock.c
index be25629..2adaf03 100644
--- a/sysdeps/generic/pt-rwlock-timedwrlock.c
+++ b/sysdeps/generic/pt-rwlock-timedwrlock.c
@@ -96,8 +96,9 @@ __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock,
 }
 
 int
-pthread_rwlock_timedwrlock (struct __pthread_rwlock *rwlock,
+__pthread_rwlock_timedwrlock (struct __pthread_rwlock *rwlock,
 			    const struct timespec *abstime)
 {
   return __pthread_rwlock_timedwrlock_internal (rwlock, abstime);
 }
+weak_alias (__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock)
diff --git a/sysdeps/generic/pt-rwlock-unlock.c b/sysdeps/generic/pt-rwlock-unlock.c
index d538544..0506ae6 100644
--- a/sysdeps/generic/pt-rwlock-unlock.c
+++ b/sysdeps/generic/pt-rwlock-unlock.c
@@ -96,4 +96,4 @@ __pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
   __pthread_spin_unlock (&rwlock->__lock);
   return 0;
 }
-strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock);
+weak_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock);
diff --git a/sysdeps/generic/pt-rwlock-wrlock.c b/sysdeps/generic/pt-rwlock-wrlock.c
index 68254d1..c769bc6 100644
--- a/sysdeps/generic/pt-rwlock-wrlock.c
+++ b/sysdeps/generic/pt-rwlock-wrlock.c
@@ -32,4 +32,4 @@ __pthread_rwlock_wrlock (struct __pthread_rwlock *rwlock)
 {
   return __pthread_rwlock_timedwrlock_internal (rwlock, 0);
 }
-strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock);
+weak_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock);
diff --git a/sysdeps/generic/sem-timedwait.c b/sysdeps/generic/sem-timedwait.c
index 7ab1583..11c1391 100644
--- a/sysdeps/generic/sem-timedwait.c
+++ b/sysdeps/generic/sem-timedwait.c
@@ -97,4 +97,4 @@ __sem_timedwait (sem_t *restrict sem,
   return __sem_timedwait_internal (sem, timeout);
 }
 
-strong_alias (__sem_timedwait, sem_timedwait);
+weak_alias (__sem_timedwait, sem_timedwait);