r1843 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/patches branches/glibc-2.5/debian/patches/m68k trunk/debian trunk/debian/patches trunk/debian/patches/m68k
Author: aurel32
Date: 2006-10-07 21:50:50 +0000 (Sat, 07 Oct 2006)
New Revision: 1843
Added:
glibc-package/branches/glibc-2.5/debian/patches/m68k/local-pthread_lock.diff
glibc-package/trunk/debian/patches/m68k/local-pthread_lock.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add m68k/local-pthread_lock.diff (fix deadlock with pthread_spinlock) by
Roman Zippel (closes: bug#385917).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-07 13:20:54 UTC (rev 1842)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-07 21:50:50 UTC (rev 1843)
@@ -203,6 +203,8 @@
[ Aurelien Jarno ]
* Improve the heuristic used to detect other copy of the C library (closes:
bug#390950).
+ * Add m68k/local-pthread_lock.diff (fix deadlock with pthread_spinlock) by
+ Roman Zippel (closes: bug#385917).
-- Aurelien Jarno <aurel32@debian.org> Thu, 5 Oct 2006 15:41:00 +0200
Added: glibc-package/branches/glibc-2.5/debian/patches/m68k/local-pthread_lock.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/m68k/local-pthread_lock.diff (rev 0)
+++ glibc-package/branches/glibc-2.5/debian/patches/m68k/local-pthread_lock.diff 2006-10-07 21:50:50 UTC (rev 1843)
@@ -0,0 +1,22 @@
+Index: glibc-2.3.6/linuxthreads/sysdeps/m68k/pspinlock.c
+===================================================================
+--- glibc-2.3.6/linuxthreads/sysdeps/m68k/pspinlock.c
++++ glibc-2.3.6/linuxthreads/sysdeps/m68k/pspinlock.c
+@@ -25,7 +25,7 @@
+ int
+ __pthread_spin_lock (pthread_spinlock_t *lock)
+ {
+- unsigned int val;
++ unsigned char val;
+
+ do
+ asm volatile ("tas %1; sne %0"
+@@ -42,7 +42,7 @@ weak_alias (__pthread_spin_lock, pthread
+ int
+ __pthread_spin_trylock (pthread_spinlock_t *lock)
+ {
+- unsigned int val;
++ unsigned char val;
+
+ asm volatile ("tas %1; sne %0"
+ : "=dm" (val), "=m" (*lock)
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-07 13:20:54 UTC (rev 1842)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-07 21:50:50 UTC (rev 1843)
@@ -69,6 +69,7 @@
m68k/local-fpic.diff -p0
m68k/local-mathinline_h.diff -p1
m68k/local-reloc.diff -p1
+m68k/local-pthread_lock.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
mips/local-lazy-eval.diff -p2
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-10-07 13:20:54 UTC (rev 1842)
+++ glibc-package/trunk/debian/changelog 2006-10-07 21:50:50 UTC (rev 1843)
@@ -3,6 +3,8 @@
[ Aurelien Jarno ]
* Improve the heuristic used to detect other copy of the C library (closes:
bug#390950).
+ * Add m68k/local-pthread_lock.diff (fix deadlock with pthread_spinlock) by
+ Roman Zippel (closes: bug#385917).
-- Aurelien Jarno <aurel32@debian.org> Thu, 5 Oct 2006 15:41:00 +0200
Added: glibc-package/trunk/debian/patches/m68k/local-pthread_lock.diff
===================================================================
--- glibc-package/trunk/debian/patches/m68k/local-pthread_lock.diff (rev 0)
+++ glibc-package/trunk/debian/patches/m68k/local-pthread_lock.diff 2006-10-07 21:50:50 UTC (rev 1843)
@@ -0,0 +1,22 @@
+Index: glibc-2.3.6/linuxthreads/sysdeps/m68k/pspinlock.c
+===================================================================
+--- glibc-2.3.6/linuxthreads/sysdeps/m68k/pspinlock.c
++++ glibc-2.3.6/linuxthreads/sysdeps/m68k/pspinlock.c
+@@ -25,7 +25,7 @@
+ int
+ __pthread_spin_lock (pthread_spinlock_t *lock)
+ {
+- unsigned int val;
++ unsigned char val;
+
+ do
+ asm volatile ("tas %1; sne %0"
+@@ -42,7 +42,7 @@ weak_alias (__pthread_spin_lock, pthread
+ int
+ __pthread_spin_trylock (pthread_spinlock_t *lock)
+ {
+- unsigned int val;
++ unsigned char val;
+
+ asm volatile ("tas %1; sne %0"
+ : "=dm" (val), "=m" (*lock)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-10-07 13:20:54 UTC (rev 1842)
+++ glibc-package/trunk/debian/patches/series 2006-10-07 21:50:50 UTC (rev 1843)
@@ -100,6 +100,7 @@
m68k/local-dwarf2-buildfix.diff -p0
m68k/local-fpic.diff -p1
m68k/local-mathinline_h.diff -p1
+m68k/local-pthread_lock.diff -p1
m68k/local-reloc.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
Reply to: