diff options
| author | Ulrich Drepper <gmail@redhat.com> | 2010-12-03 09:50:35 -0500 |
|---|---|---|
| committer | Ulrich Drepper <gmail@redhat.com> | 2010-12-03 09:50:35 -0500 |
| commit | a5b913e299027a799ae5435d66e3f20e95859654 (patch) | |
| tree | 1986d40edb80f36d1c5f3c52536b5c4585f4c2f1 /sysdeps/i386/i686/multiarch | |
| parent | c038d98d63ccf0da892f2147c6d92a7d2badd87d (diff) | |
| parent | 3a4a2499ec9c87d05a0d7d1522dad3df73c6c9dd (diff) | |
| download | glibc-a5b913e299027a799ae5435d66e3f20e95859654.zip glibc-a5b913e299027a799ae5435d66e3f20e95859654.tar.gz glibc-a5b913e299027a799ae5435d66e3f20e95859654.tar.bz2 | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
Diffstat (limited to 'sysdeps/i386/i686/multiarch')
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strcmp-ssse3.S | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S index a4de225..607b69b 100644 --- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S @@ -70,9 +70,7 @@ ENTRY (STRCMP) movl CNT(%esp), %ebp cmp $16, %ebp jb L(less16bytes_sncmp) - jmp L(more16bytes) -#endif - +#else movzbl (%eax), %ecx cmpb %cl, (%edx) jne L(neq) @@ -123,11 +121,6 @@ ENTRY (STRCMP) add $8, %edx add $8, %eax -#ifdef USE_AS_STRNCMP - cmp $8, %ebp - lea -8(%ebp), %ebp - je L(eq) -L(more16bytes): #endif movl %edx, %ecx and $0xfff, %ecx |