r6803 - in glibc-package/trunk/debian: . patches/hurd-i386
Author: sthibault
Date: 2015-12-11 16:49:45 +0000 (Fri, 11 Dec 2015)
New Revision: 6803
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread-api.diff
Log:
patches/hurd-i386/cvs-libpthread-api.diff: Update patch, add missing throw specifications.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2015-12-11 16:49:27 UTC (rev 6802)
+++ glibc-package/trunk/debian/changelog 2015-12-11 16:49:45 UTC (rev 6803)
@@ -1,6 +1,8 @@
glibc (2.21-5) UNRELEASED; urgency=medium
- *
+ [ Samuel Thibault ]
+ * patches/hurd-i386/cvs-libpthread-api.diff: Update patch, add missing throw
+ specifications.
-- Aurelien Jarno <aurel32@debian.org> Thu, 10 Dec 2015 23:25:07 +0100
Modified: glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread-api.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread-api.diff 2015-12-11 16:49:27 UTC (rev 6802)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread-api.diff 2015-12-11 16:49:45 UTC (rev 6803)
@@ -1,3 +1,12 @@
+commit 907fab424120059d09aebaa083ddc0557d13f2ef
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Dec 11 17:46:36 2015 +0100
+
+ Add throw specification to inlines
+
+ * include/pthread/pthread.h: Add __THROW and __THROWNL specification to
+ extern inlines definitions.
+
commit 577a738522d34a64cb3cd5bb8368c8b1a344f38e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Dec 6 01:22:01 2015 +0100
@@ -237,7 +246,7 @@
/* Make calling thread wait for termination of thread THREAD. Return
the exit status of the thread in *STATUS. */
-@@ -209,7 +229,7 @@ extern int pthread_detach (pthread_t __t
+@@ -209,12 +229,12 @@ extern int pthread_detach (pthread_t __t
/* Compare thread IDs T1 and T2. Return nonzero if they are equal, 0
if they are not. */
@@ -246,6 +255,12 @@
# ifdef __USE_EXTERN_INLINES
+ __extern_inline int
+-pthread_equal (pthread_t __t1, pthread_t __t2)
++pthread_equal (pthread_t __t1, pthread_t __t2) __THROW
+ {
+ return __pthread_equal (__t1, __t2);
+ }
@@ -223,7 +243,7 @@ pthread_equal (pthread_t __t1, pthread_t
@@ -495,7 +510,7 @@
/* Spin locks. */
-@@ -439,22 +489,27 @@ extern int pthread_cond_timedwait (pthre
+@@ -439,53 +489,58 @@ extern int pthread_cond_timedwait (pthre
#define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER
/* Destroy the spin lock object LOCK. */
@@ -528,6 +543,42 @@
# ifdef __USE_EXTERN_INLINES
+ # include <bits/spin-lock-inline.h>
+
+ __extern_inline int
+-pthread_spin_destroy (pthread_spinlock_t *__lock)
++pthread_spin_destroy (pthread_spinlock_t *__lock) __THROW
+ {
+ return __pthread_spin_destroy (__lock);
+ }
+
+ __extern_inline int
+-pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
++pthread_spin_init (pthread_spinlock_t *__lock, int __pshared) __THROW
+ {
+ return __pthread_spin_init (__lock, __pshared);
+ }
+
+ __extern_inline int
+-pthread_spin_lock (pthread_spinlock_t *__lock)
++pthread_spin_lock (pthread_spinlock_t *__lock) __THROWNL
+ {
+ return __pthread_spin_lock (__lock);
+ }
+
+ __extern_inline int
+-pthread_spin_trylock (pthread_spinlock_t *__lock)
++pthread_spin_trylock (pthread_spinlock_t *__lock) __THROWNL
+ {
+ return __pthread_spin_trylock (__lock);
+ }
+
+ __extern_inline int
+-pthread_spin_unlock (pthread_spinlock_t *__lock)
++pthread_spin_unlock (pthread_spinlock_t *__lock) __THROWNL
+ {
+ return __pthread_spin_unlock (__lock);
+ }
@@ -503,21 +558,25 @@ pthread_spin_unlock (pthread_spinlock_t
/* Initialize rwlock attribute object in *ATTR to the default
Reply to: