[commits] r9888 - in /fsf/trunk/libc: ChangeLog sysdeps/i386/i686/multiarch/memcmp.S sysdeps/i386/i686/multiarch/strcmp.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Feb 19 00:02:55 2010
New Revision: 9888

Log:
Import glibc-mainline for 2010-02-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S
    fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Feb 19 00:02:55 2010
@@ -1,4 +1,8 @@
 2010-02-16  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/i386/i686/multiarch/memcmp.S (memcmp): Use CPUID_OFFSET
+	instead of FEATURE_OFFSET.
+	* sysdeps/i386/i686/multiarch/strcmp.S (strcmp): Likewise.
 
 	* sysdeps/i386/i686/multiarch/memcmp-sse4.S: Add alignnments.
 	Fix one unwind info problem.

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/memcmp.S Fri Feb 19 00:02:55 2010
@@ -58,7 +58,7 @@
 	testl	$bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
 	jz	2f
 	leal	__memcmp_ssse3, %eax
-	testl	$bit_SSE4_2, FEATURE_OFFSET+index_SSE4_2+__cpu_features
+	testl	$bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
 	jz	2f
 	leal	__memcmp_sse4_2, %eax
 2:	ret

Modified: fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S
==============================================================================
--- fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S (original)
+++ fsf/trunk/libc/sysdeps/i386/i686/multiarch/strcmp.S Fri Feb 19 00:02:55 2010
@@ -83,7 +83,7 @@
 	testl	$bit_SSSE3, CPUID_OFFSET+index_SSSE3+__cpu_features
 	jz	2f
 	leal	__STRCMP_SSSE3, %eax
-	testl	$bit_SSE4_2, FEATURE_OFFSET+index_SSE4_2+__cpu_features
+	testl	$bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features
 	jz	2f
 	leal	__STRCMP_SSE4_2, %eax
 2:	ret