Author: aurel32
Date: 2008-01-22 22:14:04 +0000 (Tue, 22 Jan 2008)
New Revision: 2792

Added:
   glibc-package/trunk/debian/patches/mips/local-r10k.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * patches/mips/local-r10k.diff: new patch from Florian Lohoff to 
    workaround LL/SC bug on R10k.  Closes: #462112.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2008-01-21 20:29:36 UTC (rev 
2791)
+++ glibc-package/trunk/debian/changelog        2008-01-22 22:14:04 UTC (rev 
2792)
@@ -10,10 +10,12 @@
 
   [ Aurelien Jarno ]
   * patches/any/local-ldso-disable-hwcap.diff: enable tls/ directory even
-    when hardware capabilities are disabled. This workarounds a bug in 
+    when hardware capabilities are disabled. This workarounds a bug in
     nvidia-glx.  Closes: #453480.
+  * patches/mips/local-r10k.diff: new patch from Florian Lohoff to 
+    workaround LL/SC bug on R10k.  Closes: #462112.
 
- -- Aurelien Jarno <[EMAIL PROTECTED]>  Mon, 21 Jan 2008 21:07:44 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]>  Tue, 22 Jan 2008 23:11:59 +0100
 
 glibc (2.7-6) unstable; urgency=low
 

Added: glibc-package/trunk/debian/patches/mips/local-r10k.diff
===================================================================
--- glibc-package/trunk/debian/patches/mips/local-r10k.diff                     
        (rev 0)
+++ glibc-package/trunk/debian/patches/mips/local-r10k.diff     2008-01-22 
22:14:04 UTC (rev 2792)
@@ -0,0 +1,62 @@
+the R10000 needs an LL/SC Workaround. If not applied all R10k before
+rev 3.0 misbehave on atomic ops and rev 2.6 and lower (e.g. SGI IP28)
+die after very few seconds with a deadlock due to even more erratas.
+
+diff -Nur glibc-2.7.orig/ports/sysdeps/mips/bits/atomic.h 
glibc-2.7/ports/sysdeps/mips/bits/atomic.h
+--- ports/sysdeps/mips/bits/atomic.h.orig      2005-03-28 09:14:59.000000000 
+0000
++++ ports/sysdeps/mips/bits/atomic.h   2008-01-18 11:17:14.000000000 +0000
+@@ -74,7 +74,7 @@
+      "bne     %0,%2,2f\n\t"                                                 \
+      "move    %1,%3\n\t"                                                    \
+      "sc      %1,%4\n\t"                                                    \
+-     "beqz    %1,1b\n"                                                      \
++     "beqzl   %1,1b\n"                                                      \
+      acq      "\n\t"                                                        \
+      ".set    pop\n"                                                        \
+      "2:\n\t"                                                               \
+@@ -98,7 +98,7 @@
+      "bne     %0,%2,2f\n\t"                                                 \
+      "move    %1,%3\n\t"                                                    \
+      "scd     %1,%4\n\t"                                                    \
+-     "beqz    %1,1b\n"                                                      \
++     "beqzl   %1,1b\n"                                                      \
+      acq      "\n\t"                                                        \
+      ".set    pop\n"                                                        \
+      "2:\n\t"                                                               \
+@@ -192,7 +192,7 @@
+      "ll      %0,%3\n\t"                                                    \
+      "move    %1,%2\n\t"                                                    \
+      "sc      %1,%3\n\t"                                                    \
+-     "beqz    %1,1b\n"                                                      \
++     "beqzl   %1,1b\n"                                                      \
+      acq      "\n\t"                                                        \
+      ".set    pop\n"                                                        \
+      "2:\n\t"                                                               \
+@@ -216,7 +216,7 @@
+      "lld     %0,%3\n\t"                                                    \
+      "move    %1,%2\n\t"                                                    \
+      "scd     %1,%3\n\t"                                                    \
+-     "beqz    %1,1b\n"                                                      \
++     "beqzl   %1,1b\n"                                                      \
+      acq      "\n\t"                                                        \
+      ".set    pop\n"                                                        \
+      "2:\n\t"                                                               \
+@@ -251,7 +251,7 @@
+      "ll      %0,%3\n\t"                                                    \
+      "addu    %1,%0,%2\n\t"                                                 \
+      "sc      %1,%3\n\t"                                                    \
+-     "beqz    %1,1b\n"                                                      \
++     "beqzl   %1,1b\n"                                                      \
+      acq      "\n\t"                                                        \
+      ".set    pop\n"                                                        \
+      "2:\n\t"                                                               \
+@@ -275,7 +275,7 @@
+      "lld     %0,%3\n\t"                                                    \
+      "daddu   %1,%0,%2\n\t"                                                 \
+      "scd     %1,%3\n\t"                                                    \
+-     "beqz    %1,1b\n"                                                      \
++     "beqzl   %1,1b\n"                                                      \
+      acq      "\n\t"                                                        \
+      ".set    pop\n"                                                        \
+      "2:\n\t"                                                               \
+

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2008-01-21 20:29:36 UTC (rev 
2791)
+++ glibc-package/trunk/debian/patches/series   2008-01-22 22:14:04 UTC (rev 
2792)
@@ -106,6 +106,7 @@
 m68k/submitted-gcc34-seccomment.diff -p0
 
 mips/local-lazy-eval.diff -p0
+mips/local-r10k.diff -p0
 mips/local-setjmp.diff -p0
 
 powerpc/local-sysconf.diff 


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

Reply via email to