Author: aurel32
Date: 2010-02-23 10:24:41 +0000 (Tue, 23 Feb 2010)
New Revision: 4204

Added:
   glibc-package/trunk/debian/patches/sparc/cvs-sparcv9-memchr.diff
Removed:
   glibc-package/trunk/debian/patches/sparc/local-sparcv9-memchr.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * Replace patches/sparc/local-sparcv9-memchr.diff by 
    patches/sparc/cvs-sparcv9-memchr.diff.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2010-02-22 14:54:41 UTC (rev 
4203)
+++ glibc-package/trunk/debian/changelog        2010-02-23 10:24:41 UTC (rev 
4204)
@@ -17,14 +17,16 @@
     macro starting with POSIX 2001.  Closes: #569517.
   * scripts.in/nsscheck.sh: remove non-breaking space.  Closes: #569701.
   * rules.d/debhelper.mk: remove obsolete comment.  Closes: #570946.
+  * Replace patches/sparc/local-sparcv9-memchr.diff by 
+    patches/sparc/cvs-sparcv9-memchr.diff.
 
   [ Petr Salinger]
   * kfreebsd/local-sysdeps.diff: update to revision 2986 (from glibc-bsd).
   * Drop kfreebsd/local-ftw.diff, use *at functions as other architectures,
-    the 8.0 kernel supports them as native, 
-    under previous kernels we have limited emulation.
+    the 8.0 kernel supports them as native, under previous kernels we have
+    limited emulation. 
 
- -- Aurelien Jarno <[email protected]>  Sun, 14 Feb 2010 15:03:02 +0100
+ -- Aurelien Jarno <[email protected]>  Tue, 23 Feb 2010 11:24:08 +0100
 
 eglibc (2.10.2-6) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2010-02-22 14:54:41 UTC (rev 
4203)
+++ glibc-package/trunk/debian/patches/series   2010-02-23 10:24:41 UTC (rev 
4204)
@@ -148,7 +148,7 @@
 sparc/local-fork.diff
 sparc/local-sparcv9-target.diff
 sparc/submitted-timing.diff
-sparc/local-sparcv9-memchr.diff
+sparc/cvs-sparcv9-memchr.diff
 
 all/local-alias-UTF-8.diff
 all/local-alias-et_EE.diff

Added: glibc-package/trunk/debian/patches/sparc/cvs-sparcv9-memchr.diff
===================================================================
--- glibc-package/trunk/debian/patches/sparc/cvs-sparcv9-memchr.diff            
                (rev 0)
+++ glibc-package/trunk/debian/patches/sparc/cvs-sparcv9-memchr.diff    
2010-02-23 10:24:41 UTC (rev 4204)
@@ -0,0 +1,18 @@
+2009-02-20  David S. Miller  <[email protected]>
+ 
+       * sysdeps/sparc/sparc64/memchr.S: Use unsigned branch on greater to
+       test end of buffer.
+
+diff --git a/sysdeps/sparc/sparc64/memchr.S b/sysdeps/sparc/sparc64/memchr.S
+index 4f13cb5..ab1666b 100644
+--- a/sysdeps/sparc/sparc64/memchr.S
++++ b/sysdeps/sparc/sparc64/memchr.S
+@@ -96,7 +96,7 @@ ENTRY(__memchr)
+                                                        * %o4 =   value XOR c  
        */
+ 2:    cmp             %o0, %o2                        /* IEU1         Group   
        */
+ 
+-      bg,pn           %XCC, 11f                       /* CTI                  
        */
++      bgu,pn          %XCC, 11f                       /* CTI                  
        */
+        ldxa           [%o0] ASI_PNF, %o3              /* Load                 
        */
+       sub             %o4, %g1, %o5                   /* IEU0         Group   
        */
+       add             %o0, 8, %o0                     /* IEU1                 
        */

Deleted: glibc-package/trunk/debian/patches/sparc/local-sparcv9-memchr.diff
===================================================================
--- glibc-package/trunk/debian/patches/sparc/local-sparcv9-memchr.diff  
2010-02-22 14:54:41 UTC (rev 4203)
+++ glibc-package/trunk/debian/patches/sparc/local-sparcv9-memchr.diff  
2010-02-23 10:24:41 UTC (rev 4204)
@@ -1,12 +0,0 @@
-2009-10-18  Aurelien Jarno <[email protected]>
-
-        * sysdeps/sparc/sparc32/sparcv9/memchr.S: remove, causes failures
-       of test-memchr.
-
---- a/sysdeps/sparc/sparc32/sparcv9/memchr.S
-+++ /dev/null
-@@ -1,4 +0,0 @@
--#define ASI_PNF     0x82
--#define ASI_BLK_P   0xf0
--#define XCC icc
--#include <sparc64/memchr.S>


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to