diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-08-16 07:07:05 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-08-16 07:07:05 -0700 |
| commit | 004c737f7b097026c4231fbc3644e9450f9e087e (patch) | |
| tree | 14c3b270e78fcf1793c008656ed409066fdc5e55 | |
| parent | 1c06ba3100847da6bd1f2e011dc24fa8debd9615 (diff) | |
| parent | 1feccb6caf8b324e67d6becebbe445af1a3b0847 (diff) | |
| download | glibc-004c737f7b097026c4231fbc3644e9450f9e087e.tar.gz glibc-004c737f7b097026c4231fbc3644e9450f9e087e.tar.xz glibc-004c737f7b097026c4231fbc3644e9450f9e087e.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strcmp.S | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index d15354f069..c935b53307 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * sysdeps/x86_64/strcmp.S: Use correct register for fourth parameter of strncasecmp_l. + * sysdeps/multiarch/strcmp.S: Likewise. 2010-08-14 Ulrich Drepper <drepper@redhat.com> diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S index 764eb09320..45cd80b2f0 100644 --- a/sysdeps/x86_64/multiarch/strcmp.S +++ b/sysdeps/x86_64/multiarch/strcmp.S @@ -181,7 +181,7 @@ END (__strcasecmp_sse42) # ifdef USE_AS_STRNCASECMP_L ENTRY (__strncasecmp_sse42) movq __libc_tsd_LOCALE@gottpoff(%rip),%rax - movq %fs:(%rax),%r10 + movq %fs:(%rax),%rcx // XXX 5 byte should be before the function /* 5-byte NOP. */ @@ -212,9 +212,9 @@ STRCMP_SSE42: /* We have to fall back on the C implementation for locales with encodings not matching ASCII for single bytes. */ # if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0 - movq LOCALE_T___LOCALES+LC_CTYPE*8(%r10), %rax + movq LOCALE_T___LOCALES+LC_CTYPE*8(%rcx), %rax # else - movq (%r10), %rax + movq (%rcx), %rax # endif testl $0, LOCALE_DATA_VALUES+_NL_CTYPE_NONASCII_CASE*SIZEOF_VALUES(%rax) jne __strncasecmp_l_nonascii |