diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-08-19 17:46:56 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-08-19 17:46:56 +0200 |
| commit | 31bb2ae1b5c0d768a1c3be94a26540b9cca671ce (patch) | |
| tree | 7655188926856785db2ce4f84d4e4924e5f5b8da | |
| parent | ed360154f28602fe66aadde79722ef2eb8bfb5bd (diff) | |
| parent | fdae8096fe71e65f7c13575c990eb2652a328122 (diff) | |
| download | glibc-31bb2ae1b5c0d768a1c3be94a26540b9cca671ce.zip glibc-31bb2ae1b5c0d768a1c3be94a26540b9cca671ce.tar.gz glibc-31bb2ae1b5c0d768a1c3be94a26540b9cca671ce.tar.bz2 | |
Merge remote branch 'origin/release/2.12/master' into fedora/2.12/master
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/i386/i686/multiarch/strspn.S | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2010-08-19 Andreas Schwab <schwab@redhat.com> + + * sysdeps/i386/i686/multiarch/strspn.S [!SHARED]: Fix SSE4.2 check. + 2010-08-06 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): diff --git a/sysdeps/i386/i686/multiarch/strspn.S b/sysdeps/i386/i686/multiarch/strspn.S index 7fe6f97..dbdf1af 100644 --- a/sysdeps/i386/i686/multiarch/strspn.S +++ b/sysdeps/i386/i686/multiarch/strspn.S @@ -1,5 +1,5 @@ /* Multiple versions of strspn - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009,2010 Free Software Foundation, Inc. Contributed by Intel Corporation. This file is part of the GNU C Library. @@ -65,7 +65,7 @@ ENTRY(strspn) jne 1f call __init_cpu_features 1: leal __strspn_ia32, %eax - testl $index_SSE2, CPUID_OFFSET+index_SSE4_2+__cpu_features + testl $bit_SSE4_2, CPUID_OFFSET+index_SSE4_2+__cpu_features jz 2f leal __strspn_sse42, %eax 2: ret |