Author: aurel32
Date: 2008-11-03 23:39:41 +0000 (Mon, 03 Nov 2008)
New Revision: 3185

Added:
   glibc-package/trunk/debian/patches/s390/local-atomic.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * patches/s390/local-atomic.diff: new patch from Michael Matz to fix 
    atomic lock on s390.  Closes: bug#468793, bug#479952.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2008-11-03 22:24:44 UTC (rev 
3184)
+++ glibc-package/trunk/debian/changelog        2008-11-03 23:39:41 UTC (rev 
3185)
@@ -2,6 +2,8 @@
 
   * patches/any/cvs-rpcgen-makefile.diff: new patch from upstream to fix
     fancy Makefile filename when using rpcgen -a.  Closes: bug#503182.
+  * patches/s390/local-atomic.diff: new patch from Michael Matz to fix 
+    atomic lock on s390.  Closes: bug#468793, bug#479952.
 
  -- Aurelien Jarno <[EMAIL PROTECTED]>  Mon, 03 Nov 2008 23:00:07 +0100
 

Added: glibc-package/trunk/debian/patches/s390/local-atomic.diff
===================================================================
--- glibc-package/trunk/debian/patches/s390/local-atomic.diff                   
        (rev 0)
+++ glibc-package/trunk/debian/patches/s390/local-atomic.diff   2008-11-03 
23:39:41 UTC (rev 3185)
@@ -0,0 +1,21 @@
+--- a/sysdeps/s390/bits/atomic.h
++++ b/sysdeps/s390/bits/atomic.h
+@@ -56,7 +56,7 @@ typedef uintmax_t uatomic_max_t;
+      __typeof (*mem) __archold = (oldval);                                  \
+      __asm __volatile ("cs %0,%2,%1"                                        \
+                      : "+d" (__archold), "=Q" (*__archmem)                  \
+-                     : "d" (newval), "m" (*__archmem) : "cc" );             \
++                     : "d" (newval), "m" (*__archmem) : "cc", "memory" );   \
+      __archold; })
+ 
+ #ifdef __s390x__
+@@ -65,7 +65,8 @@ typedef uintmax_t uatomic_max_t;
+      __typeof (*mem) __archold = (oldval);                                  \
+      __asm __volatile ("csg %0,%2,%1"                                       \
+                      : "+d" (__archold), "=Q" (*__archmem)                  \
+-                     : "d" ((long) (newval)), "m" (*__archmem) : "cc" );    \
++                     : "d" ((long) (newval)), "m" (*__archmem)              \
++                     : "cc", "memory" );                                    \
+      __archold; })
+ #else
+ /* For 31 bit we do not really need 64-bit compare-and-exchange. We can

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2008-11-03 22:24:44 UTC (rev 
3184)
+++ glibc-package/trunk/debian/patches/series   2008-11-03 23:39:41 UTC (rev 
3185)
@@ -132,6 +132,7 @@
 
 powerpc/local-sysconf.diff 
 
+s390/local-atomic.diff -p1
 s390/submitted-nexttowardf.diff -p1
 
 sh4/local-fpscr_values.diff -p0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to