r6829 - glibc-package/trunk/debian/patches/hurd-i386
Author: sthibault
Date: 2015-12-22 12:05:43 +0000 (Tue, 22 Dec 2015)
New Revision: 6829
Modified:
glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread-api.diff
Log:
hurd-i386: Remove __THROW* from extern inlines
They pose more problems than they solve.
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-20 23:01:58 UTC (rev 6828)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-libpthread-api.diff 2015-12-22 12:05:43 UTC (rev 6829)
@@ -1,3 +1,15 @@
+commit f1039fbd8370797880deedf95a2aa7717e922102
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Tue Dec 22 13:00:18 2015 +0100
+
+ Remove __THROW* from extern inlines
+
+ They pose more problems than they solve.
+
+ * include/pthread/pthread.h (pthread_equal, pthread_spin_destroy,
+ pthread_spin_init, pthread_spin_lock, pthread_spin_trylock,
+ pthread_spin_unlock): Remove __THROW or __THROWNL attribute.
+
commit 907fab424120059d09aebaa083ddc0557d13f2ef
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri Dec 11 17:46:36 2015 +0100
@@ -56,8 +68,10 @@
* include/pthread/pthread.h: Prepend '__' to parameter names.
* sysdeps/mach/hurd/bits/pthread-np.h: Likewise.
---- a/libpthread/include/pthread/pthread.h
-+++ b/libpthread/include/pthread/pthread.h
+Index: glibc-2.21/libpthread/include/pthread/pthread.h
+===================================================================
+--- glibc-2.21.orig/libpthread/include/pthread/pthread.h
++++ glibc-2.21/libpthread/include/pthread/pthread.h
@@ -79,112 +79,132 @@ __BEGIN_DECLS
/* Initialize the thread attribute object in *ATTR to the default
@@ -246,21 +260,6 @@
/* Make calling thread wait for termination of thread THREAD. Return
the exit status of the thread in *STATUS. */
-@@ -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. */
--extern int pthread_equal (pthread_t __t1, pthread_t __t2);
-+extern int pthread_equal (pthread_t __t1, pthread_t __t2) __THROW;
-
- # 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
@@ -510,75 +509,39 @@
/* Spin locks. */
-@@ -439,53 +489,58 @@ extern int pthread_cond_timedwait (pthre
+@@ -439,22 +489,27 @@ extern int pthread_cond_timedwait (pthre
#define PTHREAD_SPINLOCK_INITIALIZER __PTHREAD_SPIN_LOCK_INITIALIZER
/* Destroy the spin lock object LOCK. */
-extern int pthread_spin_destroy (pthread_spinlock_t *__lock);
+extern int pthread_spin_destroy (pthread_spinlock_t *__lock)
-+ __THROW __nonnull ((1));
++ __nonnull ((1));
/* Initialize the spin lock object LOCK. PSHARED determines whether
the spin lock can be operated upon by multiple processes. */
-extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared);
+extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
-+ __THROW __nonnull ((1));
++ __nonnull ((1));
/* Lock the spin lock object LOCK. If the lock is held by another
thread spin until it becomes available. */
-extern int pthread_spin_lock (pthread_spinlock_t *__lock);
+extern int pthread_spin_lock (pthread_spinlock_t *__lock)
-+ __THROWNL __nonnull ((1));
++ __nonnull ((1));
/* Lock the spin lock object LOCK. Fail if the lock is held by
another thread. */
-extern int pthread_spin_trylock (pthread_spinlock_t *__lock);
+extern int pthread_spin_trylock (pthread_spinlock_t *__lock)
-+ __THROWNL __nonnull ((1));
++ __nonnull ((1));
/* Unlock the spin lock object LOCK. */
-extern int pthread_spin_unlock (pthread_spinlock_t *__lock);
+extern int pthread_spin_unlock (pthread_spinlock_t *__lock)
-+ __THROWNL __nonnull ((1));
++ __nonnull ((1));
# 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
@@ -873,8 +836,10 @@
#endif
---- a/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
-+++ b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+Index: glibc-2.21/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+===================================================================
+--- glibc-2.21.orig/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
++++ glibc-2.21/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
@@ -33,6 +33,6 @@ extern int pthread_hurd_cond_wait_np (pt
See hurd_thread_cancel. */
extern int pthread_hurd_cond_timedwait_np (pthread_cond_t *__restrict __cond,
Reply to: