Fix limit detection in x86-64 SSE2 strncasecmp.

diff --git a/ChangeLog b/ChangeLog
index 2b017c848e3603ff6a60f0039db0db43f3d9d955..99f168b8287e0b5c28262c9e8ad6f5e2c92fe42a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-20  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/x86_64/strcmp.S: Fix another type in strncasecmp limit
+       detection.
+
 2010-09-20  Andreas Schwab  <schwab@redhat.com>
 
        * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Add

diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
index 54e5bbc31dfc745944edd4cf5cf63286162f844f..19776435f23b748c4fe717779f17d43000e2e5f5 100644 (file)
--- a/sysdeps/x86_64/multiarch/strcmp.S
+++ b/sysdeps/x86_64/multiarch/strcmp.S
@@ -125,12 +125,14 @@ ENTRY(__strncasecmp)
        jne     1f
        call    __init_cpu_features
 1:
+#if 0
        leaq    __strncasecmp_sse42(%rip), %rax
        testl   $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
        jnz     2f
        leaq    __strncasecmp_ssse3(%rip), %rax
        testl   $bit_SSSE3, __cpu_features+CPUID_OFFSET+index_SSSE3(%rip)
        jnz     2f
+#endif
        leaq    __strncasecmp_sse2(%rip), %rax
 2:     ret
 END(__strncasecmp)

diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S
index aeb8895bed99d69fabe522012d07adaa1c9cac91..2c77265e5b96fe962872ca99ce3eb19bc719f55d 100644 (file)
--- a/sysdeps/x86_64/strcmp.S
+++ b/sysdeps/x86_64/strcmp.S
@@ -913,7 +913,7 @@ LABEL(gobble_ashr_5):
        sub     $0xffff, %edx
        jnz     LABEL(exit)
 
-# if defined USE_AS_STRNCMP || defined USE_AS_STRCASECMP_L
+# if defined USE_AS_STRNCMP || defined USE_AS_STRNCASECMP_L
        sub     $16, %r11
        jbe     LABEL(strcmp_exitz)
 # endif