* debian/ patches/libpthread_mutex-no-include.patch: New patch to drop

    useless (and problematic) inclusion from mutex.h.
  * debian/patches/libpthread_spin-lock-inline.patch: New patch to split off
    inlines from spin-lock.h into spin-lock-inline.h to avoid including too
    many headers from pthreadtypes.h (fixes glibc 2.7-13 compilation).

1 files changed, 0 insertions, 25 deletions

diff --git a/debian/patches/lock-memory-clobber.patch b/debian/patches/lock-memory-clobber.patch
index 9d677e4d..3d16074e 100644
--- a/debian/patches/lock-memory-clobber.patch
+++ b/debian/patches/lock-memory-clobber.patch
@@ -14,31 +14,6 @@ diff -u -p -r1.3 memory.h
  }
  
  /* Prevent read reordering across this function.  */
-Index: libpthread/sysdeps/i386/bits/spin-lock.h
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/i386/bits/spin-lock.h,v
-retrieving revision 1.5
-diff -u -p -r1.5 spin-lock.h
---- libpthread/sysdeps/i386/bits/spin-lock.h	1 Jul 2008 11:43:17 -0000	1.5
-+++ libpthread/sysdeps/i386/bits/spin-lock.h	2 Aug 2008 20:38:31 -0000
-@@ -70,7 +70,7 @@ __pthread_spin_trylock (__pthread_spinlo
- {
-   int __locked;
-   __asm__ __volatile ("xchgl %0, %1"
--		      : "=&r" (__locked), "=m" (*__lock) : "0" (1));
-+		      : "=&r" (__locked), "=m" (*__lock) : "0" (1) : "memory");
-   return __locked ? __EBUSY : 0;
- }
- 
-@@ -92,7 +92,7 @@ __pthread_spin_unlock (__pthread_spinloc
- {
-   int __unlocked;
-   __asm__ __volatile ("xchgl %0, %1"
--		      : "=&r" (__unlocked), "=m" (*__lock) : "0" (0));
-+		      : "=&r" (__unlocked), "=m" (*__lock) : "0" (0) : "memory");
-   return 0;
- }
- 
 Index: libthreads/i386/cthreads.h
 ===================================================================
 RCS file: /cvsroot/hurd/hurd/libthreads/i386/cthreads.h,v