summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Banck <mbanck@debian.org>2007-07-17 13:01:40 +0000
committerMichael Banck <mbanck@debian.org>2007-07-17 13:01:40 +0000
commit667099687349eb43c02a9b2dec40547d791af72b (patch)
treedb348cacf924329776ac7b6b1224d59b0c35d63c
parent813bcc0aba0bf2b396c9edbba6957b48850d1c15 (diff)
* debian/patches/libpthread_weak_inline.patch: Removed.
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/libpthread_weak_inline.patch47
2 files changed, 1 insertions, 47 deletions
diff --git a/debian/changelog b/debian/changelog
index d16bfdb2..b97975cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hurd (20070606-1+SVN) UNRELEASED; urgency=low
* debian/patches/libpthread_tls_transitional.patch: New patch,
implements TLS for libpthread, by Samuel Thibault.
+ * debian/patches/libpthread_weak_inline.patch: Removed.
-- Michael Banck <mbanck@debian.org> Sun, 10 Jun 2007 20:08:21 +0200
diff --git a/debian/patches/libpthread_weak_inline.patch b/debian/patches/libpthread_weak_inline.patch
deleted file mode 100644
index 13e1cc90..00000000
--- a/debian/patches/libpthread_weak_inline.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: libpthread/sysdeps/generic/bits/mutex.h
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/bits/mutex.h,v
-retrieving revision 1.3
-diff -u -p -r1.3 mutex.h
---- libpthread/sysdeps/generic/bits/mutex.h 12 May 2005 20:55:38 -0000 1.3
-+++ libpthread/sysdeps/generic/bits/mutex.h 10 Dec 2005 19:45:49 -0000
-@@ -75,7 +75,8 @@ pthread_mutex_init (struct __pthread_mut
- struct __pthread_mutex initialized_mutex = __PTHREAD_MUTEX_INITIALIZER;
-
- extern int _pthread_mutex_init (struct __pthread_mutex *,
-- const pthread_mutexattr_t *);
-+ const pthread_mutexattr_t *)
-+ __attribute__ ((weak));
-
- if (attr)
- return _pthread_mutex_init (__mutex, attr);
-@@ -87,7 +88,8 @@ pthread_mutex_init (struct __pthread_mut
- _EXTERN_INLINE int
- pthread_mutex_destroy (struct __pthread_mutex *__mutex)
- {
-- extern int _pthread_mutex_destroy (struct __pthread_mutex *);
-+ extern int _pthread_mutex_destroy (struct __pthread_mutex *)
-+ __attribute__ ((weak));
-
- if (__mutex->attr || __mutex->data)
- return _pthread_mutex_destroy (__mutex);
-@@ -98,7 +100,8 @@ pthread_mutex_destroy (struct __pthread_
- _EXTERN_INLINE int
- __pthread_mutex_lock (struct __pthread_mutex *__mutex)
- {
-- extern int _pthread_mutex_lock (struct __pthread_mutex *);
-+ extern int _pthread_mutex_lock (struct __pthread_mutex *)
-+ __attribute__ ((weak));
-
- if (__mutex->attr == NULL
- && __mutex->data == NULL
-@@ -111,7 +114,8 @@ __pthread_mutex_lock (struct __pthread_m
- extern __inline int
- __pthread_mutex_trylock (struct __pthread_mutex *__mutex)
- {
-- extern int _pthread_mutex_trylock (struct __pthread_mutex *);
-+ extern int _pthread_mutex_trylock (struct __pthread_mutex *)
-+ __attribute__ ((weak));
-
- if (__mutex->attr == NULL
- && __mutex->data == NULL)