r3946 - in glibc-package/trunk/debian: . patches patches/ia64
Author: aurel32
Date: 2009-11-09 21:32:19 +0000 (Mon, 09 Nov 2009)
New Revision: 3946
Added:
glibc-package/trunk/debian/patches/ia64/submitted-memchr.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/ia64/submitted-memchr.diff: fix memchr() when data is shorter
than software pipeline.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-09 21:22:21 UTC (rev 3945)
+++ glibc-package/trunk/debian/changelog 2009-11-09 21:32:19 UTC (rev 3946)
@@ -7,8 +7,10 @@
* Strip *.o files manually (dh_strip does not do it) to prevent
leakage of the build directory (has been lost in a merge).
* script.in/nsscheck.sh: fix call to invoke-rc.d. Closes: #555463.
+ * patches/ia64/submitted-memchr.diff: fix memchr() when data is shorter
+ than software pipeline.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 09 Nov 2009 22:21:48 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 09 Nov 2009 22:31:22 +0100
eglibc (2.10.1-6) unstable; urgency=high
Added: glibc-package/trunk/debian/patches/ia64/submitted-memchr.diff
===================================================================
--- glibc-package/trunk/debian/patches/ia64/submitted-memchr.diff (rev 0)
+++ glibc-package/trunk/debian/patches/ia64/submitted-memchr.diff 2009-11-09 21:32:19 UTC (rev 3946)
@@ -0,0 +1,26 @@
+2009-11-09 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR libc/10162
+ * sysdeps/ia64/memchr.S: Properly recover from shorter read.
+
+--- a/sysdeps/ia64/memchr.S
++++ b/sysdeps/ia64/memchr.S
+@@ -126,7 +126,16 @@ ENTRY(__memchr)
+ br.ret.sptk.many b0
+
+ .recovery:
+- adds ret0 = -((MEMLAT + 1) * 8), ret0;;
++#if MEMLAT != 6
++# error "MEMLAT must be 6!"
++#endif
++(p[MEMLAT-6]) add ret0 = -8, ret0;;
++(p[MEMLAT-5]) add ret0 = -8, ret0;;
++(p[MEMLAT-4]) add ret0 = -8, ret0;;
++(p[MEMLAT-3]) add ret0 = -8, ret0;;
++(p[MEMLAT-2]) add ret0 = -8, ret0;;
++(p[MEMLAT-1]) add ret0 = -8, ret0;;
++(p[MEMLAT]) add ret0 = -8, ret0;;
+ (p[MEMLAT+1]) add ret0 = -8, ret0;;
+ (p[MEMLAT+2]) add ret0 = -8, ret0;;
+ .l4:
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-11-09 21:22:21 UTC (rev 3945)
+++ glibc-package/trunk/debian/patches/series 2009-11-09 21:32:19 UTC (rev 3946)
@@ -111,6 +111,7 @@
ia64/submitted-sysconf.diff
ia64/submitted-libm.diff
ia64/submitted-siginfo.diff
+ia64/submitted-memchr.diff
i386/local-biarch.diff
i386/local-clone.diff
Reply to: