aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-09-20 14:02:23 -0700
committerUlrich Drepper <drepper@redhat.com>2010-09-20 14:02:23 -0700
commit8ffcee4a049b244e369e371536486a9b2eabb25f (patch)
tree1462a7b2851c396708152a15103ec88b6e688841
parente24f0a8b9e389b06a3291cba70c1605fbbb274fe (diff)
downloadglibc-8ffcee4a049b244e369e371536486a9b2eabb25f.zip
glibc-8ffcee4a049b244e369e371536486a9b2eabb25f.tar.gz
glibc-8ffcee4a049b244e369e371536486a9b2eabb25f.tar.bz2
Fix limit detection in x86-64 SSE2 strncasecmp.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/multiarch/strcmp.S2
-rw-r--r--sysdeps/x86_64/strcmp.S2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b017c8..99f168b 100644
--- 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 54e5bbc..1977643 100644
--- 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 aeb8895..2c77265 100644
--- 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