[commits] r9315 - in /fsf/glibc-2_11-branch/libc: ChangeLog sysdeps/ia64/memchr.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Nov 21 00:05:40 2009
New Revision: 9315

Log:
Import glibc-2.11 for 2009-11-21

Modified:
    fsf/glibc-2_11-branch/libc/ChangeLog
    fsf/glibc-2_11-branch/libc/sysdeps/ia64/memchr.S

Modified: fsf/glibc-2_11-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_11-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_11-branch/libc/ChangeLog Sat Nov 21 00:05:40 2009
@@ -1,3 +1,9 @@
+2009-11-18  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	[BZ #10162]
+	* sysdeps/ia64/memchr.S: Don't use a simple loop on data shorter
+	than software pipeline.  Properly recover from shorter read.
+
 2009-11-16  Jakub Jelinek  <jakub@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/sync_file_range.c (sync_file_range):

Modified: fsf/glibc-2_11-branch/libc/sysdeps/ia64/memchr.S
==============================================================================
--- fsf/glibc-2_11-branch/libc/sysdeps/ia64/memchr.S (original)
+++ fsf/glibc-2_11-branch/libc/sysdeps/ia64/memchr.S Sat Nov 21 00:05:40 2009
@@ -126,7 +126,16 @@
 	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: